From e08fa2ec3148eff38ed8af815a8027fa91034ab9 Mon Sep 17 00:00:00 2001
From: Kim Shepherd <kim@shepherd.nz>
Date: Wed, 25 May 2022 10:40:18 +1200
Subject: [PATCH] Dockerfile.test and docker-compose: expose port 8000, set
 JDWP java opts

This allows a remote JVM debugger to be connected to port 8000 on the
dspace docker container (test environment).
This may need a documentation note to warn against running the supplied
docker-compose / Dockerfile.test config in production -- already a good
warning but made more important now that the JVM can be exposed to a
debugger for reading memory...
---
 Dockerfile.test    | 4 ++--
 docker-compose.yml | 2 ++
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/Dockerfile.test b/Dockerfile.test
index 568ff9b60aa4..31e1f2e05dea 100644
--- a/Dockerfile.test
+++ b/Dockerfile.test
@@ -58,9 +58,9 @@ COPY --from=ant_build /dspace $DSPACE_INSTALL
 # NOTE: secretRequired="false" should only be used when AJP is NOT accessible from an external network. But, secretRequired="true" isn't supported by mod_proxy_ajp until Apache 2.5
 RUN sed -i '/Service name="Catalina".*/a \\n    <Connector protocol="AJP/1.3" port="8009" address="0.0.0.0" redirectPort="8443" URIEncoding="UTF-8" secretRequired="false" />' $TOMCAT_INSTALL/conf/server.xml
 # Expose Tomcat port and AJP port
-EXPOSE 8080 8009
+EXPOSE 8080 8009 8000
 # Give java extra memory (2GB)
-ENV JAVA_OPTS=-Xmx2000m
+ENV JAVA_OPTS=-Xmx2000m\ -Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=*:8000
 
 # Link the DSpace 'server' webapp into Tomcat's webapps directory.
 # This ensures that when we start Tomcat, it runs from /server path (e.g. http://localhost:8080/server/)
diff --git a/docker-compose.yml b/docker-compose.yml
index f790257bdb81..6008b873ae5f 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -41,6 +41,8 @@ services:
       target: 8080
     - published: 8009
       target: 8009
+    - published: 8000
+      target: 8000
     stdin_open: true
     tty: true
     volumes: