From 2c2f59c7ef39a89aed02711f14098a0e4bb533dd Mon Sep 17 00:00:00 2001
From: Tim Donohue <tim.donohue@lyrasis.org>
Date: Fri, 2 Feb 2024 14:27:33 -0600
Subject: [PATCH] Update cli.yml to reference dspacenet in docker-compose-rest.
  Remove unnecessary network from cli.assetstore.yml

---
 docker/cli.assetstore.yml |  5 -----
 docker/cli.yml            | 15 ++++++++-------
 2 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/docker/cli.assetstore.yml b/docker/cli.assetstore.yml
index 40e4974c7c7..31bc53f64d8 100644
--- a/docker/cli.assetstore.yml
+++ b/docker/cli.assetstore.yml
@@ -14,13 +14,8 @@
 # Therefore, it should be kept in sync with that file
 version: "3.7"
 
-networks:
-  dspacenet:
-
 services:
   dspace-cli:
-    networks:
-      dspacenet: {}
     environment:
       # This assetstore zip is available from https://github.com/DSpace-Labs/AIP-Files/releases/tag/demo-entities-data
       - LOADASSETS=https://github.com/DSpace-Labs/AIP-Files/releases/download/demo-entities-data/assetstore.tar.gz
diff --git a/docker/cli.yml b/docker/cli.yml
index 223ec356b9c..c2664fdf3e1 100644
--- a/docker/cli.yml
+++ b/docker/cli.yml
@@ -13,7 +13,12 @@
 #
 # Therefore, it should be kept in sync with that file
 version: "3.7"
-
+networks:
+  # Default to using network named 'dspacenet' from docker-compose-rest.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}"
@@ -30,16 +35,12 @@ services:
       # solr.server: Ensure we are using the 'dspacesolr' image for Solr
       solr__P__server: http://dspacesolr:8983/solr
     volumes:
-    - "assetstore:/dspace/assetstore"
+    # Keep DSpace assetstore directory between reboots
+    - assetstore:/dspace/assetstore
     entrypoint: /dspace/bin/dspace
     command: help
-    networks:
-      - dspacenet
     tty: true
     stdin_open: true
 
 volumes:
   assetstore:
-
-networks:
-  dspacenet: