From 015794458e0ef6c1683920a97275b0f527176e17 Mon Sep 17 00:00:00 2001 From: Kevin Veen-Birkenbach Date: Thu, 4 Apr 2024 15:54:21 +0200 Subject: [PATCH] Removed obsolete version attribute --- roles/docker-akaunting/templates/docker-compose.yml.j2 | 2 -- roles/docker-attendize/templates/docker-compose.yml.j2 | 1 - roles/docker-baserow/templates/docker-compose.yml.j2 | 2 -- roles/docker-discourse/templates/docker-compose.yml.j2 | 2 -- roles/docker-elk/templates/docker-compose.yml.j2 | 2 -- roles/docker-funkwhale/templates/docker-compose.yml.j2 | 2 -- roles/docker-gitea/templates/docker-compose.yml.j2 | 2 -- roles/docker-gitlab/templates/docker-compose.yml.j2 | 1 - roles/docker-joomla/templates/docker-compose.yml.j2 | 2 -- roles/docker-ldap-sso/templates/docker-compose.yml.j2 | 2 -- roles/docker-listmonk/templates/docker-compose.yml.j2 | 2 -- roles/docker-mailu/templates/docker-compose.yml.j2 | 2 -- roles/docker-mastodon/templates/docker-compose.yml.j2 | 1 - roles/docker-matomo/templates/docker-compose.yml.j2 | 2 -- roles/docker-matrix-compose/templates/docker-compose.yml.j2 | 2 -- roles/docker-mybb/templates/docker-compose.yml.j2 | 1 - roles/docker-nextcloud/templates/docker-compose.yml.j2 | 2 -- roles/docker-openproject/templates/docker-compose.yml.j2 | 2 -- roles/docker-peertube/templates/docker-compose.yml.j2 | 2 -- roles/docker-pixelfed/templates/docker-compose.yml.j2 | 2 -- roles/docker-roulette-wheel/templates/docker-compose.yml.j2 | 1 - roles/docker-wordpress/templates/docker-compose.yml.j2 | 2 -- roles/docker-yourls/templates/docker-compose.yml.j2 | 2 -- 23 files changed, 41 deletions(-) diff --git a/roles/docker-akaunting/templates/docker-compose.yml.j2 b/roles/docker-akaunting/templates/docker-compose.yml.j2 index 6a0dd0d7..95477de6 100644 --- a/roles/docker-akaunting/templates/docker-compose.yml.j2 +++ b/roles/docker-akaunting/templates/docker-compose.yml.j2 @@ -1,5 +1,3 @@ -version: '3.7' - services: {% include 'templates/docker/services/' + database_type + '.yml.j2' %} diff --git a/roles/docker-attendize/templates/docker-compose.yml.j2 b/roles/docker-attendize/templates/docker-compose.yml.j2 index 66155666..924af5f4 100644 --- a/roles/docker-attendize/templates/docker-compose.yml.j2 +++ b/roles/docker-attendize/templates/docker-compose.yml.j2 @@ -1,4 +1,3 @@ -version: '3.2' services: {% include 'templates/docker/services/redis.yml.j2' %} diff --git a/roles/docker-baserow/templates/docker-compose.yml.j2 b/roles/docker-baserow/templates/docker-compose.yml.j2 index 688763f0..33208bb4 100644 --- a/roles/docker-baserow/templates/docker-compose.yml.j2 +++ b/roles/docker-baserow/templates/docker-compose.yml.j2 @@ -1,5 +1,3 @@ -version: '2' - services: {% include 'templates/docker/services/redis.yml.j2' %} diff --git a/roles/docker-discourse/templates/docker-compose.yml.j2 b/roles/docker-discourse/templates/docker-compose.yml.j2 index fd71c817..312b2940 100644 --- a/roles/docker-discourse/templates/docker-compose.yml.j2 +++ b/roles/docker-discourse/templates/docker-compose.yml.j2 @@ -1,5 +1,3 @@ -version: '3.8' - services: {% include 'templates/docker/services/redis.yml.j2' %} diff --git a/roles/docker-elk/templates/docker-compose.yml.j2 b/roles/docker-elk/templates/docker-compose.yml.j2 index 81c50ce3..863ef4c7 100644 --- a/roles/docker-elk/templates/docker-compose.yml.j2 +++ b/roles/docker-elk/templates/docker-compose.yml.j2 @@ -1,5 +1,3 @@ -version: '3.2' - services: elasticsearch: build: diff --git a/roles/docker-funkwhale/templates/docker-compose.yml.j2 b/roles/docker-funkwhale/templates/docker-compose.yml.j2 index deb40e00..37695a8a 100644 --- a/roles/docker-funkwhale/templates/docker-compose.yml.j2 +++ b/roles/docker-funkwhale/templates/docker-compose.yml.j2 @@ -1,5 +1,3 @@ -version: "3" - services: {% include 'templates/docker/services/redis.yml.j2' %} diff --git a/roles/docker-gitea/templates/docker-compose.yml.j2 b/roles/docker-gitea/templates/docker-compose.yml.j2 index a0d877af..b200a283 100644 --- a/roles/docker-gitea/templates/docker-compose.yml.j2 +++ b/roles/docker-gitea/templates/docker-compose.yml.j2 @@ -1,5 +1,3 @@ -version: '3' - services: {% include 'templates/docker/services/' + database_type + '.yml.j2' %} diff --git a/roles/docker-gitlab/templates/docker-compose.yml.j2 b/roles/docker-gitlab/templates/docker-compose.yml.j2 index 0fa50013..2a8a4b85 100644 --- a/roles/docker-gitlab/templates/docker-compose.yml.j2 +++ b/roles/docker-gitlab/templates/docker-compose.yml.j2 @@ -1,4 +1,3 @@ -version: '3.6' services: {% include 'templates/docker/services/redis.yml.j2' %} diff --git a/roles/docker-joomla/templates/docker-compose.yml.j2 b/roles/docker-joomla/templates/docker-compose.yml.j2 index 638454f3..8b108d3f 100644 --- a/roles/docker-joomla/templates/docker-compose.yml.j2 +++ b/roles/docker-joomla/templates/docker-compose.yml.j2 @@ -1,5 +1,3 @@ -version: '3' - services: {% include 'templates/docker/services/' + database_type + '.yml.j2' %} diff --git a/roles/docker-ldap-sso/templates/docker-compose.yml.j2 b/roles/docker-ldap-sso/templates/docker-compose.yml.j2 index 8a3ba194..3002b3e4 100644 --- a/roles/docker-ldap-sso/templates/docker-compose.yml.j2 +++ b/roles/docker-ldap-sso/templates/docker-compose.yml.j2 @@ -1,5 +1,3 @@ -version: '3' - services: openldap: image: osixia/openldap:1.2.4 diff --git a/roles/docker-listmonk/templates/docker-compose.yml.j2 b/roles/docker-listmonk/templates/docker-compose.yml.j2 index 5e303d29..251cac99 100644 --- a/roles/docker-listmonk/templates/docker-compose.yml.j2 +++ b/roles/docker-listmonk/templates/docker-compose.yml.j2 @@ -1,5 +1,3 @@ -version: "3.7" - services: {% include 'templates/docker/services/' + database_type + '.yml.j2' %} diff --git a/roles/docker-mailu/templates/docker-compose.yml.j2 b/roles/docker-mailu/templates/docker-compose.yml.j2 index 18cb5ddf..081c7bb1 100644 --- a/roles/docker-mailu/templates/docker-compose.yml.j2 +++ b/roles/docker-mailu/templates/docker-compose.yml.j2 @@ -1,5 +1,3 @@ -version: '2.2' - services: {% include 'templates/docker/services/redis.yml.j2' %} diff --git a/roles/docker-mastodon/templates/docker-compose.yml.j2 b/roles/docker-mastodon/templates/docker-compose.yml.j2 index 58aef252..ce8540ca 100644 --- a/roles/docker-mastodon/templates/docker-compose.yml.j2 +++ b/roles/docker-mastodon/templates/docker-compose.yml.j2 @@ -1,4 +1,3 @@ -version: '3' services: {% include 'templates/docker/services/redis.yml.j2' %} diff --git a/roles/docker-matomo/templates/docker-compose.yml.j2 b/roles/docker-matomo/templates/docker-compose.yml.j2 index bb4ee4c1..ab0c0bbe 100644 --- a/roles/docker-matomo/templates/docker-compose.yml.j2 +++ b/roles/docker-matomo/templates/docker-compose.yml.j2 @@ -1,5 +1,3 @@ -version: '3' - services: {% include 'templates/docker/services/' + database_type + '.yml.j2' %} diff --git a/roles/docker-matrix-compose/templates/docker-compose.yml.j2 b/roles/docker-matrix-compose/templates/docker-compose.yml.j2 index bac6c3eb..d6877918 100644 --- a/roles/docker-matrix-compose/templates/docker-compose.yml.j2 +++ b/roles/docker-matrix-compose/templates/docker-compose.yml.j2 @@ -1,5 +1,3 @@ -version: '3.1' - services: {% include 'templates/docker/services/' + database_type + '.yml.j2' %} diff --git a/roles/docker-mybb/templates/docker-compose.yml.j2 b/roles/docker-mybb/templates/docker-compose.yml.j2 index 5688ca0f..88befd4e 100644 --- a/roles/docker-mybb/templates/docker-compose.yml.j2 +++ b/roles/docker-mybb/templates/docker-compose.yml.j2 @@ -1,4 +1,3 @@ -version: '3.8' services: {% include 'templates/docker/services/' + database_type + '.yml.j2' %} diff --git a/roles/docker-nextcloud/templates/docker-compose.yml.j2 b/roles/docker-nextcloud/templates/docker-compose.yml.j2 index 80c659d2..13518b1b 100644 --- a/roles/docker-nextcloud/templates/docker-compose.yml.j2 +++ b/roles/docker-nextcloud/templates/docker-compose.yml.j2 @@ -1,5 +1,3 @@ -version: '3' - services: {% include 'templates/docker/services/redis.yml.j2' %} diff --git a/roles/docker-openproject/templates/docker-compose.yml.j2 b/roles/docker-openproject/templates/docker-compose.yml.j2 index 67f05b21..d9d9e444 100644 --- a/roles/docker-openproject/templates/docker-compose.yml.j2 +++ b/roles/docker-openproject/templates/docker-compose.yml.j2 @@ -1,5 +1,3 @@ -version: "3.7" - x-op-app: &app logging: driver: journald diff --git a/roles/docker-peertube/templates/docker-compose.yml.j2 b/roles/docker-peertube/templates/docker-compose.yml.j2 index 75e378fc..919e912b 100644 --- a/roles/docker-peertube/templates/docker-compose.yml.j2 +++ b/roles/docker-peertube/templates/docker-compose.yml.j2 @@ -1,5 +1,3 @@ -version: "3.3" - services: {% include 'templates/docker/services/redis.yml.j2' %} diff --git a/roles/docker-pixelfed/templates/docker-compose.yml.j2 b/roles/docker-pixelfed/templates/docker-compose.yml.j2 index 6b3fa9c2..3e8880da 100644 --- a/roles/docker-pixelfed/templates/docker-compose.yml.j2 +++ b/roles/docker-pixelfed/templates/docker-compose.yml.j2 @@ -1,5 +1,3 @@ -version: '2' - services: {% include 'templates/docker/services/' + database_type + '.yml.j2' %} diff --git a/roles/docker-roulette-wheel/templates/docker-compose.yml.j2 b/roles/docker-roulette-wheel/templates/docker-compose.yml.j2 index 418615f1..cf8324f6 100644 --- a/roles/docker-roulette-wheel/templates/docker-compose.yml.j2 +++ b/roles/docker-roulette-wheel/templates/docker-compose.yml.j2 @@ -1,4 +1,3 @@ -version: '3.7' services: application: container_name: roulette_application diff --git a/roles/docker-wordpress/templates/docker-compose.yml.j2 b/roles/docker-wordpress/templates/docker-compose.yml.j2 index 527427bf..77a141bb 100644 --- a/roles/docker-wordpress/templates/docker-compose.yml.j2 +++ b/roles/docker-wordpress/templates/docker-compose.yml.j2 @@ -1,5 +1,3 @@ -version: '3' - services: {% include 'templates/docker/services/' + database_type + '.yml.j2' %} diff --git a/roles/docker-yourls/templates/docker-compose.yml.j2 b/roles/docker-yourls/templates/docker-compose.yml.j2 index 96be019c..cbb44e79 100644 --- a/roles/docker-yourls/templates/docker-compose.yml.j2 +++ b/roles/docker-yourls/templates/docker-compose.yml.j2 @@ -1,5 +1,3 @@ -version: '3' - services: {% include 'templates/docker/services/' + database_type + '.yml.j2' %}