Merge branch 'main' into watchtower

This commit is contained in:
Sam A. 2023-01-21 17:33:45 +01:00
commit 7ca168ae03
Signed by: samsapti
GPG key ID: CBBBE7371E81C4EA
10 changed files with 36 additions and 26 deletions

View file

@ -44,6 +44,7 @@ services:
domain: sso.{{ base_domain }} domain: sso.{{ base_domain }}
volume_folder: "{{ volume_root_folder }}/keycloak" volume_folder: "{{ volume_root_folder }}/keycloak"
version: "20.0" version: "20.0"
postgres_version: "10"
allowed_sender_domain: true allowed_sender_domain: true
restic: restic:
@ -69,6 +70,8 @@ services:
domain: "cloud.{{ base_domain }}" domain: "cloud.{{ base_domain }}"
volume_folder: "{{ volume_root_folder }}/nextcloud" volume_folder: "{{ volume_root_folder }}/nextcloud"
version: 25-apache version: 25-apache
postgres_version: "10"
redis_version: 7-alpine
allowed_sender_domain: true allowed_sender_domain: true
gitea: gitea:
@ -83,6 +86,7 @@ services:
domain: "passit.{{ base_domain }}" domain: "passit.{{ base_domain }}"
volume_folder: "{{ volume_root_folder }}/passit" volume_folder: "{{ volume_root_folder }}/passit"
version: stable version: stable
postgres_version: "10"
allowed_sender_domain: true allowed_sender_domain: true
matrix: matrix:
@ -90,6 +94,7 @@ services:
domain: "matrix.{{ base_domain }}" domain: "matrix.{{ base_domain }}"
volume_folder: "{{ volume_root_folder }}/matrix" volume_folder: "{{ volume_root_folder }}/matrix"
version: v1.63.1 version: v1.63.1
postgres_version: "10"
allowed_sender_domain: true allowed_sender_domain: true
riot: riot:
@ -115,12 +120,13 @@ services:
domain: "pad.{{ base_domain }}" domain: "pad.{{ base_domain }}"
volume_folder: "{{ volume_root_folder }}/hedgedoc" volume_folder: "{{ volume_root_folder }}/hedgedoc"
version: 1 version: 1
postgres_version: 10-alpine
data_coop_website: data_coop_website:
file: websites/data.coop.yml file: websites/data.coop.yml
domains: domains:
- "{{ base_domain }}" - "{{ base_domain }}"
- "www.{{ base_domain }}" - "www.{{ base_domain }}"
new_data_coop_website: new_data_coop_website:
file: websites/new.data.coop.yml file: websites/new.data.coop.yml
@ -135,21 +141,21 @@ services:
cryptohagen_website: cryptohagen_website:
file: websites/cryptohagen.dk.yml file: websites/cryptohagen.dk.yml
domains: domains:
- "cryptohagen.dk" - "cryptohagen.dk"
- "www.cryptohagen.dk" - "www.cryptohagen.dk"
ulovliglogning_website: ulovliglogning_website:
file: websites/ulovliglogning.dk.yml file: websites/ulovliglogning.dk.yml
domains: domains:
- "ulovliglogning.dk" - "ulovliglogning.dk"
- "www.ulovliglogning.dk" - "www.ulovliglogning.dk"
- "ulovlig-logning.dk" - "ulovlig-logning.dk"
cryptoaarhus_website: cryptoaarhus_website:
file: websites/cryptoaarhus.dk.yml file: websites/cryptoaarhus.dk.yml
domains: domains:
- "cryptoaarhus.dk" - "cryptoaarhus.dk"
- "www.cryptoaarhus.dk" - "www.cryptoaarhus.dk"
drone: drone:
file: drone.yml file: drone.yml
@ -170,6 +176,8 @@ services:
domain: "social.{{ base_domain }}" domain: "social.{{ base_domain }}"
volume_folder: "{{ volume_root_folder }}/mastodon" volume_folder: "{{ volume_root_folder }}/mastodon"
version: v4.0.2 version: v4.0.2
postgres_version: 14-alpine
redis_version: 6-alpine
allowed_sender_domain: true allowed_sender_domain: true
rallly: rallly:
@ -177,6 +185,7 @@ services:
domain: "when.{{ base_domain }}" domain: "when.{{ base_domain }}"
volume_folder: "{{ volume_root_folder }}/rallly" volume_folder: "{{ volume_root_folder }}/rallly"
version: e4482a1edb2fb56292d07ee8811a24f2a0d6b114 version: e4482a1edb2fb56292d07ee8811a24f2a0d6b114
postgres_version: 14-alpine
allowed_sender_domain: true allowed_sender_domain: true
pinafore: pinafore:
@ -188,6 +197,8 @@ services:
file: membersystem.yml file: membersystem.yml
domain: "member.{{ base_domain }}" domain: "member.{{ base_domain }}"
django_admins: "Vidir:valberg@orn.li" django_admins: "Vidir:valberg@orn.li"
version: latest
postgres_version: 13-alpine
allowed_sender_domain: true allowed_sender_domain: true
watchtower: watchtower:

View file

@ -9,7 +9,7 @@
services: services:
drone: drone:
container_name: "drone" container_name: "drone"
image: drone/drone:1 image: "drone/drone:{{ services.drone.version }}"
restart: unless-stopped restart: unless-stopped
networks: networks:
- external_services - external_services

View file

