From f775bb182b9a1853a0ef4b1de760a5a616fc8874 Mon Sep 17 00:00:00 2001
From: Matthew B <106352182+artntek@users.noreply.github.com>
Date: Mon, 22 Apr 2024 15:15:41 -0700
Subject: [PATCH] leave jar as is; change CP

---
 docker/entrypoint.sh           | 4 +---
 helm/templates/deployment.yaml | 2 +-
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/docker/entrypoint.sh b/docker/entrypoint.sh
index a9b1e0c6..bf64a441 100755
--- a/docker/entrypoint.sh
+++ b/docker/entrypoint.sh
@@ -6,12 +6,10 @@ then
     echo "Starting infinite loop, ctrl-c to interrupt..."
     sh -c 'trap "exit" TERM; while true; do sleep 1; done'
 else
-    jar -xf dataone-index-worker-${TAG}-shaded.jar
-
     java  -Dlog4j2.formatMsgNoLookups=true \
           -XX:+UnlockExperimentalVMOptions \
           -XX:+UseContainerSupport \
           -XX:+UseSerialGC \
-          -cp ./config/:. \
+          -cp /etc/dataone/:./dataone-index-worker-${TAG}-shaded.jar \
           org.dataone.cn.indexer.IndexWorker
 fi
diff --git a/helm/templates/deployment.yaml b/helm/templates/deployment.yaml
index d76c1a63..f90f65d3 100644
--- a/helm/templates/deployment.yaml
+++ b/helm/templates/deployment.yaml
@@ -48,7 +48,7 @@ spec:
             - mountPath: /etc/dataone/dataone-indexer.properties
               subPath: dataone-indexer.properties
               name: {{ .Release.Name }}-config-volume
-            - mountPath: /var/lib/dataone-indexer/config/log4j.properties
+            - mountPath: /etc/dataone/log4j.properties
               subPath: log4j2.properties
               name: {{ .Release.Name }}-config-volume
             - mountPath: {{ .Values.persistence.mountPath }}