removes surveys cutouts dir mapping to external context-root; renames /srv/surveys -> /srv/datasets

docker/Dockerfile.soda

@@ -26,7 +26,7 @@ ENV WEBAPP_DIR=/webapps/vlkb-soda
 COPY deps/ast_9.2.9-1_amd64.deb ./
 RUN dpkg -i /root/ast_9.2.9-1_amd64.deb && ldconfig \
  && mkdir -p ${WEBAPP_DIR} \
- && mkdir -p /srv/surveys && mkdir -p /srv/cutouts \
+ && mkdir -p /srv/datasets \
  && mkdir -p /etc/pki/tls
 
 ARG VLKB_VERSION
@@ -42,13 +42,15 @@ RUN dpkg -i vlkb-${VLKB_VERSION}.deb \
 ENV INST_DIR=/usr/local
 
 RUN echo "${INST_DIR}/lib" > /etc/ld.so.conf.d/ast.conf && ldconfig \
- && echo "fits_path_surveys=/srv/surveys" > $WEBAPP_DIR/WEB-INF/classes/cutout.properties
+ && echo "fits_path_surveys=/srv/datasets" > $WEBAPP_DIR/WEB-INF/classes/cutout.properties
 
 # pre-configure port 8080 (no TSL)
 COPY deps/server.xml deps/server-connector.xml* ${CATALINA_BASE}/conf/
 COPY deps/soda.logging.properties ${CATALINA_BASE}/conf/
 COPY deps/setenv.sh ${CATALINA_BASE}/bin/
 
+COPY deps/context.xml ${WEBAPP_DIR}/META-INF/context.xml
+
 # modif permissions to allow run as non-root: need to config TSL and ROOT-CONTEXT
 WORKDIR ${CATALINA_BASE}
 RUN chmod -R a+rwX conf

docker/deps/context.xml

+<Context docBase="/webapps/vlkb-soda" />
+

docker/deps/context.xml-with-dir-mapping

+<Context docBase="/webapps/vlkb-soda">
+
+        <Resources allowLinking="true">
+                <PostResources readOnly="false"
+                        className="org.apache.catalina.webresources.DirResourceSet"
+                        base="/srv/cutouts"
+                        webAppMount="/cutouts"/>
+                <PostResources readOnly="true"
+                        className="org.apache.catalina.webresources.DirResourceSet"
+                        base="/srv/surveys"
+                        webAppMount="/surveys"/>
+        </Resources>
+
+</Context>
+

docker/example-compose-soda.yaml

@@ -11,7 +11,7 @@ services:
     environment:
       - ACCESS_CONTEXT_ROOT=ska#datasets
     volumes:
-      - /srv/ska/surveys:/srv/surveys:ro
+      - /srv/ska/surveys:/srv/datasets:ro
     restart: always
 
 
@@ -25,7 +25,7 @@ services:
       - ACCESS_CONTEXT_ROOT=ska#datasets
       - KEYSTORE_ALIAS=tomcat
     volumes:
-      - /srv/ska/surveys:/srv/surveys:ro
+      - /srv/ska/surveys:/srv/datasets:ro
       - ./security/keystore.jks:/etc/pki/tls/keystore.jks:ro
       - ./security/keystore.pwd:/etc/pki/tls/keystore.pwd:ro
     restart: always
@@ -44,7 +44,7 @@ services:
       - SKAIAM_CLIENT=02cc260f-9837-4907-b2cb-a1a2d764fb15
       - SKAIAM_PASSWORD=AJMi3qrB6AHRp_6y55tEwU-IpJ8uZ6X4QXeQ3W4la6dc-BlkzAY1OQpAE9hb1W7-VfYl4208FUtjE2Cl3hUYLkQ
     volumes:
-      - /srv/ska/surveys:/srv/surveys:ro
+      - /srv/ska/surveys:/srv/datasets:ro
       - ./security/keystore.jks:/etc/pki/tls/keystore.jks:ro
       - ./security/keystore.pwd:/etc/pki/tls/keystore.pwd:ro
     restart: always

docker/start-soda.sh.soda

@@ -8,7 +8,7 @@ whoami
 env
 
 
-# configure SODA
+# configure CONTEXT_ROOT
 
 mkdir -p $CATALINA_BASE/conf/Catalina/localhost
 cp $WEBAPP_DIR/META-INF/context.xml $CATALINA_BASE/conf/Catalina/localhost/$ACCESS_CONTEXT_ROOT.xml