From 52d4ac0ed1836adae65d991df354a6c3cc147076 Mon Sep 17 00:00:00 2001 From: JonJagger Date: Sat, 26 Oct 2024 07:54:07 +0100 Subject: [PATCH] Remove version: from docker-compose yml files --- app/docker-compose/container-name.yml | 2 -- app/docker-compose/depends-on.yml | 2 -- app/docker-compose/env-files.yml | 4 +--- app/docker-compose/environment.yml | 2 -- app/docker-compose/images.yml | 2 -- app/docker-compose/networks.yml | 2 -- app/docker-compose/ports.yml | 2 -- app/docker-compose/read_only.yml | 2 -- app/docker-compose/restart.yml | 2 -- app/docker-compose/swarm.yml | 3 --- app/docker-compose/tmp-fs.yml | 2 -- app/docker-compose/user.yml | 2 -- app/docker-compose/volumes-mac.yml | 2 -- app/docker-compose/volumes.yml | 2 -- 14 files changed, 1 insertion(+), 30 deletions(-) diff --git a/app/docker-compose/container-name.yml b/app/docker-compose/container-name.yml index e314661..0a0deda 100644 --- a/app/docker-compose/container-name.yml +++ b/app/docker-compose/container-name.yml @@ -1,6 +1,4 @@ -version: '3.7' - services: nginx: diff --git a/app/docker-compose/depends-on.yml b/app/docker-compose/depends-on.yml index 9714a0b..60bfa7b 100644 --- a/app/docker-compose/depends-on.yml +++ b/app/docker-compose/depends-on.yml @@ -1,6 +1,4 @@ -version: '3.7' - services: nginx: diff --git a/app/docker-compose/env-files.yml b/app/docker-compose/env-files.yml index ac503a2..48e1a49 100644 --- a/app/docker-compose/env-files.yml +++ b/app/docker-compose/env-files.yml @@ -1,8 +1,6 @@ -version: '3.7' - # Two services have their own .env files -# These can be overriden by exporting an env-var +# These can be overridden by exporting an env-var # to the .env files new absolute path before # doing a [cyber-dojo up] # eg diff --git a/app/docker-compose/environment.yml b/app/docker-compose/environment.yml index cb71e0c..61e4082 100755 --- a/app/docker-compose/environment.yml +++ b/app/docker-compose/environment.yml @@ -1,6 +1,4 @@ -version: '3.7' - services: web: diff --git a/app/docker-compose/images.yml b/app/docker-compose/images.yml index 9070a1d..d399232 100644 --- a/app/docker-compose/images.yml +++ b/app/docker-compose/images.yml @@ -1,6 +1,4 @@ -version: '3.7' - services: # env-vars come from cyberdojo/versioner:latest diff --git a/app/docker-compose/networks.yml b/app/docker-compose/networks.yml index ab3efd9..54b074f 100644 --- a/app/docker-compose/networks.yml +++ b/app/docker-compose/networks.yml @@ -1,6 +1,4 @@ -version: '3.7' - networks: cyber-dojo: driver: bridge diff --git a/app/docker-compose/ports.yml b/app/docker-compose/ports.yml index 2aa4e74..c22c871 100644 --- a/app/docker-compose/ports.yml +++ b/app/docker-compose/ports.yml @@ -1,6 +1,4 @@ -version: '3.7' - services: nginx: ports: diff --git a/app/docker-compose/read_only.yml b/app/docker-compose/read_only.yml index 84420be..1484fc7 100644 --- a/app/docker-compose/read_only.yml +++ b/app/docker-compose/read_only.yml @@ -1,6 +1,4 @@ -version: '3.7' - services: custom-start-points: diff --git a/app/docker-compose/restart.yml b/app/docker-compose/restart.yml index 596f24d..310b833 100644 --- a/app/docker-compose/restart.yml +++ b/app/docker-compose/restart.yml @@ -1,6 +1,4 @@ -version: '3.7' - services: nginx: diff --git a/app/docker-compose/swarm.yml b/app/docker-compose/swarm.yml index a5a74da..a34e074 100644 --- a/app/docker-compose/swarm.yml +++ b/app/docker-compose/swarm.yml @@ -1,6 +1,4 @@ -version: '3.7' - services: saver: @@ -15,7 +13,6 @@ services: memory: 64M cpus: '0.5' - # - - - - - - - - - - - - - - - - - - - - - - - nginx: deploy: mode: global diff --git a/app/docker-compose/tmp-fs.yml b/app/docker-compose/tmp-fs.yml index 9a7e25d..ca3b688 100644 --- a/app/docker-compose/tmp-fs.yml +++ b/app/docker-compose/tmp-fs.yml @@ -1,6 +1,4 @@ -version: '3.7' - services: creator: diff --git a/app/docker-compose/user.yml b/app/docker-compose/user.yml index 8035c36..ca762fd 100644 --- a/app/docker-compose/user.yml +++ b/app/docker-compose/user.yml @@ -1,6 +1,4 @@ -version: '3.7' - services: nginx: diff --git a/app/docker-compose/volumes-mac.yml b/app/docker-compose/volumes-mac.yml index 74e857d..5ae50e1 100644 --- a/app/docker-compose/volumes-mac.yml +++ b/app/docker-compose/volumes-mac.yml @@ -1,6 +1,4 @@ -version: '3.7' - services: runner: volumes: [ "/var/run/docker.sock:/var/run/docker.sock" ] diff --git a/app/docker-compose/volumes.yml b/app/docker-compose/volumes.yml index bf1f281..0fc4d3e 100644 --- a/app/docker-compose/volumes.yml +++ b/app/docker-compose/volumes.yml @@ -1,6 +1,4 @@ -version: '3.7' - services: runner: volumes: [ "/var/run/docker.sock:/var/run/docker.sock" ]