Commit 4b0fd09d authored by Robert Butora's avatar Robert Butora
Browse files

docker: fixes webapp dir btw Dockerfile and entrypoint and webapp's context.xml

parent 8f5126ac

data-access/servlet/src/main/webapp/META-INF/context.xml

+1 −1
Original line number Diff line number Diff line 
<Context docBase="/webapps/vlkb-cutout">

<Context docBase="/webapps/vlkb-soda">



        <Resources allowLinking="true">

                <PostResources readOnly="false"

docker/entrypoint.sh

+2 −2
Original line number Diff line number Diff line
@@ -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."