Ensure Docker Compose uses Runnable JAR. Minor bug fixes to loadsql per DSpace#2966

Author: tdonohue

docker/db.entities.yml

@@ -14,7 +14,7 @@
 # # Therefore, it should be kept in sync with that file
 services:
   dspacedb:
-    image: dspace/dspace-postgres-pgcrypto:loadsql
+    image: dspace/dspace-postgres-pgcrypto::${DSPACE_VER:-latest}-loadsql
     environment:
       # This LOADSQL should be kept in sync with the URL in DSpace/DSpace
       # This SQL is available from https://github.com/DSpace-Labs/AIP-Files/releases/tag/demo-entities-data
@@ -27,23 +27,11 @@ services:
     # 3. (Custom for Entities) enable Entity-specific collection submission mappings in item-submission.xml
     #    This 'sed' command inserts the sample configurations specific to the Entities data set, see:
     #    https://github.com/DSpace/DSpace/blob/main/dspace/config/item-submission.xml#L36-L49
-    # 4. Finally, start Tomcat
+    # 4. Finally, start DSpace
     entrypoint:
       - /bin/bash
       - '-c'
       - |
         while (!</dev/tcp/dspacedb/5432) > /dev/null 2>&1; do sleep 1; done;
         /dspace/bin/dspace database migrate ignored
-        sed -i '/name-map collection-handle="default".*/a \\n <name-map collection-handle="123456789/3" submission-name="Publication"/> \
-          <name-map collection-handle="123456789/4" submission-name="Publication"/> \
-          <name-map collection-handle="123456789/281" submission-name="Publication"/> \
-          <name-map collection-handle="123456789/5" submission-name="Publication"/> \
-          <name-map collection-handle="123456789/8" submission-name="OrgUnit"/> \
-          <name-map collection-handle="123456789/6" submission-name="Person"/> \
-          <name-map collection-handle="123456789/279" submission-name="Person"/> \
-          <name-map collection-handle="123456789/7" submission-name="Project"/> \
-          <name-map collection-handle="123456789/280" submission-name="Project"/> \
-          <name-map collection-handle="123456789/28" submission-name="Journal"/> \
-          <name-map collection-handle="123456789/29" submission-name="JournalVolume"/> \
-          <name-map collection-handle="123456789/30" submission-name="JournalIssue"/>' /dspace/config/item-submission.xml
-        catalina.sh run
+        java -jar /dspace/webapps/server-boot.jar --dspace.dir=/dspace

docker/docker-compose-ci.yml

@@ -48,19 +48,19 @@ services:
     # Ensure that the database is ready BEFORE starting tomcat
     # 1. While a TCP connection to dspacedb port 5432 is not available, continue to sleep
     # 2. Then, run database migration to init database tables (including any out-of-order ignored migrations, if any)
-    # 3. Finally, start Tomcat
+    # 3. Finally, start DSpace
     entrypoint:
     - /bin/bash
     - '-c'
     - |
       while (!</dev/tcp/dspacedb/5432) > /dev/null 2>&1; do sleep 1; done;
       /dspace/bin/dspace database migrate ignored
-      catalina.sh run
+      java -jar /dspace/webapps/server-boot.jar --dspace.dir=/dspace
   # DSpace database container
   # NOTE: This is customized to use our loadsql image, so that we are using a database with existing test data
   dspacedb:
     container_name: dspacedb
-    image: "${DOCKER_OWNER:-dspace}/dspace-postgres-pgcrypto:${DSPACE_VER:-latest-loadsql}"
+    image: "${DOCKER_OWNER:-dspace}/dspace-postgres-pgcrypto:${DSPACE_VER:-latest}-loadsql"
     environment:
       # This LOADSQL should be kept in sync with the LOADSQL in
       # https://github.com/DSpace/DSpace/blob/main/dspace/src/main/docker-compose/db.entities.yml

docker/docker-compose-rest.yml

@@ -56,14 +56,14 @@ services:
     # Ensure that the database is ready BEFORE starting tomcat
     # 1. While a TCP connection to dspacedb port 5432 is not available, continue to sleep
     # 2. Then, run database migration to init database tables
-    # 3. Finally, start Tomcat
+    # 3. Finally, start DSpace
     entrypoint:
     - /bin/bash
     - '-c'
     - |
       while (!</dev/tcp/dspacedb/5432) > /dev/null 2>&1; do sleep 1; done;
       /dspace/bin/dspace database migrate
-      catalina.sh run
+      java -jar /dspace/webapps/server-boot.jar --dspace.dir=/dspace
   # DSpace database container    
   dspacedb:
     container_name: dspacedb