Skip to content
Snippets Groups Projects
Commit 08a37c5f authored by Robert Butora's avatar Robert Butora
Browse files

docker: modif web.xml url-pattern /soda -> /query and set default CONTEXT_ROOT...

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)
parent c41206f5
No related branches found
No related tags found
No related merge requests found
...@@ -11,8 +11,8 @@ ...@@ -11,8 +11,8 @@
<properties> <properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<maven.compiler.source>7</maven.compiler.source> <maven.compiler.source>8</maven.compiler.source>
<maven.compiler.target>7</maven.compiler.target> <maven.compiler.target>8</maven.compiler.target>
</properties> </properties>
......
...@@ -27,7 +27,7 @@ ...@@ -27,7 +27,7 @@
</servlet> </servlet>
<servlet-mapping> <servlet-mapping>
<servlet-name>vlkb_search</servlet-name> <servlet-name>vlkb_search</servlet-name>
<url-pattern></url-pattern> <url-pattern>/query</url-pattern>
</servlet-mapping> </servlet-mapping>
......
...@@ -30,9 +30,6 @@ COPY deps/setenv.sh ${CATALINA_BASE}/bin/ ...@@ -30,9 +30,6 @@ COPY deps/setenv.sh ${CATALINA_BASE}/bin/
WORKDIR ${CATALINA_BASE} WORKDIR ${CATALINA_BASE}
RUN chmod -R a+rwX conf RUN chmod -R a+rwX conf
# set default
env DISCOVERY_CONTEXT_ROOT=datasets
# configure during start-up # configure during start-up
COPY start-siav2.sh /root COPY start-siav2.sh /root
......
...@@ -21,11 +21,11 @@ services: ...@@ -21,11 +21,11 @@ services:
ports: ports:
- 8080:8080 - 8080:8080
environment: environment:
- DISCOVERY_CONTEXT_ROOT=vlkb#datasets#siav2 - DISCOVERY_CONTEXT_ROOT=siav2
- DB_URI=jdbc:postgresql://vlkb-db:5432/vialactea - DB_URI=jdbc:postgresql://vlkb-db:5432/vialactea
- DB_USERNAME=vialactea - DB_USERNAME=vialactea
- DB_PASSWORD=ia2vlkb - 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: volumes:
......
...@@ -6,6 +6,11 @@ set -eux ...@@ -6,6 +6,11 @@ set -eux
date date
env env
# set optional
DISCOVERY_CONTEXT_ROOT=${DISCOVERY_CONTEXT_ROOT:-siav2}
DBG_LEVEL=${DEBUG_LEVEL:-CONFIG}
# configure CONTEXT_ROOT # configure CONTEXT_ROOT
mkdir -p $CATALINA_BASE/conf/Catalina/localhost mkdir -p $CATALINA_BASE/conf/Catalina/localhost
...@@ -28,7 +33,6 @@ echo "<Context docBase=\"$WEBAPP_DIR\"/>" > $CATALINA_BASE/conf/Catalina/localho ...@@ -28,7 +33,6 @@ echo "<Context docBase=\"$WEBAPP_DIR\"/>" > $CATALINA_BASE/conf/Catalina/localho
# configure debug level # 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/.*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/.*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 sed -i "s/.*DbObstap\.level.*=.*/DbObstap.level = $DBG_LEVEL/g" $CATALINA_BASE/conf/siav2.logging.properties
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment