From 02230231e9e1b518b16fb69ffa0710b39b088731 Mon Sep 17 00:00:00 2001
From: Robert Butora <robert.butora@inaf.it>
Date: Fri, 20 Sep 2024 08:36:24 +0200
Subject: [PATCH] docker: renames entrypoint.sh -> start-soda.sh
---
docker/Dockerfile.soda | 9 +++------
docker/Dockerfile.soda.temurin-jammy | 10 +++++-----
docker/Dockerfile.vlkb | 6 +++---
docker/{entrypoint.sh.soda => start-soda.sh.soda} | 2 +-
docker/{entrypoint.sh.vlkb => start-soda.sh.vlkb} | 2 +-
5 files changed, 13 insertions(+), 16 deletions(-)
rename docker/{entrypoint.sh.soda => start-soda.sh.soda} (98%)
rename docker/{entrypoint.sh.vlkb => start-soda.sh.vlkb} (99%)
diff --git a/docker/Dockerfile.soda b/docker/Dockerfile.soda
index 4f201f5..1528e38 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 0b23b9f..8dd926e 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 9d21277..0326cb1 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 148cdfe..fdcd57e 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 24c360b..ee0ad57 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
--
GitLab