From 08a37c5ffca3ed7ecd68831e88005a399684380e Mon Sep 17 00:00:00 2001
From: Robert Butora <robert.butora@inaf.it>
Date: Wed, 18 Dec 2024 14:55:15 +0200
Subject: [PATCH] docker: modif web.xml url-pattern /soda -> /query and set
default CONTEXT_ROOT for docker to siav2 (e.g. default access
<host:port>/siav2/query?POS=CIRCLE 0 0 1)
---
data-discovery/pom.xml | 4 ++--
data-discovery/src/main/webapp/WEB-INF/web.xml | 2 +-
docker/Dockerfile | 3 ---
docker/example-compose.yaml | 4 ++--
docker/start-siav2.sh | 6 +++++-
5 files changed, 10 insertions(+), 9 deletions(-)
diff --git a/data-discovery/pom.xml b/data-discovery/pom.xml
index 9132e0d..a87cf98 100644
--- a/data-discovery/pom.xml
+++ b/data-discovery/pom.xml
@@ -11,8 +11,8 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
- <maven.compiler.source>7</maven.compiler.source>
- <maven.compiler.target>7</maven.compiler.target>
+ <maven.compiler.source>8</maven.compiler.source>
+ <maven.compiler.target>8</maven.compiler.target>
</properties>
diff --git a/data-discovery/src/main/webapp/WEB-INF/web.xml b/data-discovery/src/main/webapp/WEB-INF/web.xml
index f71dce9..6ba11f1 100644
--- a/data-discovery/src/main/webapp/WEB-INF/web.xml
+++ b/data-discovery/src/main/webapp/WEB-INF/web.xml
@@ -27,7 +27,7 @@
</servlet>
<servlet-mapping>
<servlet-name>vlkb_search</servlet-name>
- <url-pattern></url-pattern>
+ <url-pattern>/query</url-pattern>
</servlet-mapping>
diff --git a/docker/Dockerfile b/docker/Dockerfile
index ec6cf28..aef2090 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -30,9 +30,6 @@ COPY deps/setenv.sh ${CATALINA_BASE}/bin/
WORKDIR ${CATALINA_BASE}
RUN chmod -R a+rwX conf
-# set default
-env DISCOVERY_CONTEXT_ROOT=datasets
-
# configure during start-up
COPY start-siav2.sh /root
diff --git a/docker/example-compose.yaml b/docker/example-compose.yaml
index 17f0998..9d6ca03 100644
--- a/docker/example-compose.yaml
+++ b/docker/example-compose.yaml
@@ -21,11 +21,11 @@ services:
ports:
- 8080:8080
environment:
- - DISCOVERY_CONTEXT_ROOT=vlkb#datasets#siav2
+ - DISCOVERY_CONTEXT_ROOT=siav2
- DB_URI=jdbc:postgresql://vlkb-db:5432/vialactea
- DB_USERNAME=vialactea
- DB_PASSWORD=ia2vlkb
- - CUTOUT_SERVICE_URL=http://vlkb-devel.ia2.inaf.it:8004/vlkb/datasets/soda
+ - CUTOUT_SERVICE_URL=http://vlkb-devel.ia2.inaf.it:80/soda
volumes:
diff --git a/docker/start-siav2.sh b/docker/start-siav2.sh
index 4bab12e..200a147 100755
--- a/docker/start-siav2.sh
+++ b/docker/start-siav2.sh
@@ -6,6 +6,11 @@ set -eux
date
env
+# set optional
+DISCOVERY_CONTEXT_ROOT=${DISCOVERY_CONTEXT_ROOT:-siav2}
+DBG_LEVEL=${DEBUG_LEVEL:-CONFIG}
+
+
# configure CONTEXT_ROOT
mkdir -p $CATALINA_BASE/conf/Catalina/localhost
@@ -28,7 +33,6 @@ echo "<Context docBase=\"$WEBAPP_DIR\"/>" > $CATALINA_BASE/conf/Catalina/localho
# configure debug level
-DBG_LEVEL=${DEBUG_LEVEL:-CONFIG}
sed -i "s/.*SearchServlet\.level.*=.*/SearchServlet.level = $DBG_LEVEL/g" $CATALINA_BASE/conf/siav2.logging.properties
sed -i "s/.*FormatResponseFilter\.level.*=.*/FormatResponseFilter.level = $DBG_LEVEL/g" $CATALINA_BASE/conf/siav2.logging.properties
sed -i "s/.*DbObstap\.level.*=.*/DbObstap.level = $DBG_LEVEL/g" $CATALINA_BASE/conf/siav2.logging.properties
--
GitLab