From b42a5567f8f7872a4aa88e4863733410a6a4867f Mon Sep 17 00:00:00 2001 From: Sascha Szott Date: Wed, 8 May 2024 15:20:48 +0200 Subject: [PATCH 1/9] remove version top-level element (obsolete) --- docker-compose.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/docker-compose.yml b/docker-compose.yml index 6c161504072..248d900771a 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,4 +1,3 @@ -version: '3.7' networks: dspacenet: ipam: From bb8ccce7e0089935b3df7404a423cea69e51e3c0 Mon Sep 17 00:00:00 2001 From: Sascha Szott Date: Wed, 8 May 2024 15:21:42 +0200 Subject: [PATCH 2/9] remove obsolete top-level element version --- docker-compose-cli.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/docker-compose-cli.yml b/docker-compose-cli.yml index 9c66fed6835..1ff386d33e3 100644 --- a/docker-compose-cli.yml +++ b/docker-compose-cli.yml @@ -1,5 +1,3 @@ -version: "3.7" - services: dspace-cli: image: "${DOCKER_OWNER:-dspace}/dspace-cli:${DSPACE_VER:-dspace-7_x}" From 53774dcdccbe8f23a86a674751814ec3883a32e6 Mon Sep 17 00:00:00 2001 From: Sascha Szott Date: Wed, 8 May 2024 15:22:12 +0200 Subject: [PATCH 3/9] remove obsolete top-level element version --- dspace/src/main/docker-compose/docker-compose-iiif.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dspace/src/main/docker-compose/docker-compose-iiif.yml b/dspace/src/main/docker-compose/docker-compose-iiif.yml index 2ab58d9014f..65422431dc0 100644 --- 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: dspacenet: services: @@ -36,4 +35,4 @@ services: CANTALOUPE_SOURCE_STATIC: 'HttpSource' # Notice this URL accesses the 'dspace' container, port 8080, which is the container running the REST API. CANTALOUPE_HTTPSOURCE_BASICLOOKUPSTRATEGY_URL_PREFIX: 'http://dspace:8080/server/api/core/bitstreams/' - CANTALOUPE_HTTPSOURCE_BASICLOOKUPSTRATEGY_URL_SUFFIX: '/content' \ No newline at end of file + CANTALOUPE_HTTPSOURCE_BASICLOOKUPSTRATEGY_URL_SUFFIX: '/content' From 550d90b23cde37de26aed44dbeb9193216d73d6e Mon Sep 17 00:00:00 2001 From: Sascha Szott Date: Wed, 8 May 2024 15:22:38 +0200 Subject: [PATCH 4/9] remove obsolete top-level element version --- dspace/src/main/docker-compose/docker-compose-angular.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/dspace/src/main/docker-compose/docker-compose-angular.yml b/dspace/src/main/docker-compose/docker-compose-angular.yml index 00dde2e8318..1c5d537d720 100644 --- a/dspace/src/main/docker-compose/docker-compose-angular.yml +++ b/dspace/src/main/docker-compose/docker-compose-angular.yml @@ -5,8 +5,6 @@ # # http://www.dspace.org/license/ # - -version: '3.7' networks: dspacenet: services: From 7067b90f9f897fc866659781927969edb70c9dd7 Mon Sep 17 00:00:00 2001 From: Sascha Szott Date: Wed, 8 May 2024 15:22:52 +0200 Subject: [PATCH 5/9] remove obsolete top-level element version --- dspace/src/main/docker-compose/docker-compose-shibboleth.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/dspace/src/main/docker-compose/docker-compose-shibboleth.yml b/dspace/src/main/docker-compose/docker-compose-shibboleth.yml index 58f1527d6cc..e5daaef15e7 100644 --- 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: dspacenet: services: From 1ceb998b9e46b55bb4cb86281672fd953accab6f Mon Sep 17 00:00:00 2001 From: Sascha Szott Date: Wed, 8 May 2024 15:23:16 +0200 Subject: [PATCH 6/9] remove obsolete top-level element version --- dspace/src/main/docker-compose/db.restore.yml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/dspace/src/main/docker-compose/db.restore.yml b/dspace/src/main/docker-compose/db.restore.yml index fc2f30b9d8e..6170e036d1e 100644 --- a/dspace/src/main/docker-compose/db.restore.yml +++ b/dspace/src/main/docker-compose/db.restore.yml @@ -4,10 +4,6 @@ # tree and available online at # # http://www.dspace.org/license/ -# - -version: "3.7" - # # Overrides the default "dspacedb" container behavior to load a local SQL file into PostgreSQL. # From 0cbef414327d992d0b4657f69f90144872cf3434 Mon Sep 17 00:00:00 2001 From: Sascha Szott Date: Wed, 8 May 2024 15:23:34 +0200 Subject: [PATCH 7/9] remove obsolete top-level element version --- dspace/src/main/docker-compose/cli.assetstore.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/dspace/src/main/docker-compose/cli.assetstore.yml b/dspace/src/main/docker-compose/cli.assetstore.yml index d6a6a4395f4..2f4b4f2a9e4 100644 --- a/dspace/src/main/docker-compose/cli.assetstore.yml +++ b/dspace/src/main/docker-compose/cli.assetstore.yml @@ -5,9 +5,6 @@ # # http://www.dspace.org/license/ # - -version: "3.7" - services: dspace-cli: environment: From 47561e95521031f781639fa4e064ae7f722cc8b9 Mon Sep 17 00:00:00 2001 From: Sascha Szott Date: Wed, 8 May 2024 15:23:48 +0200 Subject: [PATCH 8/9] remove obsolete top-level element version --- dspace/src/main/docker-compose/cli.ingest.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/dspace/src/main/docker-compose/cli.ingest.yml b/dspace/src/main/docker-compose/cli.ingest.yml index d22a235d4fd..42181178faa 100644 --- a/dspace/src/main/docker-compose/cli.ingest.yml +++ b/dspace/src/main/docker-compose/cli.ingest.yml @@ -5,9 +5,6 @@ # # http://www.dspace.org/license/ # - -version: "3.7" - services: dspace-cli: environment: From 0f58af44ee64648e2964d283270c4916eab0571b Mon Sep 17 00:00:00 2001 From: Sascha Szott Date: Wed, 8 May 2024 15:24:14 +0200 Subject: [PATCH 9/9] remove obsolete top-level element version --- dspace/src/main/docker-compose/db.entities.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/dspace/src/main/docker-compose/db.entities.yml b/dspace/src/main/docker-compose/db.entities.yml index 32c54a5d0bd..c6d650f9d06 100644 --- a/dspace/src/main/docker-compose/db.entities.yml +++ b/dspace/src/main/docker-compose/db.entities.yml @@ -5,9 +5,6 @@ # # http://www.dspace.org/license/ # - -version: "3.7" - services: dspacedb: image: dspace/dspace-postgres-pgcrypto:dspace-7_x-loadsql