From 37d71e3af5af4256e94186dca0956d2ff8e455ec Mon Sep 17 00:00:00 2001
From: Winona Salesky <wsalesky@gmail.com>
Date: Thu, 18 Apr 2024 11:05:04 -0400
Subject: [PATCH] Test new eXist-db

---
 Dockerfile | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 4035435b..b4047879 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,13 +1,15 @@
-FROM --platform=linux/amd64 pkoiralap/existdb:1.0.0
-
-ARG ADMIN_PASSWORD
+# Start from the existing working base image
+#FROM existdb/existdb:6.0.1
+FROM --platform=linux/amd64 wsalesky/srophe-base:1.0.1
 
+# Copy over all the files you need 
 COPY autodeploy/*.xar /exist/autodeploy/
+COPY conf/*.xml /exist/etc/webapp/WEB-INF/
 COPY conf/controller-config.xml /exist/etc/webapp/WEB-INF/
 COPY conf/collection.xconf.init /exist/etc/
 COPY conf/exist-webapp-context.xml /exist/etc/jetty/webapps/
 COPY conf/conf.xml /exist/etc/conf.xml
-COPY build/entrypoint.sh /entrypoint.sh
+#COPY build/entrypoint.sh /entrypoint.sh
 
 EXPOSE 8080 8443
 
@@ -28,7 +30,8 @@ ENV JAVA_TOOL_OPTIONS \
 -XX:MaxRAMPercentage=${JVM_MAX_RAM_PERCENTAGE:-75.0} \
 -XX:+ExitOnOutOfMemoryError \
 -XX:-HeapDumpOnOutOfMemoryError \
--XX:HeapDumpPath=/exist/heapDump/exist-memory-dump.hprof
+-XX:HeapDumpPath=/exist/heapDump/exist-memory-dump.hprof \
+-XX:InitiatingHeapOccupancyPercent=70
 
 HEALTHCHECK CMD [ "java", \
 "org.exist.start.Main", "client", \
@@ -37,7 +40,7 @@ HEALTHCHECK CMD [ "java", \
 "--xpath", "system:get-version()" ]
 
 
-ENV ADMIN_PASSWORD=$ADMIN_PASSWORD
-
-ENTRYPOINT [ "/busybox/sh", "/entrypoint.sh"]
+ENTRYPOINT [ "java", \
+"org.exist.start.Main"]
 
+CMD ["jetty" ]
\ No newline at end of file