From a84d2440a77dd8156b06a6a3d4135fb045bd6f5a Mon Sep 17 00:00:00 2001
From: Tim Donohue <tim.donohue@lyrasis.org>
Date: Fri, 2 Feb 2024 09:02:19 -0600
Subject: [PATCH] Fix "cannot override networks.dspacenet" by updating all
 compose files to reference 'dspacenet' network

---
 docker-compose-cli.yml                               | 12 ++++++------
 docker-compose.yml                                   |  2 +-
 dspace/src/main/docker-compose/README.md             |  1 +
 .../main/docker-compose/docker-compose-angular.yml   |  8 +++++---
 .../src/main/docker-compose/docker-compose-iiif.yml  |  8 +++++---
 .../docker-compose/docker-compose-shibboleth.yml     |  8 +++++---
 6 files changed, 23 insertions(+), 16 deletions(-)

diff --git a/docker-compose-cli.yml b/docker-compose-cli.yml
index 7dbdde3703..b2c6df636b 100644
--- a/docker-compose-cli.yml
+++ b/docker-compose-cli.yml
@@ -1,5 +1,10 @@
 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")
+  default:
+    name: ${COMPOSE_PROJECT_NAME}_dspacenet
+    external: true
 services:
   dspace-cli:
     image: "${DOCKER_OWNER:-dspace}/dspace-cli:${DSPACE_VER:-latest}"
@@ -26,13 +31,8 @@ services:
     - ./dspace/config:/dspace/config
     entrypoint: /dspace/bin/dspace
     command: help
-    networks:
-      - dspacenet
     tty: true
     stdin_open: true
 
 volumes:
   assetstore:
-
-networks:
-  dspacenet:
diff --git a/docker-compose.yml b/docker-compose.yml
index 14f47ebdb6..99ee4982f7 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -36,7 +36,7 @@ services:
     depends_on:
     - dspacedb
     networks:
-      dspacenet:
+      - dspacenet
     ports:
     - published: 8080
       target: 8080
diff --git a/dspace/src/main/docker-compose/README.md b/dspace/src/main/docker-compose/README.md
index 8660a9796c..5e0dfed087 100644
--- a/dspace/src/main/docker-compose/README.md
+++ b/dspace/src/main/docker-compose/README.md
@@ -78,6 +78,7 @@ docker-compose -p d7 up -d
 ```
 docker-compose -p d7 -f docker-compose.yml -f dspace/src/main/docker-compose/docker-compose-angular.yml up -d
 ```
+NOTE: This starts the UI in development mode. It will take a few minutes to see the UI as the Angular code needs to be compiled.
 
 ## Run DSpace REST and DSpace Angular from local branches
 
diff --git a/dspace/src/main/docker-compose/docker-compose-angular.yml b/dspace/src/main/docker-compose/docker-compose-angular.yml
index 6690fb8bc5..d9a313e32e 100644
--- a/dspace/src/main/docker-compose/docker-compose-angular.yml
+++ b/dspace/src/main/docker-compose/docker-compose-angular.yml
@@ -8,7 +8,11 @@
 
 version: '3.7'
 networks:
-  dspacenet:
+  # 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")
+  default:
+    name: ${COMPOSE_PROJECT_NAME}_dspacenet
+    external: true
 services:
   dspace-angular:
     container_name: dspace-angular
@@ -24,8 +28,6 @@ services:
       DSPACE_REST_PORT: 8080
       DSPACE_REST_NAMESPACE: /server
     image: dspace/dspace-angular:${DSPACE_VER:-latest}
-    networks:
-      dspacenet:
     ports:
     - published: 4000
       target: 4000
diff --git a/dspace/src/main/docker-compose/docker-compose-iiif.yml b/dspace/src/main/docker-compose/docker-compose-iiif.yml
index 2ab58d9014..d795192f13 100644
--- a/dspace/src/main/docker-compose/docker-compose-iiif.yml
+++ b/dspace/src/main/docker-compose/docker-compose-iiif.yml
@@ -12,7 +12,11 @@
 #
 version: '3.7'
 networks:
-  dspacenet:
+  # 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")
+  default:
+    name: ${COMPOSE_PROJECT_NAME}_dspacenet
+    external: true
 services:
   dspace-iiif:
     container_name: dspace-iiif
@@ -21,8 +25,6 @@ services:
     # Using UCLA Library image as it seems to be most maintained at this time. There is no official image.
     # https://hub.docker.com/r/uclalibrary/cantaloupe
     image: uclalibrary/cantaloupe:5.0.4-0
-    networks:
-      dspacenet:
     ports:
       - '8182:8182'
     # For a guide of environment variables that can be used, see
diff --git a/dspace/src/main/docker-compose/docker-compose-shibboleth.yml b/dspace/src/main/docker-compose/docker-compose-shibboleth.yml
index 58f1527d6c..33eadcb142 100644
--- a/dspace/src/main/docker-compose/docker-compose-shibboleth.yml
+++ b/dspace/src/main/docker-compose/docker-compose-shibboleth.yml
@@ -12,7 +12,11 @@
 #
 version: '3.7'
 networks:
-  dspacenet:
+  # 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")
+  default:
+    name: ${COMPOSE_PROJECT_NAME}_dspacenet
+    external: true
 services:
   dspace-shibboleth:
     container_name: dspace-shibboleth
@@ -22,8 +26,6 @@ services:
     build:
       # Must be relative to root, so that it can be built alongside [src]/docker-compose.yml
       context: ./dspace/src/main/docker/dspace-shibboleth
-    networks:
-      dspacenet:
     ports:
       - published: 80
         target: 80