From 2520f90e3e30ef0439c9aa6f1cd8e8da24ccf6d8 Mon Sep 17 00:00:00 2001
From: Robert Butora <robert.butora@inaf.it>
Date: Wed, 3 Apr 2024 19:47:59 +0200
Subject: [PATCH] docker: fixes web-app dir config btw Dockerfile and
entrypoint
---
docker/entrypoint.sh | 4 ++--
docker/example-compose.yaml | 6 +++---
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/docker/entrypoint.sh b/docker/entrypoint.sh
index 7b38f2e..ee4488f 100755
--- a/docker/entrypoint.sh
+++ b/docker/entrypoint.sh
@@ -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."
diff --git a/docker/example-compose.yaml b/docker/example-compose.yaml
index 7b64047..3a7aaf7 100644
--- a/docker/example-compose.yaml
+++ b/docker/example-compose.yaml
@@ -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
--
GitLab