Update additional logback.xml file (#160)

UCLALibrary · Dec 22, 2023 · 0e95fe4 · 0e95fe4
1 parent 1fd0828
commit 0e95fe4
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/src/main/docker/docker-entrypoint.sh b/src/main/docker/docker-entrypoint.sh
@@ -44,13 +44,14 @@ fi
 
 # If LOGBACK_URL is defined, download and insert logback.xml file into war file
 if [[ ! -z "${LOGBACK_URL}" ]]; then
-  zip -qd /usr/local/cantaloupe/cantaloupe-*.*ar WEB-INF/classes/logback.xml
+  zip -qd /usr/local/cantaloupe/cantaloupe-*.*ar WEB-INF/classes/logback.xml logback.xml
   cd /tmp
   mkdir -p WEB-INF/classes WEB-INF/lib
   curl -so WEB-INF/classes/logback.xml ${LOGBACK_URL}
+  curl -so logback.xml ${LOGBACK_URL}
 
   # Package up the logback file and dependent jars
-  zip -qur /usr/local/cantaloupe/cantaloupe-*.*ar WEB-INF
+  zip -qur /usr/local/cantaloupe/cantaloupe-*.*ar WEB-INF logback.xml
 
   # Clean up scratch space
   rm -rf /tmp/WEB-INF