diff --git a/docker/Dockerfile.soda b/docker/Dockerfile.soda index 0579b8e55030aac7ea457b56da4bb33faf97ec72..4f201f5ef100f3af0e26f7c9a1ce76f6e96729fd 100644 --- a/docker/Dockerfile.soda +++ b/docker/Dockerfile.soda @@ -46,8 +46,16 @@ COPY deps/server.xml deps/server-connector.xml ${CATALINA_BASE}/conf/ COPY entrypoint.sh.soda /root/entrypoint.sh -# run - -RUN pwd && chmod +x /root/entrypoint.sh +# modif permissions to allow run as non-root +WORKDIR ${CATALINA_HOME} +# orig was: chmod 1777 logs temp work; +# logs --> /var/log/tomcat9 work --> /var/cache/tomcat9 temp (missing) +RUN chmod -R +rX .; chmod 1777 /var/log/tomcat9 /var/cache/tomcat9 +WORKDIR ${CATALINA_BASE} +RUN chmod -R a+rwX conf +RUN chmod +rx /root && chmod +rx /root/entrypoint.sh CMD ["sh", "-c", "/root/entrypoint.sh"] +#RUN pwd && chmod +x /root/entrypoint.sh +#CMD ["sh", "-c", "/root/entrypoint.sh"] + diff --git a/docker/Dockerfile.soda.temurin-jammy b/docker/Dockerfile.soda.temurin-jammy index eb66b165cd6936a3b3234393a45312eb825c7c1a..0b23b9f5b3b97870461610159d9541a3fd956b2d 100644 --- a/docker/Dockerfile.soda.temurin-jammy +++ b/docker/Dockerfile.soda.temurin-jammy @@ -9,7 +9,7 @@ ENV HOME /root RUN apt-get -y update \ && apt-get -y install apt-utils \ - && apt-get -y install libcfitsio-bin libcsv3 time unzip + && apt-get -y install libcfitsio-bin unzip # Remove the default webapps: RUN rm -rf /usr/local/tomcat/webapps/examples/ \ @@ -49,8 +49,12 @@ COPY deps/server.xml deps/server-connector.xml ${CATALINA_BASE}/conf/ COPY entrypoint.sh.soda /root/entrypoint.sh -# run - -RUN pwd && chmod +x /root/entrypoint.sh +# modif permissions to allow run as non-root +#WORKDIR ${CATALINA_HOME} <---- these set already in orig image +#RUN chmod -R +rX .; chmod 1777 logs temp work +# below needed because TSL and ROOT-CONTEXT config +WORKDIR ${CATALINA_BASE} +RUN chmod -R a+rwX conf +RUN chmod +rx /root && chmod +rx /root/entrypoint.sh CMD ["sh", "-c", "/root/entrypoint.sh"]