diff --git a/docker/Dockerfile.soda b/docker/Dockerfile.soda index 4f201f5ef100f3af0e26f7c9a1ce76f6e96729fd..1528e381d88ef7a80ce5dd63a897c8a08f97cf46 100644 --- a/docker/Dockerfile.soda +++ b/docker/Dockerfile.soda @@ -44,7 +44,7 @@ COPY deps/server.xml deps/server-connector.xml ${CATALINA_BASE}/conf/ # configure at start-up -COPY entrypoint.sh.soda /root/entrypoint.sh +COPY start-soda.sh.soda /root/start-soda.sh # modif permissions to allow run as non-root WORKDIR ${CATALINA_HOME} @@ -53,9 +53,6 @@ WORKDIR ${CATALINA_HOME} 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"] +RUN chmod +rx /root && chmod +rx /root/start-soda.sh +CMD ["sh", "-c", "/root/start-soda.sh"] diff --git a/docker/Dockerfile.soda.temurin-jammy b/docker/Dockerfile.soda.temurin-jammy index 0b23b9f5b3b97870461610159d9541a3fd956b2d..8dd926ecb911e5517b93fd14267999bd793e9838 100644 --- a/docker/Dockerfile.soda.temurin-jammy +++ b/docker/Dockerfile.soda.temurin-jammy @@ -47,14 +47,14 @@ COPY deps/server.xml deps/server-connector.xml ${CATALINA_BASE}/conf/ # configure during docker run-time -COPY entrypoint.sh.soda /root/entrypoint.sh +COPY start-soda.sh.soda /root/start-soda.sh # modif permissions to allow run as non-root -#WORKDIR ${CATALINA_HOME} <---- these set already in orig image +#WORKDIR ${CATALINA_HOME} #RUN chmod -R +rX .; chmod 1777 logs temp work -# below needed because TSL and ROOT-CONTEXT config +# 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/entrypoint.sh -CMD ["sh", "-c", "/root/entrypoint.sh"] +RUN chmod +rx /root && chmod +rx /root/start-soda.sh +CMD ["sh", "-c", "/root/start-soda.sh"] diff --git a/docker/Dockerfile.vlkb b/docker/Dockerfile.vlkb index 9d212774f055e0d6452eef6b2f4ad9b018c8e67c..0326cb1e854cdf82fd89dde259dc31d76e246560 100644 --- a/docker/Dockerfile.vlkb +++ b/docker/Dockerfile.vlkb @@ -60,11 +60,11 @@ COPY deps/server.xml deps/server-connector.xml /etc/tomcat9/ # configure during docker run-time -COPY entrypoint.sh /root +COPY start-soda.sh /root RUN echo "alias log-catalina='ls -t /var/log/tomcat9/catalina*.log | head -n 1 | xargs tail -200 '" >> /root/.bashrc$ # run -RUN pwd && chmod +x /root/entrypoint.sh -CMD ["sh", "-c", "/root/entrypoint.sh"] +RUN pwd && chmod +x /root/start-soda.sh +CMD ["sh", "-c", "/root/start-soda.sh"] diff --git a/docker/entrypoint.sh.soda b/docker/start-soda.sh.soda similarity index 98% rename from docker/entrypoint.sh.soda rename to docker/start-soda.sh.soda index 148cdfed64fb3d64e7ef7dfeced784ea747e19d1..fdcd57e1b78d62069bc86eb44ef14c212697ef39 100755 --- a/docker/entrypoint.sh.soda +++ b/docker/start-soda.sh.soda @@ -57,7 +57,7 @@ case $SECURITY in esac date -} 1> /tmp/entrypoint.log 2>&1 +} 1> /tmp/start-soda.log 2>&1 $CATALINA_HOME/bin/catalina.sh run diff --git a/docker/entrypoint.sh.vlkb b/docker/start-soda.sh.vlkb similarity index 99% rename from docker/entrypoint.sh.vlkb rename to docker/start-soda.sh.vlkb index 24c360bd0abd3d0a10d5c66bc290f6f50e949e97..ee0ad5785f78a2465931b005b31f1db87d520cef 100755 --- a/docker/entrypoint.sh.vlkb +++ b/docker/start-soda.sh.vlkb @@ -1,7 +1,7 @@ #!/bin/bash set +e -LOG_FILE=/tmp/entrypoint.log +LOG_FILE=/tmp/start-soda.log { date