diff --git a/docker/Dockerfile.soda b/docker/Dockerfile.soda index 21ccb03558fe76b4a2eeed28f79bbd9d09b7a353..a51c99825bcb1e9e3b5b079e884add6ebc9e96a5 100644 --- a/docker/Dockerfile.soda +++ b/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 diff --git a/docker/deps/context.xml b/docker/deps/context.xml new file mode 100644 index 0000000000000000000000000000000000000000..7ad78afc41973cf50829827cf1cf42f31a885530 --- /dev/null +++ b/docker/deps/context.xml @@ -0,0 +1,2 @@ +<Context docBase="/webapps/vlkb-soda" /> + diff --git a/docker/deps/context.xml-with-dir-mapping b/docker/deps/context.xml-with-dir-mapping new file mode 100644 index 0000000000000000000000000000000000000000..dc26e6c1e9efc3b01245a048ac155ddd682513b5 --- /dev/null +++ b/docker/deps/context.xml-with-dir-mapping @@ -0,0 +1,15 @@ +<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> + diff --git a/docker/example-compose-soda.yaml b/docker/example-compose-soda.yaml index 59fc971a1350832c0a6c14170dd079554a5de0df..7192354da24ca1f3dcb36a3d6aef9d767e515472 100644 --- a/docker/example-compose-soda.yaml +++ b/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 diff --git a/docker/start-soda.sh.soda b/docker/start-soda.sh.soda index 2ee927a81fca6f3258f6b7253a48a00ca733ee0b..9cca90d1da14033601f4bace9fa45456d455903d 100755 --- a/docker/start-soda.sh.soda +++ b/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