From 9c152d367e7eb45d0760b4d41edbd0e25e90690d Mon Sep 17 00:00:00 2001
From: Winona Salesky <wsalesky@gmail.com>
Date: Thu, 18 Apr 2024 09:51:50 -0400
Subject: [PATCH] Roll back

---
 Dockerfile | 20 +++++++++-----------
 1 file changed, 9 insertions(+), 11 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 124ae2d0..4035435b 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,15 +1,13 @@
-# Start from the existing working base image
-#FROM existdb/existdb:6.0.1
-FROM --platform=linux/amd64 wsalesky/srophe-base:1.0.1
+FROM --platform=linux/amd64 pkoiralap/existdb:1.0.0
+
+ARG ADMIN_PASSWORD
 
-# 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
 
@@ -30,8 +28,7 @@ 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:InitiatingHeapOccupancyPercent=70
+-XX:HeapDumpPath=/exist/heapDump/exist-memory-dump.hprof
 
 HEALTHCHECK CMD [ "java", \
 "org.exist.start.Main", "client", \
@@ -39,7 +36,8 @@ HEALTHCHECK CMD [ "java", \
 "--user", "guest", "--password", "guest", \
 "--xpath", "system:get-version()" ]
 
-ENV ADMIN_PASSWORD $ADMIN_PASSWORD
 
-#RUN [ "java", "org.exist.start.Main", "client", "--no-gui",  "-l", "-u", "admin", "-P", "", "-x", "sm:passwd('admin','ADMIN_PASSWORD')" ]
-ENTRYPOINT [ "java", "org.exist.start.Main", "client", "--no-gui",  "-l", "-u", "admin", "-P", "", "-x", "sm:passwd('admin','ADMIN_PASSWORD')"]
\ No newline at end of file
+ENV ADMIN_PASSWORD=$ADMIN_PASSWORD
+
+ENTRYPOINT [ "/busybox/sh", "/entrypoint.sh"]
+