From d6ce46e2f2383dec13bd9bdee4a8f0cb153df72e Mon Sep 17 00:00:00 2001 From: Sam Al-Sapti Date: Wed, 28 Dec 2022 16:19:07 +0100 Subject: [PATCH 1/6] Collect even more version numbers in docker/defaults/main.yml --- roles/docker/defaults/main.yml | 11 +++++++++++ roles/docker/tasks/services/drone.yml | 4 ++-- roles/docker/tasks/services/hedgedoc.yml | 4 ++-- roles/docker/tasks/services/keycloak.yml | 3 +-- roles/docker/tasks/services/mastodon.yml | 4 ++-- roles/docker/tasks/services/matrix_riot.yml | 6 +++--- roles/docker/tasks/services/membersystem.yml | 4 ++-- roles/docker/tasks/services/nextcloud.yml | 4 ++-- roles/docker/tasks/services/passit.yml | 2 +- roles/docker/tasks/services/rallly.yml | 2 +- 10 files changed, 27 insertions(+), 17 deletions(-) diff --git a/roles/docker/defaults/main.yml b/roles/docker/defaults/main.yml index 9779f1e6..a7bc1d39 100644 --- a/roles/docker/defaults/main.yml +++ b/roles/docker/defaults/main.yml @@ -42,6 +42,7 @@ services: domain: sso.{{ base_domain }} volume_folder: "{{ volume_root_folder }}/keycloak" version: "20.0" + postgres_version: 10 allowed_sender_domain: true restic: @@ -67,6 +68,8 @@ services: domain: "cloud.{{ base_domain }}" volume_folder: "{{ volume_root_folder }}/nextcloud" version: 25-apache + postgres_version: 10 + redis_version: 7-alpine allowed_sender_domain: true gitea: @@ -81,6 +84,7 @@ services: domain: "passit.{{ base_domain }}" volume_folder: "{{ volume_root_folder }}/passit" version: stable + postgres_version: 10 allowed_sender_domain: true matrix: @@ -88,6 +92,7 @@ services: domain: "matrix.{{ base_domain }}" volume_folder: "{{ volume_root_folder }}/matrix" version: v1.63.1 + postgres_version: 10 allowed_sender_domain: true riot: @@ -113,6 +118,7 @@ services: domain: "pad.{{ base_domain }}" volume_folder: "{{ volume_root_folder }}/hedgedoc" version: 1.9.6 + postgres_version: 10-alpine data_coop_website: file: websites/data.coop.yml @@ -168,6 +174,8 @@ services: domain: "social.{{ base_domain }}" volume_folder: "{{ volume_root_folder }}/mastodon" version: v4.0.2 + postgres_version: 14-alpine + redis_version: 6-alpine allowed_sender_domain: true rallly: @@ -175,6 +183,7 @@ services: domain: "when.{{ base_domain }}" volume_folder: "{{ volume_root_folder }}/rallly" version: ac55701890cd866ee946deb25e2b2839fb14900e + postgres_version: 14-alpine allowed_sender_domain: true pinafore: @@ -186,6 +195,8 @@ services: file: membersystem.yml domain: "member.{{ base_domain }}" django_admins: "Vidir:valberg@orn.li" + version: latest + postgres_version: 13-alpine allowed_sender_domain: true watchtower: diff --git a/roles/docker/tasks/services/drone.yml b/roles/docker/tasks/services/drone.yml index 874ce03e..5d830079 100644 --- a/roles/docker/tasks/services/drone.yml +++ b/roles/docker/tasks/services/drone.yml @@ -8,7 +8,7 @@ services: drone: container_name: "drone" - image: drone/drone:1 + image: "drone/drone:{{ services.drone.version }}" restart: unless-stopped networks: - external_services @@ -48,4 +48,4 @@ drone: external_services: external: - name: external_services \ No newline at end of file + name: external_services diff --git a/roles/docker/tasks/services/hedgedoc.yml b/roles/docker/tasks/services/hedgedoc.yml index 7508535c..3b907a1e 100644 --- a/roles/docker/tasks/services/hedgedoc.yml +++ b/roles/docker/tasks/services/hedgedoc.yml @@ -22,7 +22,7 @@ definition: services: database: - image: "postgres:10-alpine" + image: "postgres:{{ services.hedgedoc.postgres_version }}" environment: POSTGRES_USER: "codimd" POSTGRES_PASSWORD: "{{ postgres_passwords.hedgedoc }}" @@ -34,7 +34,7 @@ - "{{ services.hedgedoc.volume_folder }}/db:/var/lib/postgresql/data" app: - image: quay.io/hedgedoc/hedgedoc:{{ services.hedgedoc.version }} + image: "quay.io/hedgedoc/hedgedoc:{{ services.hedgedoc.version }}" environment: CMD_DB_URL: "postgres://codimd:{{ postgres_passwords.hedgedoc }}@hedgedoc_database_1:5432/codimd" CMD_DOMAIN: "{{ services.hedgedoc.domain }}" diff --git a/roles/docker/tasks/services/keycloak.yml b/roles/docker/tasks/services/keycloak.yml index 3f2da44b..26033514 100644 --- a/roles/docker/tasks/services/keycloak.yml +++ b/roles/docker/tasks/services/keycloak.yml @@ -5,9 +5,8 @@ definition: version: "3.6" services: - postgres: - image: "postgres:10" + image: "postgres:{{ services.keycloak.postgres_version }}" restart: "unless-stopped" networks: - "keycloak" diff --git a/roles/docker/tasks/services/mastodon.yml b/roles/docker/tasks/services/mastodon.yml index eae1546f..656f9098 100644 --- a/roles/docker/tasks/services/mastodon.yml +++ b/roles/docker/tasks/services/mastodon.yml @@ -55,7 +55,7 @@ services: db: restart: always - image: postgres:14-alpine + image: "postgres:{{ services.mastodon.postgres_version }}" shm_size: 256mb networks: - internal_network @@ -70,7 +70,7 @@ redis: restart: always - image: redis:6-alpine + image: "redis:{{ services.mastodon.redis_version }}" networks: - internal_network healthcheck: diff --git a/roles/docker/tasks/services/matrix_riot.yml b/roles/docker/tasks/services/matrix_riot.yml index 34f302d4..6b5e9504 100644 --- a/roles/docker/tasks/services/matrix_riot.yml +++ b/roles/docker/tasks/services/matrix_riot.yml @@ -66,7 +66,7 @@ services: matrix_db: container_name: matrix_db - image: postgres:10 + image: "postgres:{{ services.matrix.postgres_version }}" restart: unless-stopped networks: - matrix @@ -78,7 +78,7 @@ matrix_app: container_name: matrix - image: matrixdotorg/synapse:{{ services.matrix.version }} + image: "matrixdotorg/synapse:{{ services.matrix.version }}" restart: unless-stopped networks: - matrix @@ -96,7 +96,7 @@ riot: container_name: riot_app - image: avhost/docker-matrix-riot:{{ services.riot.version }} + image: "avhost/docker-matrix-riot:{{ services.riot.version }}" restart: unless-stopped networks: - matrix diff --git a/roles/docker/tasks/services/membersystem.yml b/roles/docker/tasks/services/membersystem.yml index ca63851e..a56bf59f 100644 --- a/roles/docker/tasks/services/membersystem.yml +++ b/roles/docker/tasks/services/membersystem.yml @@ -8,7 +8,7 @@ version: "3" services: backend: - image: docker.data.coop/membersystem:latest + image: "docker.data.coop/membersystem:{{ services.membersystem.version }}" restart: always user: $UID:$GID tty: true @@ -37,7 +37,7 @@ com.centurylinklabs.watchtower.enable: "true" postgres: - image: postgres:13-alpine + image: "postgres:{{ services.membersystem.postgres_version }}" restart: always volumes: - "{{ volume_root_folder }}/membersystem/postgres/data:/var/lib/postgresql/data" diff --git a/roles/docker/tasks/services/nextcloud.yml b/roles/docker/tasks/services/nextcloud.yml index d36f8def..1c938b9d 100644 --- a/roles/docker/tasks/services/nextcloud.yml +++ b/roles/docker/tasks/services/nextcloud.yml @@ -12,7 +12,7 @@ definition: services: postgres: - image: "postgres:10" + image: "postgres:{{ services.nextcloud.postgres_version }}" restart: "unless-stopped" networks: - "nextcloud" @@ -24,7 +24,7 @@ POSTGRES_USER: "nextcloud" redis: - image: "redis:7-alpine" + image: "redis:{{ services.nextcloud.redis_version }}" restart: "unless-stopped" command: "redis-server --requirepass {{ nextcloud_secrets.redis_password }}" tmpfs: diff --git a/roles/docker/tasks/services/passit.yml b/roles/docker/tasks/services/passit.yml index 300c0996..e76b6cab 100644 --- a/roles/docker/tasks/services/passit.yml +++ b/roles/docker/tasks/services/passit.yml @@ -8,7 +8,7 @@ version: "3.6" services: passit_db: - image: "postgres:10" + image: "postgres:{{ services.passit.postgres_version }}" restart: "always" networks: - "passit" diff --git a/roles/docker/tasks/services/rallly.yml b/roles/docker/tasks/services/rallly.yml index b5e9d2f2..22b11277 100644 --- a/roles/docker/tasks/services/rallly.yml +++ b/roles/docker/tasks/services/rallly.yml @@ -16,7 +16,7 @@ version: "3.8" services: rallly_db: - image: "postgres:14-alpine" + image: "postgres:{{ services.rallly.postgres_version }}" restart: "always" shm_size: "256mb" networks: From 231af48a40f46001ea7a1d63c83c5a99765cd9fb Mon Sep 17 00:00:00 2001 From: Sam Al-Sapti Date: Wed, 28 Dec 2022 16:23:23 +0100 Subject: [PATCH 2/6] Make quotations consistent --- roles/docker/defaults/main.yml | 48 +++++++++++++++++----------------- 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/roles/docker/defaults/main.yml b/roles/docker/defaults/main.yml index a7bc1d39..e26c2aa8 100644 --- a/roles/docker/defaults/main.yml +++ b/roles/docker/defaults/main.yml @@ -7,59 +7,59 @@ services: postfix: file: postfix.yml domain: "smtp.{{ base_domain }}" - version: "v3.5.1-alpine" + version: v3.5.1-alpine nginx_proxy: file: nginx_proxy.yml - version: "1.0-alpine" + version: 1.0-alpine volume_folder: "{{ volume_root_folder }}/nginx" nginx_acme_companion: - version: "2.2" + version: 2.2 openldap: file: openldap.yml domain: "ldap.{{ base_domain }}" volume_folder: "{{ volume_root_folder }}/openldap" - version: "1.5.0" + version: 1.5.0 phpldapadmin: - version: "0.9.0" + version: 0.9.0 netdata: file: netdata.yml domain: "netdata.{{ base_domain }}" - version: "v1" + version: v1 portainer: file: portainer.yml domain: "portainer.{{ base_domain }}" volume_folder: "{{ volume_root_folder }}/portainer" - version: "2.16.2" + version: 2.16.2 keycloak: file: keycloak.yml domain: sso.{{ base_domain }} volume_folder: "{{ volume_root_folder }}/keycloak" - version: "20.0" + version: 20.0 postgres_version: 10 allowed_sender_domain: true restic: file: restic_backup.yml - user: "datacoop" - domain: "restic.cannedtuna.org" - repository: "datacoop-hevonen" - version: "1.6.0" + user: datacoop + domain: restic.cannedtuna.org + repository: datacoop-hevonen + version: 1.6.0 disabled_in_vagrant: true docker_registry: file: docker_registry.yml domain: "docker.{{ base_domain }}" volume_folder: "{{ volume_root_folder }}/docker-registry" - username: "docker" + username: docker password: "{{ docker_password }}" - version: "2" + version: 2 ### External services ### @@ -123,8 +123,8 @@ services: data_coop_website: file: websites/data.coop.yml domains: - - "{{ base_domain }}" - - "www.{{ base_domain }}" + - "{{ base_domain }}" + - "www.{{ base_domain }}" new_data_coop_website: file: websites/new.data.coop.yml @@ -139,21 +139,21 @@ services: cryptohagen_website: file: websites/cryptohagen.dk.yml domains: - - "cryptohagen.dk" - - "www.cryptohagen.dk" + - cryptohagen.dk + - www.cryptohagen.dk ulovliglogning_website: file: websites/ulovliglogning.dk.yml domains: - - "ulovliglogning.dk" - - "www.ulovliglogning.dk" - - "ulovlig-logning.dk" + - ulovliglogning.dk + - www.ulovliglogning.dk + - ulovlig-logning.dk cryptoaarhus_website: file: websites/cryptoaarhus.dk.yml domains: - - "cryptoaarhus.dk" - - "www.cryptoaarhus.dk" + - cryptoaarhus.dk + - www.cryptoaarhus.dk drone: file: drone.yml @@ -194,7 +194,7 @@ services: membersystem: file: membersystem.yml 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 From a10b07fa2c33752db08f8ba84d8e99e3ed24904b Mon Sep 17 00:00:00 2001 From: Sam Al-Sapti Date: Wed, 28 Dec 2022 16:46:52 +0100 Subject: [PATCH 3/6] Make quotations consistent --- roles/docker/defaults/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/docker/defaults/main.yml b/roles/docker/defaults/main.yml index e26c2aa8..ba5f2fec 100644 --- a/roles/docker/defaults/main.yml +++ b/roles/docker/defaults/main.yml @@ -1,5 +1,5 @@ --- -volume_root_folder: "/docker-volumes" +volume_root_folder: /docker-volumes services: From 2f1c1887baf80b1f9dc7bfb23bb11b067318af10 Mon Sep 17 00:00:00 2001 From: Sam Al-Sapti Date: Sat, 14 Jan 2023 17:21:34 +0100 Subject: [PATCH 4/6] Revert "Make quotations consistent" This reverts commit a10b07fa2c33752db08f8ba84d8e99e3ed24904b. --- roles/docker/defaults/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/docker/defaults/main.yml b/roles/docker/defaults/main.yml index 46edde40..ead56da6 100644 --- a/roles/docker/defaults/main.yml +++ b/roles/docker/defaults/main.yml @@ -1,6 +1,6 @@ # vim: ft=yaml.ansible --- -volume_root_folder: /docker-volumes +volume_root_folder: "/docker-volumes" services: From 9733794292b0da58732648b237dd13c77591dad1 Mon Sep 17 00:00:00 2001 From: Sam Al-Sapti Date: Sat, 14 Jan 2023 17:22:47 +0100 Subject: [PATCH 5/6] Revert "Make quotations consistent" This reverts commit 231af48a40f46001ea7a1d63c83c5a99765cd9fb. --- roles/docker/defaults/main.yml | 50 ++++++++++++++++------------------ 1 file changed, 23 insertions(+), 27 deletions(-) diff --git a/roles/docker/defaults/main.yml b/roles/docker/defaults/main.yml index ead56da6..ee348a0f 100644 --- a/roles/docker/defaults/main.yml +++ b/roles/docker/defaults/main.yml @@ -9,59 +9,59 @@ services: file: postfix.yml domain: "smtp.{{ base_domain }}" volume_folder: "{{ volume_root_folder }}/postfix" - version: v3.5.1-alpine + version: "v3.5.1-alpine" nginx_proxy: file: nginx_proxy.yml - version: 1.0-alpine + version: "1.0-alpine" volume_folder: "{{ volume_root_folder }}/nginx" nginx_acme_companion: - version: 2.2 + version: "2.2" openldap: file: openldap.yml domain: "ldap.{{ base_domain }}" volume_folder: "{{ volume_root_folder }}/openldap" - version: 1.5.0 + version: "1.5.0" phpldapadmin: - version: 0.9.0 + version: "0.9.0" netdata: file: netdata.yml domain: "netdata.{{ base_domain }}" - version: v1 + version: "v1" portainer: file: portainer.yml domain: "portainer.{{ base_domain }}" volume_folder: "{{ volume_root_folder }}/portainer" - version: 2.16.2 + version: "2.16.2" keycloak: file: keycloak.yml domain: sso.{{ base_domain }} volume_folder: "{{ volume_root_folder }}/keycloak" - version: 20.0 + version: "20.0" postgres_version: 10 allowed_sender_domain: true restic: file: restic_backup.yml - user: datacoop - domain: restic.cannedtuna.org - repository: datacoop-hevonen - version: 1.6.0 + user: "datacoop" + domain: "restic.cannedtuna.org" + repository: "datacoop-hevonen" + version: "1.6.0" disabled_in_vagrant: true docker_registry: file: docker_registry.yml domain: "docker.{{ base_domain }}" volume_folder: "{{ volume_root_folder }}/docker-registry" - username: docker + username: "docker" password: "{{ docker_password }}" - version: 2 + version: "2" ### External services ### @@ -141,21 +141,21 @@ services: cryptohagen_website: file: websites/cryptohagen.dk.yml domains: - - cryptohagen.dk - - www.cryptohagen.dk + - "cryptohagen.dk" + - "www.cryptohagen.dk" ulovliglogning_website: file: websites/ulovliglogning.dk.yml domains: - - ulovliglogning.dk - - www.ulovliglogning.dk - - ulovlig-logning.dk + - "ulovliglogning.dk" + - "www.ulovliglogning.dk" + - "ulovlig-logning.dk" cryptoaarhus_website: file: websites/cryptoaarhus.dk.yml domains: - - cryptoaarhus.dk - - www.cryptoaarhus.dk + - "cryptoaarhus.dk" + - "www.cryptoaarhus.dk" drone: file: drone.yml @@ -184,12 +184,8 @@ services: file: rallly.yml domain: "when.{{ base_domain }}" volume_folder: "{{ volume_root_folder }}/rallly" -<<<<<<< HEAD - version: ac55701890cd866ee946deb25e2b2839fb14900e - postgres_version: 14-alpine -======= version: e4482a1edb2fb56292d07ee8811a24f2a0d6b114 ->>>>>>> main + postgres_version: 14-alpine allowed_sender_domain: true pinafore: @@ -200,7 +196,7 @@ services: membersystem: file: membersystem.yml 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 From f81fab3d117554d57d2220bba0fe0c91d2a58861 Mon Sep 17 00:00:00 2001 From: Sam Al-Sapti Date: Sat, 14 Jan 2023 17:31:08 +0100 Subject: [PATCH 6/6] Quote numbers --- roles/docker/defaults/main.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/roles/docker/defaults/main.yml b/roles/docker/defaults/main.yml index ee348a0f..75e15e4c 100644 --- a/roles/docker/defaults/main.yml +++ b/roles/docker/defaults/main.yml @@ -44,7 +44,7 @@ services: domain: sso.{{ base_domain }} volume_folder: "{{ volume_root_folder }}/keycloak" version: "20.0" - postgres_version: 10 + postgres_version: "10" allowed_sender_domain: true restic: @@ -70,7 +70,7 @@ services: domain: "cloud.{{ base_domain }}" volume_folder: "{{ volume_root_folder }}/nextcloud" version: 25-apache - postgres_version: 10 + postgres_version: "10" redis_version: 7-alpine allowed_sender_domain: true @@ -86,7 +86,7 @@ services: domain: "passit.{{ base_domain }}" volume_folder: "{{ volume_root_folder }}/passit" version: stable - postgres_version: 10 + postgres_version: "10" allowed_sender_domain: true matrix: @@ -94,7 +94,7 @@ services: domain: "matrix.{{ base_domain }}" volume_folder: "{{ volume_root_folder }}/matrix" version: v1.63.1 - postgres_version: 10 + postgres_version: "10" allowed_sender_domain: true riot: