Dropped the obsolete "version" prop in docker compose yml files

docksal · Apr 19, 2024 · 9441975 · 9441975
1 parent 1748749
commit 9441975
Show file tree

Hide file tree

Showing 23 changed files with 0 additions and 91 deletions.
diff --git a/docs/content/core/networking.md b/docs/content/core/networking.md
@@ -30,8 +30,6 @@ This is recommended for creating local overrides instead of modifying `docksal.y
 This will instruct Docker to export port `22` of the `cli` service as port `2222` on your host.
 
 ```yaml
-version: "2.1"
-
 services:
   cli:
     ports:

diff --git a/docs/content/core/system-dns.md b/docs/content/core/system-dns.md
@@ -65,8 +65,6 @@ To have your project containers resolve a custom DNS record, you can use the doc
 Add this parameter in the project's `docksal.yml` to any container, where you want your custom DNS records to work:
 
 ```yaml
-version: "2.1"
-
 services:
   cli:
     extra_hosts:

diff --git a/docs/content/core/system-vhost-proxy.md b/docs/content/core/system-vhost-proxy.md
@@ -57,8 +57,6 @@ either `docksal-local.yml` or `docksal.yml` file in the project.
 Multiple domains have to be separated by commas. Wildcards are supported on the left or right side, but not inbetween.
 
 ```yaml
-version: "2.1"
-
 services:
   web:
     labels:

diff --git a/docs/content/service/other/apache-solr.md b/docs/content/service/other/apache-solr.md
@@ -143,7 +143,6 @@ fin config set SOLR_IMAGE='docksal/solr:8'
 
 ```yml
 ---
-version: "3.9"
 services:
   # Solr 8
   solr:

diff --git a/docs/content/service/other/redis.md b/docs/content/service/other/redis.md
@@ -14,8 +14,6 @@ This is the default method.
 Add the following to the `docksal.yml` file in your project.
 
 ```yaml
-version: "2.1"
-
 services:
   # Redis
   redis:
