Commit 2520f90e authored by Robert Butora's avatar Robert Butora
Browse files

docker: fixes web-app dir config btw Dockerfile and entrypoint

parent 734f9380

docker/entrypoint.sh

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

docker/example-compose.yaml

+3 −3
Original line number Diff line number Diff line
@@ -17,15 +17,15 @@ services: 
      - postgres-data:/var/lib/postgresql/data





  vlkb-search:

    container_name: vlkb-search

  vlkb-siav2:

    container_name: vlkb-siav2

    image: siav2:latest

    ports:

      - 8080:8080

    environment:

      - SECURITY=

        #- SECURITY=ia2token

      - DISCOVERY_CONTEXT_ROOT=vlkb#datasets#vlkb_search

      - DISCOVERY_CONTEXT_ROOT=vlkb#datasets#siav2

      - DB_URI=jdbc:postgresql://vlkb-db:5432/vialactea

      - DB_USERNAME=vialactea

      - DB_PASSWORD=ia2vlkb