From d853f2261c960ed669a0861cf01b9565adaa9a0f Mon Sep 17 00:00:00 2001
From: Robert Butora <robert.butora@inaf.it>
Date: Mon, 3 Mar 2025 19:02:44 +0100
Subject: [PATCH] docker: adds user in Dockerfile adds hostname in compose.yaml
and exec catalina.sh to capture SIG (for quick container shutdown)
---
docker/Dockerfile.soda | 17 ++++++++++-------
docker/example-compose-soda.yaml | 1 +
docker/start-soda.sh | 2 +-
3 files changed, 12 insertions(+), 8 deletions(-)
diff --git a/docker/Dockerfile.soda b/docker/Dockerfile.soda
index 654e42a..8fe7665 100644
--- a/docker/Dockerfile.soda
+++ b/docker/Dockerfile.soda
@@ -12,7 +12,6 @@ ENV CATALINA_BASE=/usr/local/tomcat
ENV CATALINA_HOME=/usr/local/tomcat
WORKDIR /root
-ENV HOME=/root
# pre-configure port 8080 (no TSL)
COPY deps/server.xml deps/server-connector.xml* ${CATALINA_BASE}/conf/
@@ -60,16 +59,20 @@ RUN echo "${INST_DIR}/lib" > /etc/ld.so.conf.d/ast.conf && ldconfig \
COPY deps/context.xml ${WEBAPP_DIR}/META-INF/context.xml
-# enable SKA IAM token filter update
+# enable IA2 token filter update
RUN chmod -R a+rwX ${WEBAPP_DIR}/WEB-INF \
&& touch ${WEBAPP_DIR}/WEB-INF/classes/ia2token.properties \
&& touch ${WEBAPP_DIR}/WEB-INF/classes/iamtoken.properties \
&& chmod a+rw ${WEBAPP_DIR}/WEB-INF/classes/*.properties
-# configure during start-up
-COPY start-soda.sh /root/start-soda.sh
+RUN groupadd --gid 1000 admin \
+ && useradd --uid 1000 --gid admin --shell /bin/bash --create-home --no-log-init admin
-RUN chmod +rx /root && chmod +rx /root/start-soda.sh
-USER 1000:1000
-CMD ["sh", "-c", "/root/start-soda.sh"]
+COPY start-soda.sh /home/admin/start-soda.sh
+RUN chown admin:admin /home/admin/start-soda.sh
+
+USER admin
+WORKDIR /home/admin
+
+CMD ["/home/admin/start-soda.sh"]
diff --git a/docker/example-compose-soda.yaml b/docker/example-compose-soda.yaml
index 0282788..9caa6e8 100644
--- a/docker/example-compose-soda.yaml
+++ b/docker/example-compose-soda.yaml
@@ -3,6 +3,7 @@ services:
vlkb:
container_name: vlkb
+ hostname: soda
image: soda:latest
ports:
- 8080:8080
diff --git a/docker/start-soda.sh b/docker/start-soda.sh
index 80d9b69..3e40904 100755
--- a/docker/start-soda.sh
+++ b/docker/start-soda.sh
@@ -109,5 +109,5 @@ sed -i "s/.*AuthZ\.level.*=.*/AuthZ.level = $DBG_LEVEL/g" $CATALINA_BASE/conf/so
date
} 1> /tmp/start-soda.log 2>&1
-$CATALINA_HOME/bin/catalina.sh run
+exec $CATALINA_HOME/bin/catalina.sh run
--
GitLab