@@ -61,8 +59,6 @@ This list may become outdated. Please check [wodby/redis](https://github.com/wod
 This can be done by adding a line to reference the custom config file (`.docksal/etc/redis/redis.conf`) in the `docksal.yml` file. The following is an example.
 
 ```yaml
-version: "2.1"
-
 services:
   redis:
     hostname: redis

diff --git a/docs/content/stack/extend-images.md b/docs/content/stack/extend-images.md
@@ -96,8 +96,6 @@ If using default Docksal stacks (no `docksal.yml` in the project repo), create a
 with the following content:
 
 ```yaml
-version: "2.1"
-
 services:
   <service-name>:
     image: ${COMPOSE_PROJECT_NAME_SAFE}_<service-name>

diff --git a/stacks/overrides-cloudflared.yml b/stacks/overrides-cloudflared.yml
@@ -1,7 +1,5 @@
 # Adds Cloudflare Tunnel (cloudflared) service to the project
 
-version: "3.9"
-
 services:
   cloudflared:
     extends:

diff --git a/stacks/overrides-dd-bind.yml b/stacks/overrides-dd-bind.yml
@@ -3,8 +3,6 @@
 # See: https://github.com/docksal/docksal/issues/1368
 # Upstream issue: https://github.com/docker/for-win/issues/6628
 
-version: "3.9"
-
 volumes:
   project_root:
     driver: local

diff --git a/stacks/overrides-gitpod.yml b/stacks/overrides-gitpod.yml
@@ -1,7 +1,5 @@
 # Adds Gitpod service to the project
 
-version: "3.9"
-
 services:
   web:
     labels:

diff --git a/stacks/overrides-ide.yml b/stacks/overrides-ide.yml
@@ -1,8 +1,6 @@
 # Adds Web IDE service to the project
 # The IDE can be accessed at ide-${VIRTUAL_HOST}
 
-version: "3.9"
-
 services:
 
   cli:

diff --git a/stacks/overrides-xhprof.yml b/stacks/overrides-xhprof.yml
@@ -1,8 +1,6 @@
 # Adds XHProf service to the project
 # The XHProf Outputs can be accessed at xhprof.${VIRTUAL_HOST}
 
-version: "3.9"
-
 services:
 
   cli:

diff --git a/stacks/services.yml b/stacks/services.yml
@@ -2,8 +2,6 @@
 # To use any service extend it from this file located at ${HOME}/.docksal/stacks/services.yml.
 # See ${HOME}/.docksal/stacks/default.yml for a basic LAMP stack extending from web, db and cli services in this file.
 
-version: "3.9"
-
 x-common-settings: &common-settings
   dns:
     - ${DOCKSAL_DNS1}
@@ -32,9 +30,6 @@ services:
       - APACHE_FCGI_HOST_PORT=cli:9000
       - APACHE_BASIC_AUTH_USER
       - APACHE_BASIC_AUTH_PASS
-    # << : *dns
-    # << : *logging
-    # << : *healthcheck
     <<: *common-settings
 
   # Web: Nginx
@@ -54,9 +49,6 @@ services:
     - NGINX_SERVER_ROOT=/var/www/${DOCROOT}
     - NGINX_BASIC_AUTH_USER
     - NGINX_BASIC_AUTH_PASS
-    # << : *dns
-    # << : *logging
-    # << : *healthcheck
     <<: *common-settings
 
   # DB: MySQL
@@ -77,9 +69,6 @@ services:
       - MYSQL_RANDOM_ROOT_PASSWORD
       - MYSQL_ONETIME_PASSWORD
       - MYSQL_INITDB_SKIP_TZINFO
-    # << : *dns
-    # << : *logging
-    # << : *healthcheck
     <<: *common-settings
 
   # DB: MySQL
@@ -100,9 +89,6 @@ services:
     - MYSQL_RANDOM_ROOT_PASSWORD
     - MYSQL_ONETIME_PASSWORD
     - MYSQL_INITDB_SKIP_TZINFO
-    # << : *dns
-    # << : *logging
-    # << : *healthcheck
     <<: *common-settings
 
   # DB: PostgreSQL
@@ -118,9 +104,6 @@ services:
       - POSTGRES_DB=${POSTGRES_DB:-default}
       - POSTGRES_USER=${POSTGRES_USER:-user}
       - POSTGRES_PASSWORD=${POSTGRES_PASSWORD:-user}
-    # << : *dns
-    # << : *logging
-    # << : *healthcheck
     <<: *common-settings
 
   # CLI - Used for all console commands and tools.
@@ -164,9 +147,6 @@ services:
       - COMPOSER_DEFAULT_VERSION
       - COMPOSER_ALLOW_XDEBUG=${XDEBUG_ENABLED:-0}
       - COMPOSER_DISABLE_XDEBUG_WARN=${XDEBUG_ENABLED:-0}
-    # << : *dns
-    # << : *logging
-    # << : *healthcheck
     <<: *common-settings
 
   # Varnish
@@ -180,19 +160,13 @@ services:
       - io.docksal.cert-name=${VIRTUAL_HOST_CERT_NAME:-none}
     environment:
       - VARNISH_BACKEND_HOST=web
-    # << : *dns
-    # << : *logging
-    # << : *healthcheck
     <<: *common-settings
 
   # Memcached
   memcached:
     hostname: memcached
     image: ${MEMCACHED_IMAGE:-memcached:1.6-alpine}
     command: ["-m", "128"]  # Set memcached memory limit to 128 MB by default
-    # << : *dns
-    # << : *logging
-    # << : *healthcheck
     <<: *common-settings
 
   # Redis
@@ -202,9 +176,6 @@ services:
     environment:
       - REDIS_MAXMEMORY=${REDIS_MAXMEMORY:-256m}
       # Additional variables can be found https://github.com/wodby/redis
-    # << : *dns
-    # << : *logging
-    # << : *healthcheck
     <<: *common-settings
 
   # Solr
@@ -217,9 +188,6 @@ services:
       - io.docksal.virtual-host=solr.${VIRTUAL_HOST},solr.${VIRTUAL_HOST}.*
       - io.docksal.virtual-port=8983
       - io.docksal.cert-name=${VIRTUAL_HOST_CERT_NAME:-none}
-    # << : *dns
-    # << : *logging
-    # << : *healthcheck
     <<: *common-settings
 
   # Mailpit
@@ -232,9 +200,6 @@ services:
       - io.docksal.virtual-host=mail.${VIRTUAL_HOST},mail.${VIRTUAL_HOST}.*
       - io.docksal.virtual-port=8025
       - io.docksal.cert-name=${VIRTUAL_HOST_CERT_NAME:-none}
-    # << : *dns
-    # << : *logging
-    # << : *healthcheck
     <<: *common-settings
 
   # Blackfire
@@ -243,9 +208,6 @@ services:
     environment:
       - BLACKFIRE_SERVER_ID
       - BLACKFIRE_SERVER_TOKEN
-    # << : *dns
-    # << : *logging
-    # << : *healthcheck
     <<: *common-settings
 
   # Elastic Search
@@ -262,9 +224,6 @@ services:
       memlock:
         soft: -1
         hard: -1
-    # << : *dns
-    # << : *logging
-    # << : *healthcheck
     <<: *common-settings
 
   # Cloudflare Tunnel
@@ -275,7 +234,4 @@ services:
       - TUNNEL_URL=http://web
       - NO_AUTOUPDATE=true
     command: ["tunnel"]
-    # << : *dns
-    # << : *logging
-    # << : *healthcheck
     <<: *common-settings
diff --git a/stacks/stack-acquia.yml b/stacks/stack-acquia.yml
@@ -7,8 +7,6 @@
 # - Memcached 1.6
 # - Apache Solr 7
 
-version: "3.9"
-
 services:
   # http(s)://VIRTUAL_HOST
   web:

diff --git a/stacks/stack-default-nodb.yml b/stacks/stack-default-nodb.yml
@@ -1,7 +1,5 @@
 # Default stack sans DB
 
-version: "3.9"
-
 services:
   # Web
   web:

diff --git a/stacks/stack-default.yml b/stacks/stack-default.yml
@@ -3,8 +3,6 @@
 # - MariaDB 10.6
 # - PHP 8.1
 
-version: "3.9"
-
 services:
   # http(s)://VIRTUAL_HOST
   web:

diff --git a/stacks/stack-node.yml b/stacks/stack-node.yml
@@ -1,7 +1,5 @@
 # Node.js stack
 
-version: "3.9"
-
 services:
   cli:
     extends:

diff --git a/stacks/stack-pantheon.yml b/stacks/stack-pantheon.yml
@@ -7,8 +7,6 @@
 # - Redis 5.0
 # - Apache Solr 3.6
 
-version: "3.9"
-
 services:
   # http(s)://VIRTUAL_HOST
   web:

diff --git a/stacks/stack-platformsh.yml b/stacks/stack-platformsh.yml
@@ -6,8 +6,6 @@
 # - PHP 8.1
 # - Redis 5.0
 
-version: "3.9"
-
 services:
   # http(s)://VIRTUAL_HOST
   web:

diff --git a/stacks/volumes-bind.yml b/stacks/volumes-bind.yml
@@ -1,8 +1,6 @@
 # Bind mount project volumes
 # Same as mounting host folders, but via named volumes.
 
-version: "3.9"
-
 volumes:
   cli_home:  # /home/docker volume in cli
   project_root:  # Project root volume (bind mount)

diff --git a/stacks/volumes-nfs.yml b/stacks/volumes-nfs.yml
@@ -3,8 +3,6 @@
 # Pros: very good performance, almost realtime file sync 
 # Cons: no inotify/fs watchers
 
-version: "3.9"
-
 volumes:
   cli_home:  # /home/docker volume in cli
   project_root:  # Project root volume (NFS)

diff --git a/stacks/volumes-none.yml b/stacks/volumes-none.yml
@@ -4,8 +4,6 @@
 # Can be used to provision completely blank environments and have all work (code checkout, etc.) done inside cli.
 # Provides THE BEST fs performance.
 
-version: "3.9"
-
 volumes:
   cli_home:  # /home/docker volume in cli
   project_root: # Project root volume

diff --git a/stacks/volumes-unison.yml b/stacks/volumes-unison.yml
@@ -3,8 +3,6 @@
 # Pros: native fs performance, fast file sync, inotify/fs watchers support.
 # Cons: 2x space usage (a mirror of the code base is maintained in a Docker volume), initial sync delay
 
-version: "3.9"
-
 volumes:
   cli_home:  # /home/docker volume in cli
   project_root: # Project root volume

diff --git a/tests/config.bats b/tests/config.bats
@@ -92,8 +92,6 @@ services:
 
 	# Add a stack override via docksal.yml
 	yml='
-version: "2.1"
-
 services:
   cli:
     image: docksal/cli
@@ -133,8 +131,6 @@ services:
 
 	# Add a stack override via docksal-local.yml
 	yml='
-version: "2.1"
-
 services:
   cli:
     image: docksal/cli