From 37563a6a347e71e5cf32c767f6995e54bbc21a5a Mon Sep 17 00:00:00 2001 From: Amin Vakil Date: Fri, 30 May 2025 00:08:19 +0330 Subject: [PATCH 1/4] Remove version from docker-compose.yml the attribute `version` is obsolete, it will be ignored, please remove it to avoid potential confusion --- docker-compose.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/docker-compose.yml b/docker-compose.yml index e51ced9b..478c7cfb 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,4 +1,3 @@ -version: '2.3' services: redis: From ba1e228644c67a712f4f2b5eb9579a65700e836c Mon Sep 17 00:00:00 2001 From: Amin Vakil Date: Fri, 30 May 2025 00:09:21 +0330 Subject: [PATCH 2/4] yamllint --- docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose.yml b/docker-compose.yml index 478c7cfb..f2361b08 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,4 +1,4 @@ - +--- services: redis: restart: always From a10b1d51c897f73491971b87e0d7000903e1b8f0 Mon Sep 17 00:00:00 2001 From: Amin Vakil Date: Fri, 30 May 2025 13:53:53 +0330 Subject: [PATCH 3/4] Revert "yamllint" This reverts commit ba1e228644c67a712f4f2b5eb9579a65700e836c. --- docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose.yml b/docker-compose.yml index f2361b08..478c7cfb 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,4 +1,4 @@ ---- + services: redis: restart: always From fc8cca599b590572f2d69f58a7cdd87bc814db17 Mon Sep 17 00:00:00 2001 From: Amin Vakil Date: Fri, 30 May 2025 13:55:40 +0330 Subject: [PATCH 4/4] Remove version from compose files --- README.md | 2 -- contrib/docker-swarm/docker-compose.yml | 2 -- docker-compose.swarm.yml | 1 - docs/docker-compose-keycloak.yml | 2 -- docs/docker-compose-registry.yml | 2 -- docs/s3_compatible_storage.md | 2 -- 6 files changed, 11 deletions(-) diff --git a/README.md b/README.md index 2b020de1..f3546b6d 100644 --- a/README.md +++ b/README.md @@ -2807,8 +2807,6 @@ To do that you will need to set the environment variable `GITLAB_MONITORING_IP_W You can also set your `docker-compose.yml` [healthcheck](https://docs.docker.com/compose/compose-file/compose-file-v2/#healthcheck) configuration to make periodic checks: ```yml -version: '2.3' - services: gitlab: image: sameersbn/gitlab:18.0.1 diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml index e74c084b..0b5e97f2 100644 --- a/contrib/docker-swarm/docker-compose.yml +++ b/contrib/docker-swarm/docker-compose.yml @@ -1,5 +1,3 @@ -version: '3.4' - services: redis: restart: always diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml index a343b377..c16e0d82 100644 --- a/docker-compose.swarm.yml +++ b/docker-compose.swarm.yml @@ -1,4 +1,3 @@ -version: '3.4' services: redis: image: redis:7 diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml index 629be2eb..002bb409 100644 --- a/docs/docker-compose-keycloak.yml +++ b/docs/docker-compose-keycloak.yml @@ -1,5 +1,3 @@ -version: '2' - services: redis: restart: always diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml index e276f1dd..0dd32b4a 100644 --- a/docs/docker-compose-registry.yml +++ b/docs/docker-compose-registry.yml @@ -1,5 +1,3 @@ -version: '2' - services: redis: restart: always diff --git a/docs/s3_compatible_storage.md b/docs/s3_compatible_storage.md index 4fb7d0fb..6e5ba10a 100644 --- a/docs/s3_compatible_storage.md +++ b/docs/s3_compatible_storage.md @@ -65,8 +65,6 @@ Starting a fresh installation with GitLab would be like the `docker-compose` fil This is an example with minio. ```yml -version: '2' - services: redis: restart: always