Merge pull request DSpace#9522 from tdonohue/remove_compose_version

Remove obsolete "version" tag from Docker Compose files
4Science · May 1, 2024 · c0f454e · c0f454e
2 parents e903211 + 9ca0ad5
commit c0f454e
Show file tree

Hide file tree

Showing 9 changed files with 0 additions and 13 deletions.
diff --git a/docker-compose-cli.yml b/docker-compose-cli.yml
@@ -1,4 +1,3 @@
-version: "3.7"
 networks:
   # Default to using network named 'dspacenet' from docker-compose.yml.
   # Its full name will be prepended with the project name (e.g. "-p d7" means it will be named "d7_dspacenet")

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -1,4 +1,3 @@
-version: '3.7'
 networks:
   dspacenet:
     ipam:

diff --git a/dspace/src/main/docker-compose/cli.assetstore.yml b/dspace/src/main/docker-compose/cli.assetstore.yml
@@ -6,8 +6,6 @@
 # http://www.dspace.org/license/
 #
 
-version: "3.7"
-
 services:
   dspace-cli:
     environment:

diff --git a/dspace/src/main/docker-compose/cli.ingest.yml b/dspace/src/main/docker-compose/cli.ingest.yml
@@ -6,8 +6,6 @@
 # http://www.dspace.org/license/
 #
 
-version: "3.7"
-
 services:
   dspace-cli:
     environment:

diff --git a/dspace/src/main/docker-compose/db.entities.yml b/dspace/src/main/docker-compose/db.entities.yml
@@ -6,8 +6,6 @@
 # http://www.dspace.org/license/
 #
 
-version: "3.7"
-
 services:
   dspacedb:
     image: dspace/dspace-postgres-pgcrypto:${DSPACE_VER:-latest}-loadsql

diff --git a/dspace/src/main/docker-compose/db.restore.yml b/dspace/src/main/docker-compose/db.restore.yml
@@ -6,8 +6,6 @@
 # http://www.dspace.org/license/
 #
 
-version: "3.7"
-
 #
 # Overrides the default "dspacedb" container behavior to load a local SQL file into PostgreSQL.
 #

diff --git a/dspace/src/main/docker-compose/docker-compose-angular.yml b/dspace/src/main/docker-compose/docker-compose-angular.yml
@@ -6,7 +6,6 @@
 # http://www.dspace.org/license/
 #
 
-version: '3.7'
 networks:
   # Default to using network named 'dspacenet' from docker-compose.yml.
   # Its full name will be prepended with the project name (e.g. "-p d7" means it will be named "d7_dspacenet")

diff --git a/dspace/src/main/docker-compose/docker-compose-iiif.yml b/dspace/src/main/docker-compose/docker-compose-iiif.yml
@@ -10,7 +10,6 @@
 # Test environment for DSpace + Cantaloupe for IIIF support. See README for instructions.
 # This should NEVER be used in production scenarios.
 #
-version: '3.7'
 networks:
   # Default to using network named 'dspacenet' from docker-compose.yml.
   # Its full name will be prepended with the project name (e.g. "-p d7" means it will be named "d7_dspacenet")

diff --git a/dspace/src/main/docker-compose/docker-compose-shibboleth.yml b/dspace/src/main/docker-compose/docker-compose-shibboleth.yml
@@ -10,7 +10,6 @@
 # Test environment for DSpace + Shibboleth (running via mod_shib in Apache). See README for instructions.
 # This should NEVER be used in production scenarios.
 #
-version: '3.7'
 networks:
   # Default to using network named 'dspacenet' from docker-compose.yml.
   # Its full name will be prepended with the project name (e.g. "-p d7" means it will be named "d7_dspacenet")
-Original file line number
+Diff line change
@@ Expand Up / @@ -6,8 +6,6 @@ @@
     # http://www.dspace.org/license/
     #
-    version: "3.7"
     #
     # Overrides the default "dspacedb" container behavior to load a local SQL file into PostgreSQL.
     #
@@ Expand Down @@