diff --git a/docker/Dockerfile.soda.temurin-jammy b/docker/Dockerfile.soda.temurin-jammy index 9c98341dda9aa85aabfa71e906373b446f2eb8cf..8637c87660ee6cd7797f3e00704f43327896b477 100644 --- a/docker/Dockerfile.soda.temurin-jammy +++ b/docker/Dockerfile.soda.temurin-jammy @@ -11,11 +11,6 @@ RUN apt-get -y update \ && apt-get -y install apt-utils \ && apt-get -y install libcfitsio-bin unzip -# Remove the default webapps: -RUN rm -rf /usr/local/tomcat/webapps/examples/ \ - /usr/local/tomcat/webapps/docs/ \ - /usr/local/tomcat/webapps/host-manager - ENV WEBAPP_DIR=/webapps/vlkb-soda @@ -41,21 +36,16 @@ 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 -# configure during docker build-time - -# precofigure port 8080 (no SSL) +# pre-configure port 8080 (no TSL) COPY deps/server.xml deps/server-connector.xml ${CATALINA_BASE}/conf/ -# configure during docker run-time +# modif permissions to allow run as non-root: need to config TSL and ROOT-CONTEXT +WORKDIR ${CATALINA_BASE} +RUN chmod -R a+rwX conf +# configure during start-up COPY start-soda.sh.soda /root/start-soda.sh -# modif permissions to allow run as non-root -#WORKDIR ${CATALINA_HOME} -#RUN chmod -R +rX .; chmod 1777 logs temp work -# additionally need to config TSL and ROOT-CONTEXT config -WORKDIR ${CATALINA_BASE} -RUN chmod -R a+rwX conf RUN chmod +rx /root && chmod +rx /root/start-soda.sh CMD ["sh", "-c", "/root/start-soda.sh"] diff --git a/docker/Makefile b/docker/Makefile index 16f684c354e4b40517f2a66693edb873af7c731b..8baf6882209c687f936428d4108b829155e9c009 100644 --- a/docker/Makefile +++ b/docker/Makefile @@ -31,7 +31,7 @@ ast-9.2.9.tar.gz: .PHONY: build -build-soda-ubuntu: +build-soda-temurin-jammy: docker build --build-arg VLKB_VERSION=$(VERSION) -t soda -f Dockerfile.soda.temurin-jammy . build-soda: