Fix docker network inconsistencies in compose files & re-sync REST compose files with backend codebase.

Author: tdonohue

docker/cli.yml

@@ -16,7 +16,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")
   # If COMPOSITE_PROJECT_NAME is missing, default value will be "docker" (name of folder this file is in)
-  default:
+  dspacenet:
     name: ${COMPOSE_PROJECT_NAME:-docker}_dspacenet
     external: true
 services:
@@ -34,6 +34,8 @@ services:
       db__P__url: 'jdbc:postgresql://dspacedb:5432/dspace'
       # solr.server: Ensure we are using the 'dspacesolr' image for Solr
       solr__P__server: http://dspacesolr:8983/solr
+    networks:
+    - dspacenet
     volumes:
     # Keep DSpace assetstore directory between reboots
     - assetstore:/dspace/assetstore

docker/docker-compose-ci.yml

@@ -116,6 +116,8 @@ services:
       cp -r /opt/solr/server/solr/configsets/qaevent/* qaevent
       precreate-core suggestion /opt/solr/server/solr/configsets/suggestion
       cp -r /opt/solr/server/solr/configsets/suggestion/* suggestion
+      precreate-core audit /opt/solr/server/solr/configsets/audit
+      cp -r /opt/solr/server/solr/configsets/audit/* audit
       chown -R solr:solr /var/solr
       runuser -u solr -- solr-foreground
 volumes:

docker/docker-compose-dist.yml

@@ -9,7 +9,11 @@
 # Docker Compose for running the DSpace Angular UI dist build
 # for previewing with the DSpace Demo site backend
 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")
   dspacenet:
+    name: ${COMPOSE_PROJECT_NAME}_dspacenet
+    external: true
 services:
   dspace-angular:
     container_name: dspace-angular
@@ -31,7 +35,7 @@ services:
       context: ..
       dockerfile: Dockerfile.dist
     networks:
-      dspacenet:
+    - dspacenet
     ports:
     - published: 4000
       target: 4000

docker/docker-compose-rest.yml

@@ -17,6 +17,10 @@ networks:
         # Define a custom subnet for our DSpace network, so that we can easily trust requests from host to container.
         # If you customize this value, be sure to customize the 'proxies.trusted.ipranges' env variable below.
         - subnet: 172.23.0.0/16
+    # Explicitly set external=false because this script creates the network.
+    # NOTE: Because of how compose files are merged, this script should be specified LAST when passed
+    # to "docker compose" for the network to be created properly.
+    external: false
 services:
   # DSpace (backend) webapp container
   dspace:
@@ -36,6 +40,8 @@ services:
       db__P__url: 'jdbc:postgresql://dspacedb:5432/dspace'
       # solr.server: Ensure we are using the 'dspacesolr' image for Solr
       solr__P__server: http://dspacesolr:8983/solr
+      # matomo.tracker.url: Ensure we are using the 'matomo' image for Matomo
+      matomo__P__tracker__P__url: http://matomo
       # proxies.trusted.ipranges: This setting is required for a REST API running in Docker to trust requests 
       # from the host machine. This IP range MUST correspond to the 'dspacenet' subnet defined above.
       proxies__P__trusted__P__ipranges: '172.23.0'
@@ -126,6 +132,8 @@ services:
       cp -r /opt/solr/server/solr/configsets/qaevent/* qaevent
       precreate-core suggestion /opt/solr/server/solr/configsets/suggestion
       cp -r /opt/solr/server/solr/configsets/suggestion/* suggestion
+      precreate-core audit /opt/solr/server/solr/configsets/audit
+      cp -r /opt/solr/server/solr/configsets/audit/* audit
       chown -R solr:solr /var/solr
       runuser -u solr -- solr-foreground
 volumes:

docker/docker-compose.yml

@@ -10,7 +10,11 @@
 # Requires also running a REST API backend (either locally or remotely),
 # for example via 'docker-compose-rest.yml'
 networks:
+  # Default to using an existing external network named 'dspacenet' (created in 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")
   dspacenet:
+    name: ${COMPOSE_PROJECT_NAME}_dspacenet
+    external: true
 services:
   dspace-angular:
     container_name: dspace-angular
@@ -28,7 +32,7 @@ services:
       context: ..
       dockerfile: Dockerfile
     networks:
-      dspacenet:
+    - dspacenet
     ports:
     - published: 4000
       target: 4000