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

webapp/docker: 1, changes webapp name /soda -> /sync and sets context root to... 

webapp/docker: 1, changes webapp name /soda -> /sync and sets context root to /soda ; 2. docker: adds libdavix
parent 8b15acaf
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 23 additions and 26 deletions
data-access/servlet/config/web-xml/web.xml-garrtoken-filter
+ 1
− 1
View file @ 68bee9a7
......@@ -20,7 +20,7 @@
</filter-mapping>
<filter-mapping>
<filter-name>NeaTokenFilter</filter-name>
<url-pattern>/soda</url-pattern>
<url-pattern>/sync</url-pattern>
</filter-mapping>
data-access/servlet/config/web-xml/web.xml-servlets
+ 3
− 3
View file @ 68bee9a7
......@@ -83,7 +83,7 @@
</servlet>
<servlet-mapping>
<servlet-name>vlkb_soda</servlet-name>
<url-pattern>/soda</url-pattern>
<url-pattern>/sync</url-pattern>
</servlet-mapping>
<servlet-mapping>
<servlet-name>vlkb_soda</servlet-name>
......@@ -105,7 +105,7 @@
</servlet>
<servlet-mapping>
<servlet-name>uws_merge</servlet-name>
<url-pattern>/uws_merge/*</url-pattern>
<url-pattern>/uws/merge/*</url-pattern>
</servlet-mapping>
......@@ -123,7 +123,7 @@
</servlet>
<servlet-mapping>
<servlet-name>uws_mcutout</servlet-name>
<url-pattern>/uws_mcutout/*</url-pattern>
<url-pattern>/uws/mcutout/*</url-pattern>
</servlet-mapping>
......
data-access/servlet/src/main/webapp/WEB-INF/web-cutout-garrtoken.xml
+ 3
− 3
View file @ 68bee9a7
......@@ -86,7 +86,7 @@
</servlet>
<servlet-mapping>
<servlet-name>vlkb_soda</servlet-name>
<url-pattern>/soda</url-pattern>
<url-pattern>/sync</url-pattern>
</servlet-mapping>
<servlet>
......@@ -103,7 +103,7 @@
</servlet>
<servlet-mapping>
<servlet-name>uws_merge</servlet-name>
<url-pattern>/uws_merge/*</url-pattern>
<url-pattern>/uws/merge/*</url-pattern>
</servlet-mapping>
......@@ -121,7 +121,7 @@
</servlet>
<servlet-mapping>
<servlet-name>uws_mcutout</servlet-name>
<url-pattern>/uws_mcutout/*</url-pattern>
<url-pattern>/uws/mcutout/*</url-pattern>
</servlet-mapping>
......
data-access/servlet/src/main/webapp/WEB-INF/web-cutout-ia2token.xml
+ 3
− 3
View file @ 68bee9a7
......@@ -86,7 +86,7 @@
</servlet>
<servlet-mapping>
<servlet-name>vlkb_soda</servlet-name>
<url-pattern>/soda</url-pattern>
<url-pattern>/sync</url-pattern>
</servlet-mapping>
<servlet>
......@@ -103,7 +103,7 @@
</servlet>
<servlet-mapping>
<servlet-name>uws_merge</servlet-name>
<url-pattern>/uws_merge/*</url-pattern>
<url-pattern>/uws/merge/*</url-pattern>
</servlet-mapping>
......@@ -121,7 +121,7 @@
</servlet>
<servlet-mapping>
<servlet-name>uws_mcutout</servlet-name>
<url-pattern>/uws_mcutout/*</url-pattern>
<url-pattern>/uws/mcutout/*</url-pattern>
</servlet-mapping>
......
data-access/servlet/src/main/webapp/WEB-INF/web-cutout-iamtoken.xml
+ 3
− 3
View file @ 68bee9a7
......@@ -76,7 +76,7 @@
</servlet>
<servlet-mapping>
<servlet-name>vlkb_soda</servlet-name>
<url-pattern>/soda</url-pattern>
<url-pattern>/sync</url-pattern>
</servlet-mapping>
<servlet>
......@@ -93,7 +93,7 @@
</servlet>
<servlet-mapping>
<servlet-name>uws_merge</servlet-name>
<url-pattern>/uws_merge/*</url-pattern>
<url-pattern>/uws/merge/*</url-pattern>
</servlet-mapping>
......@@ -111,7 +111,7 @@
</servlet>
<servlet-mapping>
<servlet-name>uws_mcutout</servlet-name>
<url-pattern>/uws_mcutout/*</url-pattern>
<url-pattern>/uws/mcutout/*</url-pattern>
</servlet-mapping>
</web-app>
......
data-access/servlet/src/main/webapp/WEB-INF/web.xml
+ 4
− 4
View file @ 68bee9a7
......@@ -6,7 +6,7 @@
-->
<web-app version="2.4" xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd">
<display-name>Via Lactea. Query FITS datacubes.</display-name>
<display-name>ViaLactea. Access FITS datacubes.</display-name>
<distributable/>
......@@ -109,7 +109,7 @@
</servlet>
<servlet-mapping>
<servlet-name>vlkb_soda</servlet-name>
<url-pattern>/soda</url-pattern>
<url-pattern>/sync</url-pattern>
</servlet-mapping>
<servlet>
......@@ -126,7 +126,7 @@
</servlet>
<servlet-mapping>
<servlet-name>uws_merge</servlet-name>
<url-pattern>/uws_merge/*</url-pattern>
<url-pattern>/uws/merge/*</url-pattern>
</servlet-mapping>
......@@ -144,7 +144,7 @@
</servlet>
<servlet-mapping>
<servlet-name>uws_mcutout</servlet-name>
<url-pattern>/uws_mcutout/*</url-pattern>
<url-pattern>/uws/mcutout/*</url-pattern>
</servlet-mapping>
</web-app>
......
docker/Dockerfile.soda
+ 2
− 5
View file @ 68bee9a7
......@@ -12,7 +12,7 @@ ENV CATALINA_BASE=/usr/local/tomcat
ENV CATALINA_HOME=/usr/local/tomcat
WORKDIR /root
ENV HOME /root
ENV HOME=/root
# pre-configure port 8080 (no TSL)
COPY deps/server.xml deps/server-connector.xml* ${CATALINA_BASE}/conf/
......@@ -26,13 +26,10 @@ COPY deps/postgresql-*.jar ${CATALINA_BASE}/lib
WORKDIR ${CATALINA_BASE}
RUN chmod -R a+rwX conf
env ACCESS_CONTEXT_ROOT=datasets
RUN apt-get -y update \
&& apt-get -y install apt-utils \
&& apt-get -y install libcfitsio-bin unzip
&& apt-get -y install libcfitsio-bin unzip libdavix0v5
ENV WEBAPP_DIR=/webapps/vlkb-soda
......
docker/example-compose-soda.yaml
+ 3
− 3
View file @ 68bee9a7
......@@ -9,7 +9,7 @@ services:
ports:
- 18019:8080
environment:
- ACCESS_CONTEXT_ROOT=ska#datasets
- ACCESS_CONTEXT_ROOT=soda
volumes:
- /srv/ska/surveys:/srv/datasets:ro
restart: always
......@@ -22,7 +22,7 @@ services:
ports:
- 18025:8443
environment:
- ACCESS_CONTEXT_ROOT=ska#datasets
- ACCESS_CONTEXT_ROOT=soda
- KEYSTORE_ALIAS=tomcat
volumes:
- /srv/ska/surveys:/srv/datasets:ro
......@@ -38,7 +38,7 @@ services:
ports:
- 18025:8443
environment:
- ACCESS_CONTEXT_ROOT=ska#datasets
- ACCESS_CONTEXT_ROOT=soda
- KEYSTORE_ALIAS=tomcat
- SKAIAM_INTROSPECT=https://iam-escape.cloud.cnaf.infn.it/introspect
- SKAIAM_CLIENT=02cc260f-9837-4907-b2cb-a1a2d764fb15
......
docker/start-soda.sh.soda
+ 1
− 1
View file @ 68bee9a7
......@@ -7,7 +7,7 @@ date
env
# set optional
ACCESS_CONTEXT_ROOT=${ACCESS_CONTEXT_ROOT:-datasets}
ACCESS_CONTEXT_ROOT=${ACCESS_CONTEXT_ROOT:-soda}
SECURITY=${SECURITY:-}
KEYSTORE_ALIAS=${KEYSTORE_ALIAS:-}
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment