From 1a117e47b551bb0b0c7ef90eb232b67dd7a73860 Mon Sep 17 00:00:00 2001 From: Kevin Veen-Birkenbach Date: Mon, 20 Jan 2025 18:29:40 +0100 Subject: [PATCH] Added versions --- group_vars/all | 49 +++++++++++++++++-- .../templates/docker-compose.yml.j2 | 4 +- .../templates/docker-compose.yml.j2 | 2 +- .../templates/docker-compose.yml.j2 | 4 +- .../templates/docker-compose.yml.j2 | 2 +- .../templates/docker-compose.yml.j2 | 2 +- .../templates/docker-compose.yml.j2 | 2 +- .../templates/docker-compose.yml.j2 | 2 +- .../templates/docker-compose.yml.j2 | 2 +- roles/docker-mariadb/tasks/main.yml | 2 +- .../templates/docker-compose.yml.j2 | 2 +- .../templates/docker-compose.yml.j2 | 4 +- .../templates/docker-compose.yml.j2 | 1 + .../templates/docker-compose.yml.j2 | 2 +- .../templates/docker-compose.yml.j2 | 2 +- .../templates/docker-compose.yml.j2 | 4 +- roles/docker-postgres/tasks/main.yml | 2 +- .../templates/docker-compose.yml.j2 | 2 +- .../templates/docker-compose.yml.j2 | 2 +- templates/docker/services/postgres.yml.j2 | 2 +- vars/docker-database.yml.j2 | 3 +- 21 files changed, 69 insertions(+), 28 deletions(-) diff --git a/group_vars/all b/group_vars/all index d5868f64..d4100217 100644 --- a/group_vars/all +++ b/group_vars/all @@ -194,9 +194,6 @@ enable_central_database_mailu: "{{enable_central_database}}" ### Enable Storage Optimizer for Docker Volumes enable_system_storage_optimizer: true -### Common Configurations -postgres_default_version: "16" - ### Docker Role Specific Parameters docker_restart_policy: "unless-stopped" @@ -206,12 +203,41 @@ akaunting_company_name: "{{top_domain}}" akaunting_company_email: "{{administrator_email}}" akaunting_setup_admin_email: "{{administrator_email}}" +#### Attendize +attendize_version: "latest" + +#### Baserow +baserow_version: "latest" + #### Big Blue Button bigbluebutton_enable_greenlight: "true" +#### Bluesky +bluesky_administrator_email: "{{administrator_email}}" +bluesky_pds_version: "latest" + +#### Friendica +friendica_version: "latest" + +#### Gitea +gitea_version: "latest" + +#### Gitlab +gitlab_version: "latest" + +#### Joomla +joomla_version: "latest" + #### Listmonk listmonk_admin_username: "admin" listmonk_public_api_activated: False # Security hole. Can be used for spaming +listmonk_version: "latest" + +#### MariaDB +mariadb_version: "latest" + +#### Matomo +matomo_version: "latest" #### Mastodon mastodon_version: "latest" @@ -222,6 +248,8 @@ matrix_admin_name: "{{administrator_username}}" # Accountname of the matri matrix_playbook_tags: "setup-all,start" # For the initial update use: install-all,ensure-matrix-users-created,start matrix_role: "compose" # Role to setup Matrix. Valid values: ansible, compose matrix_server_name: "{{top_domain}}" # Adress for the account names etc. +matrix_synapse_version: "latest" +matrix_element_version: "latest" #### Mailu mailu_version: "2024.06" @@ -232,6 +260,10 @@ mailu_subnet: "192.168.203.0/24" moodle_site_name: "Global Learning Academy on {{top_domain}}" moodle_user_name: "{{administrator_username}}" moodle_user_email: "{{administrator_email}}" +moodle_version: "latest" + +#### MyBB +mybb_version: "latest" #### Nextcloud nextcloud_version: "production" # @see https://nextcloud.com/blog/nextcloud-release-channels-and-how-to-track-them/ @@ -241,6 +273,15 @@ peertube_version: "bookworm" #### Pixelfed pixelfed_app_name: "Pictures on {{top_domain}}" +pixelfed_version: "latest" + +#### Postgres +# Please set an version in your inventory file - Rolling release for postgres isn't recommended +postgres_database_version: "latest" + +#### Taiga +taiga_version: "latest" #### YOURLS -yourls_user: "{{administrator_username}}" \ No newline at end of file +yourls_user: "{{administrator_username}}" +yourls_version: "latest" \ No newline at end of file diff --git a/roles/docker-attendize/templates/docker-compose.yml.j2 b/roles/docker-attendize/templates/docker-compose.yml.j2 index 924af5f4..fe5b39e3 100644 --- a/roles/docker-attendize/templates/docker-compose.yml.j2 +++ b/roles/docker-attendize/templates/docker-compose.yml.j2 @@ -5,7 +5,7 @@ services: {% include 'templates/docker/services/' + database_type + '.yml.j2' %} web: - image: attendize_web:latest + image: "attendize_web:{{attendize_version}}" ports: - "{{http_port}}:80" volumes: @@ -19,7 +19,7 @@ services: {% include 'templates/docker/container/networks.yml.j2' %} worker: - image: attendize_worker:latest + image: "attendize_worker:{{attendize_version}}" {% include 'templates/docker/container/depends-on-database-redis.yml.j2' %} maildev: {% include 'templates/docker/container/networks.yml.j2' %} diff --git a/roles/docker-baserow/templates/docker-compose.yml.j2 b/roles/docker-baserow/templates/docker-compose.yml.j2 index 33208bb4..47e00917 100644 --- a/roles/docker-baserow/templates/docker-compose.yml.j2 +++ b/roles/docker-baserow/templates/docker-compose.yml.j2 @@ -5,7 +5,7 @@ services: {% include 'templates/docker/services/' + database_type + '.yml.j2' %} application: - image: baserow/baserow:1.19.1 + image: "baserow/baserow:{{baserow_version}}" container_name: baserow-application restart: {{docker_restart_policy}} logging: diff --git a/roles/docker-bluesky/templates/docker-compose.yml.j2 b/roles/docker-bluesky/templates/docker-compose.yml.j2 index 192b5fb9..366aeabd 100644 --- a/roles/docker-bluesky/templates/docker-compose.yml.j2 +++ b/roles/docker-bluesky/templates/docker-compose.yml.j2 @@ -1,6 +1,6 @@ services: pds: - image: ghcr.io/bluesky-social/pds:latest + image: "ghcr.io/bluesky-social/pds:{{bluesky_pds_version}}" restart: {{docker_restart_policy}} volumes: - pds_data:/pds @@ -8,7 +8,7 @@ services: environment: # Geben Sie hier Ihre Domain und Konfigurationsdetails an PDS_HOSTNAME: "{{domain_api}}" - PDS_ADMIN_EMAIL: "{{administrator_email}}" + PDS_ADMIN_EMAIL: "{{bluesky_administrator_email}}" PDS_SERVICE_DID: "did:web:{{domain_api}}" # See https://mattdyson.org/blog/2024/11/self-hosting-bluesky-pds/ PDS_SERVICE_HANDLE_DOMAINS: ".{{top_domain}}" diff --git a/roles/docker-friendica/templates/docker-compose.yml.j2 b/roles/docker-friendica/templates/docker-compose.yml.j2 index 4d8c3e6e..5010576b 100644 --- a/roles/docker-friendica/templates/docker-compose.yml.j2 +++ b/roles/docker-friendica/templates/docker-compose.yml.j2 @@ -3,7 +3,7 @@ services: {% include 'templates/docker/services/' + database_type + '.yml.j2' %} application: - image: friendica + image: "friendica:{{friendica_version}}" restart: {{docker_restart_policy}} volumes: - data:/var/www/html diff --git a/roles/docker-gitea/templates/docker-compose.yml.j2 b/roles/docker-gitea/templates/docker-compose.yml.j2 index b200a283..fb9a73fc 100644 --- a/roles/docker-gitea/templates/docker-compose.yml.j2 +++ b/roles/docker-gitea/templates/docker-compose.yml.j2 @@ -6,7 +6,7 @@ services: logging: driver: journald restart: {{docker_restart_policy}} - image: gitea/gitea:latest + image: "gitea/gitea:{{gitea_version}}" environment: - USER_UID=1000 - USER_GID=1000 diff --git a/roles/docker-gitlab/templates/docker-compose.yml.j2 b/roles/docker-gitlab/templates/docker-compose.yml.j2 index 2a8a4b85..99a0c8bb 100644 --- a/roles/docker-gitlab/templates/docker-compose.yml.j2 +++ b/roles/docker-gitlab/templates/docker-compose.yml.j2 @@ -5,7 +5,7 @@ services: {% include 'templates/docker/services/' + database_type + '.yml.j2' %} web: - image: 'gitlab/gitlab-ee:latest' + image: "gitlab/gitlab-ee:{{gitlab_version}}" restart: {{docker_restart_policy}} hostname: '{{domain}}' environment: diff --git a/roles/docker-joomla/templates/docker-compose.yml.j2 b/roles/docker-joomla/templates/docker-compose.yml.j2 index 8b108d3f..44a0b8c3 100644 --- a/roles/docker-joomla/templates/docker-compose.yml.j2 +++ b/roles/docker-joomla/templates/docker-compose.yml.j2 @@ -3,7 +3,7 @@ services: {% include 'templates/docker/services/' + database_type + '.yml.j2' %} application: - image: joomla + image: "joomla:{{joomla_version}}" logging: driver: journald environment: diff --git a/roles/docker-listmonk/templates/docker-compose.yml.j2 b/roles/docker-listmonk/templates/docker-compose.yml.j2 index 251cac99..f35c1404 100644 --- a/roles/docker-listmonk/templates/docker-compose.yml.j2 +++ b/roles/docker-listmonk/templates/docker-compose.yml.j2 @@ -4,7 +4,7 @@ services: application: restart: {{docker_restart_policy}} - image: listmonk/listmonk:latest + image: listmonk/listmonk:{{listmonk_version}} ports: - "127.0.0.1:{{http_port}}:9000" environment: diff --git a/roles/docker-mariadb/tasks/main.yml b/roles/docker-mariadb/tasks/main.yml index d5de0e07..e6d5f371 100644 --- a/roles/docker-mariadb/tasks/main.yml +++ b/roles/docker-mariadb/tasks/main.yml @@ -7,7 +7,7 @@ - name: install MariaDB docker_container: name: central-mariadb - image: mariadb:latest #could lead to problems with nextcloud + image: "mariadb:{{mariadb_version}}" #could lead to problems with nextcloud detach: yes env: MARIADB_ROOT_PASSWORD: "{{central_mariadb_root_password}}" diff --git a/roles/docker-matomo/templates/docker-compose.yml.j2 b/roles/docker-matomo/templates/docker-compose.yml.j2 index ab0c0bbe..153aa0d8 100644 --- a/roles/docker-matomo/templates/docker-compose.yml.j2 +++ b/roles/docker-matomo/templates/docker-compose.yml.j2 @@ -5,7 +5,7 @@ services: application: logging: driver: journald - image: matomo + image: matomo:{{matomo_version}} restart: {{docker_restart_policy}} ports: - "127.0.0.1:{{http_port}}:80" diff --git a/roles/docker-matrix-compose/templates/docker-compose.yml.j2 b/roles/docker-matrix-compose/templates/docker-compose.yml.j2 index 36294b48..ac75630d 100644 --- a/roles/docker-matrix-compose/templates/docker-compose.yml.j2 +++ b/roles/docker-matrix-compose/templates/docker-compose.yml.j2 @@ -3,7 +3,7 @@ services: {% include 'templates/docker/services/' + database_type + '.yml.j2' %} synapse: - image: matrixdotorg/synapse:latest + image: matrixdotorg/synapse:{{matrix_synapse_version}} container_name: matrix-synapse restart: {{docker_restart_policy}} logging: @@ -33,7 +33,7 @@ services: {% include 'templates/docker/container/networks.yml.j2' %} element: - image: vectorim/element-web:latest + image: vectorim/element-web:{{matrix_synapse_element}} container_name: matrix-element restart: {{docker_restart_policy}} volumes: diff --git a/roles/docker-mediawiki/templates/docker-compose.yml.j2 b/roles/docker-mediawiki/templates/docker-compose.yml.j2 index 7cef1078..8af44097 100644 --- a/roles/docker-mediawiki/templates/docker-compose.yml.j2 +++ b/roles/docker-mediawiki/templates/docker-compose.yml.j2 @@ -2,6 +2,7 @@ services: {% include 'templates/docker/services/' + database_type + '.yml.j2' %} application: + # Seems like image tag got lost. @todo Check and implement if necessary log_driver: journald restart: "{{docker_restart_policy}}" depends_on: diff --git a/roles/docker-moodle/templates/docker-compose.yml.j2 b/roles/docker-moodle/templates/docker-compose.yml.j2 index 9edc84ea..0444e8f2 100644 --- a/roles/docker-moodle/templates/docker-compose.yml.j2 +++ b/roles/docker-moodle/templates/docker-compose.yml.j2 @@ -2,7 +2,7 @@ services: {% include 'templates/docker/services/' + database_type + '.yml.j2' %} moodle: - image: docker.io/bitnami/moodle:latest + image: docker.io/bitnami/moodle:{{moodle_version}} ports: - 127.0.0.1:{{http_port}}:8080 restart: {{docker_restart_policy}} diff --git a/roles/docker-mybb/templates/docker-compose.yml.j2 b/roles/docker-mybb/templates/docker-compose.yml.j2 index 88befd4e..2a106dbe 100644 --- a/roles/docker-mybb/templates/docker-compose.yml.j2 +++ b/roles/docker-mybb/templates/docker-compose.yml.j2 @@ -7,7 +7,7 @@ services: driver: journald options: tag: "mybb_application" - image: mybb/mybb:latest + image: mybb/mybb:{{mybb_version}} restart: {{docker_restart_policy}} volumes: - data:/var/www/html diff --git a/roles/docker-pixelfed/templates/docker-compose.yml.j2 b/roles/docker-pixelfed/templates/docker-compose.yml.j2 index 547412ad..49c945a0 100644 --- a/roles/docker-pixelfed/templates/docker-compose.yml.j2 +++ b/roles/docker-pixelfed/templates/docker-compose.yml.j2 @@ -5,7 +5,7 @@ services: {% include 'templates/docker/services/redis.yml.j2' %} application: - image: zknt/pixelfed + image: zknt/pixelfed:{{pixelfed_version}} restart: {{docker_restart_policy}} logging: driver: journald @@ -19,7 +19,7 @@ services: {% include 'templates/docker/container/depends-on-database-redis.yml.j2' %} {% include 'templates/docker/container/networks.yml.j2' %} worker: - image: zknt/pixelfed + image: zknt/pixelfed:{{pixelfed_version}} restart: {{docker_restart_policy}} logging: driver: journald diff --git a/roles/docker-postgres/tasks/main.yml b/roles/docker-postgres/tasks/main.yml index de87c832..ce65f8ae 100644 --- a/roles/docker-postgres/tasks/main.yml +++ b/roles/docker-postgres/tasks/main.yml @@ -7,7 +7,7 @@ - name: Install PostgreSQL docker_container: name: central-postgres - image: "postgres:{{database_version}}" + image: "postgres:{{postgres_database_version}}" detach: yes env: POSTGRES_PASSWORD: "{{ central_postgres_password }}" diff --git a/roles/docker-taiga/templates/docker-compose.yml.j2 b/roles/docker-taiga/templates/docker-compose.yml.j2 index b4d0b84c..4a69f797 100644 --- a/roles/docker-taiga/templates/docker-compose.yml.j2 +++ b/roles/docker-taiga/templates/docker-compose.yml.j2 @@ -41,7 +41,7 @@ services: restart: {{docker_restart_policy}} logging: driver: journald - image: taigaio/taiga-back:latest + image: taigaio/taiga-back:{{taiga_version}} environment: *default-back-environment volumes: *default-back-volumes diff --git a/roles/docker-yourls/templates/docker-compose.yml.j2 b/roles/docker-yourls/templates/docker-compose.yml.j2 index cbb44e79..db5b665e 100644 --- a/roles/docker-yourls/templates/docker-compose.yml.j2 +++ b/roles/docker-yourls/templates/docker-compose.yml.j2 @@ -5,7 +5,7 @@ services: application: logging: driver: journald - image: yourls + image: yourls:{{yourls_version}} restart: {{docker_restart_policy}} ports: - "127.0.0.1:{{http_port}}:80" diff --git a/templates/docker/services/postgres.yml.j2 b/templates/docker/services/postgres.yml.j2 index b0bf7260..a20e0078 100644 --- a/templates/docker/services/postgres.yml.j2 +++ b/templates/docker/services/postgres.yml.j2 @@ -1,7 +1,7 @@ # This template needs to be included in docker-compose.yml, which depend on a postgres database {% if not enable_central_database | bool %} database: - image: postgres:{{database_version}}-alpine + image: postgres:{{postgres_database_version}}-alpine container_name: {{docker_compose_project_name}}-database environment: - POSTGRES_PASSWORD={{database_password}} diff --git a/vars/docker-database.yml.j2 b/vars/docker-database.yml.j2 index ace823c5..f71aabca 100644 --- a/vars/docker-database.yml.j2 +++ b/vars/docker-database.yml.j2 @@ -1,5 +1,4 @@ database_instance: "{{ 'central-' + database_type if enable_central_database | bool else docker_compose_project_name }}" database_host: "{{ 'central-' + database_type if enable_central_database | bool else 'database' }}" database_name: "{{ docker_compose_project_name }}" -database_username: "{{ docker_compose_project_name }}" -database_version: "{{ postgres_default_version }}" \ No newline at end of file +database_username: "{{ docker_compose_project_name }}" \ No newline at end of file