From 4b0fd09d974584a03723c5297d47349feaff0025 Mon Sep 17 00:00:00 2001
From: Robert Butora <robert.butora@inaf.it>
Date: Wed, 3 Apr 2024 19:51:29 +0200
Subject: [PATCH] docker: fixes webapp dir btw Dockerfile and entrypoint and
webapp's context.xml
---
data-access/servlet/src/main/webapp/META-INF/context.xml | 2 +-
docker/entrypoint.sh | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/data-access/servlet/src/main/webapp/META-INF/context.xml b/data-access/servlet/src/main/webapp/META-INF/context.xml
index 4f5f504..dc26e6c 100644
--- a/data-access/servlet/src/main/webapp/META-INF/context.xml
+++ b/data-access/servlet/src/main/webapp/META-INF/context.xml
@@ -1,4 +1,4 @@
-<Context docBase="/webapps/vlkb-cutout">
+<Context docBase="/webapps/vlkb-soda">
<Resources allowLinking="true">
<PostResources readOnly="false"
diff --git a/docker/entrypoint.sh b/docker/entrypoint.sh
index f15a97a..de3b29e 100755
--- a/docker/entrypoint.sh
+++ b/docker/entrypoint.sh
@@ -97,13 +97,13 @@ case $SECURITY in
cd $WEBAPP_DIR/WEB-INF/ && rm -f web.xml && cp web-cutout-$SECURITY.xml web.xml && cd -
cp /etc/pki/tls/server-connector.xml /etc/tomcat9/
cp /etc/pki/tls/auth*.properties $WEBAPP_DIR/WEB-INF/classes/
- rm -f /webapps/vlkb-cutout/WEB-INF/lib/jjwt-*0.12*.jar
+ rm -f $WEBAPP_DIR/WEB-INF/lib/jjwt-*0.12*.jar
;;
iamtoken)
cd $WEBAPP_DIR/WEB-INF/ && rm -f web.xml && cp web-cutout-$SECURITY.xml web.xml && cd -
cp /etc/pki/tls/server-connector.xml /etc/tomcat9/
cp /etc/pki/tls/iamtoken.properties $WEBAPP_DIR/WEB-INF/classes/
- rm -f /webapps/vlkb-cutout/WEB-INF/lib/jjwt-*0.11*.jar
+ rm -f $WEBAPP_DIR/WEB-INF/lib/jjwt-*0.11*.jar
;;
*)
echo "Security not configured, runs open."
--
GitLab