Merge branch 'develop' into aggregate

Hhh-hyc · Jul 25, 2024 · 0304e6c · 0304e6c
2 parents 9abfabf + 501e40c
commit 0304e6c
Show file tree

Hide file tree

Showing 4 changed files with 0 additions and 9 deletions.
diff --git a/docker-compose.dev.yml b/docker-compose.dev.yml
@@ -2,8 +2,6 @@
 # 
 # docker-compose -f docker-compose.yml -f docker-compose.dev.yml
 
-version: '3.2'
-
 services:
 
   # web application. This expects the config.php to be copied from docker/web

diff --git a/docker-compose.https.yml b/docker-compose.https.yml
@@ -1,5 +1,4 @@
 # Use this file to enable https
-version: "3.2"
 
 services:
   traefik:

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -1,5 +1,3 @@
-version: "3.2"
-
 services:
 
   # webserver to handle all traffic. This can use let's encrypt to generate a SSL cert.

diff --git a/docker/docker-compose.example.yml b/docker/docker-compose.example.yml
@@ -1,7 +1,3 @@
-# you need a version entry, and this should be the same version as the
-# docker-compose.yml file.
-version: "3"
-
 # if you change any of the services you will need the services header.
 services: