AMQ-9588: Run ActiveMQ with regular user in Docker container, and hook to easily stop the container (#1665)

Author: jbonofre

assembly/src/docker/Dockerfile

@@ -29,14 +29,23 @@ ENV PATH $PATH:$ACTIVEMQ_HOME/bin
 # activemq_dist can point to a directory or a tarball on the local system
 ARG activemq_dist=NOT_SET
 
+RUN groupadd -r activemq && useradd -r -g activemq activemq
+
 COPY entrypoint.sh /usr/local/bin/entrypoint.sh
+RUN chown activemq:activemq /usr/local/bin/entrypoint.sh && chmod +x /usr/local/bin/entrypoint.sh
 
 # Install build dependencies and activemq
 ADD $activemq_dist $ACTIVEMQ_INSTALL_PATH
 RUN set -x && \
   cp -r $ACTIVEMQ_INSTALL_PATH/apache-activemq-* $ACTIVEMQ_HOME && \
 	rm -r $ACTIVEMQ_INSTALL_PATH/apache-activemq-*
 
+RUN chown -R activemq:activemq $ACTIVEMQ_HOME
+
+STOPSIGNAL SIGTERM
+
+USER activemq
+
 EXPOSE 8161 61616 5672 61613 1883 61614 1099
 ENTRYPOINT ["/usr/local/bin/entrypoint.sh"]
 CMD ["activemq", "console"]

assembly/src/docker/entrypoint.sh

@@ -89,4 +89,17 @@ if [ -z "${ACTIVEMQ_OPTS}" ]; then
   export ACTIVEMQ_OPTS
 fi
 
-exec "$@"
+_term() {
+  echo "Received signal, stopping ActiveMQ..."
+  if [ -n "${child_pid:-}" ] && kill -0 "${child_pid}" 2>/dev/null; then
+    kill -TERM "${child_pid}" 2>/dev/null || true
+  fi
+}
+
+trap _term TERM INT
+
+"$@" &
+child_pid=$!
+wait "${child_pid}"
+
+exit $?