@ -23,7 +23,7 @@
definition: definition:
services: services:
database: database:
image: "postgres:10-alpine" image: "postgres:{{ services.hedgedoc.postgres_version }}"
environment: environment:
POSTGRES_USER: "codimd" POSTGRES_USER: "codimd"
POSTGRES_PASSWORD: "{{ postgres_passwords.hedgedoc }}" POSTGRES_PASSWORD: "{{ postgres_passwords.hedgedoc }}"
@ -35,7 +35,7 @@
- "{{ services.hedgedoc.volume_folder }}/db:/var/lib/postgresql/data" - "{{ services.hedgedoc.volume_folder }}/db:/var/lib/postgresql/data"
app: app:
image: quay.io/hedgedoc/hedgedoc:{{ services.hedgedoc.version }} image: "quay.io/hedgedoc/hedgedoc:{{ services.hedgedoc.version }}"
environment: environment:
CMD_DB_URL: "postgres://codimd:{{ postgres_passwords.hedgedoc }}@hedgedoc_database_1:5432/codimd" CMD_DB_URL: "postgres://codimd:{{ postgres_passwords.hedgedoc }}@hedgedoc_database_1:5432/codimd"
CMD_DOMAIN: "{{ services.hedgedoc.domain }}" CMD_DOMAIN: "{{ services.hedgedoc.domain }}"

View file

@ -7,9 +7,8 @@
definition: definition:
version: "3.6" version: "3.6"
services: services:
postgres: postgres:
image: "postgres:10" image: "postgres:{{ services.keycloak.postgres_version }}"
restart: "unless-stopped" restart: "unless-stopped"
networks: networks:
- "keycloak" - "keycloak"

View file

@ -57,7 +57,7 @@
services: services:
db: db:
restart: always restart: always
image: postgres:14-alpine image: "postgres:{{ services.mastodon.postgres_version }}"
shm_size: 256mb shm_size: 256mb
networks: networks:
- internal_network - internal_network
@ -72,7 +72,7 @@
redis: redis:
restart: always restart: always
image: redis:6-alpine image: "redis:{{ services.mastodon.redis_version }}"
networks: networks:
- internal_network - internal_network
healthcheck: healthcheck:

View file

@ -67,7 +67,7 @@
services: services:
matrix_db: matrix_db:
container_name: matrix_db container_name: matrix_db
image: postgres:10 image: "postgres:{{ services.matrix.postgres_version }}"
restart: unless-stopped restart: unless-stopped
networks: networks:
- matrix - matrix
@ -79,7 +79,7 @@
matrix_app: matrix_app:
container_name: matrix container_name: matrix
image: matrixdotorg/synapse:{{ services.matrix.version }} image: "matrixdotorg/synapse:{{ services.matrix.version }}"
restart: unless-stopped restart: unless-stopped
networks: networks:
- matrix - matrix
@ -97,7 +97,7 @@
riot: riot:
container_name: riot_app container_name: riot_app
image: avhost/docker-matrix-riot:{{ services.riot.version }} image: "avhost/docker-matrix-riot:{{ services.riot.version }}"
restart: unless-stopped restart: unless-stopped
networks: networks:
- matrix - matrix

View file

@ -8,7 +8,7 @@
version: "3" version: "3"
services: services:
backend: backend:
image: docker.data.coop/membersystem:latest image: "docker.data.coop/membersystem:{{ services.membersystem.version }}"
restart: always restart: always
user: $UID:$GID user: $UID:$GID
tty: true tty: true
@ -35,7 +35,7 @@
DEFAULT_FROM_EMAIL: "noreply@{{ services.membersystem.domain }}" DEFAULT_FROM_EMAIL: "noreply@{{ services.membersystem.domain }}"
postgres: postgres:
image: postgres:13-alpine image: "postgres:{{ services.membersystem.postgres_version }}"
restart: always restart: always
volumes: volumes:
- "{{ volume_root_folder }}/membersystem/postgres/data:/var/lib/postgresql/data" - "{{ volume_root_folder }}/membersystem/postgres/data:/var/lib/postgresql/data"

View file

@ -13,7 +13,7 @@
definition: definition:
services: services:
postgres: postgres:
image: "postgres:10" image: "postgres:{{ services.nextcloud.postgres_version }}"
restart: "unless-stopped" restart: "unless-stopped"
networks: networks:
- "nextcloud" - "nextcloud"
@ -25,7 +25,7 @@
POSTGRES_USER: "nextcloud" POSTGRES_USER: "nextcloud"
redis: redis:
image: "redis:7-alpine" image: "redis:{{ services.nextcloud.redis_version }}"
restart: "unless-stopped" restart: "unless-stopped"
command: "redis-server --requirepass {{ nextcloud_secrets.redis_password }}" command: "redis-server --requirepass {{ nextcloud_secrets.redis_password }}"
tmpfs: tmpfs:

View file

@ -8,7 +8,7 @@
version: "3.6" version: "3.6"
services: services:
passit_db: passit_db:
image: "postgres:10" image: "postgres:{{ services.passit.postgres_version }}"
restart: "always" restart: "always"
networks: networks:
- "passit" - "passit"

View file

@ -18,7 +18,7 @@
version: "3.8" version: "3.8"
services: services:
rallly_db: rallly_db:
image: "postgres:14-alpine" image: "postgres:{{ services.rallly.postgres_version }}"
restart: "always" restart: "always"
shm_size: "256mb" shm_size: "256mb"
networks: networks: