From 4e41e3bc73ffb7249093a78ba4e145b68dfe35ea Mon Sep 17 00:00:00 2001 From: Francisco Ernesto Teixeira Date: Mon, 4 Dec 2023 09:57:13 -0300 Subject: [PATCH 1/2] Updated to ActiveMQ Classic 6.0.0 --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 448b7d3..4f1f040 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,7 +2,7 @@ FROM bellsoft/liberica-openjdk-alpine:17 LABEL maintainer="Thomas Lutz " -ENV ACTIVEMQ_VERSION 5.18.3 +ENV ACTIVEMQ_VERSION 6.0.0 ENV ACTIVEMQ apache-activemq-$ACTIVEMQ_VERSION ENV ACTIVEMQ_HOME /opt/activemq From dde6358ac60929efaee3cdc33fe1a6e27fc91dc4 Mon Sep 17 00:00:00 2001 From: Francisco Ernesto Teixeira Date: Mon, 4 Dec 2023 14:13:03 -0300 Subject: [PATCH 2/2] Fix webpermissions to be setted when Jetty Realm file doesn't exists --- entrypoint.sh | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/entrypoint.sh b/entrypoint.sh index 2e3ff31..447320c 100644 --- a/entrypoint.sh +++ b/entrypoint.sh @@ -44,7 +44,18 @@ fi if [ -n "$ACTIVEMQ_WEBADMIN_USERNAME" ] || [ -n "$ACTIVEMQ_WEBADMIN_PASSWORD" ]; then echo "Setting activemq WebConsole $has_modified_webadmin_username $has_modified_webadmin_pw" - sed -i "s#admin: admin, admin#$activemq_webadmin_username: $activemq_webadmin_pw, admin#" conf/jetty-realm.properties + + # If file conf/jetty-realm.properties exists + if [[ -e conf/jetty-realm.properties ]]; then + sed -i "s#admin: admin, admin#$activemq_webadmin_username: $activemq_webadmin_pw, admin#" conf/jetty-realm.properties + fi + + # If file conf/jetty-realm.properties not exists + if [[ ! -e conf/jetty-realm.properties ]]; then + mkdir -p conf + touch conf/jetty-realm.properties + echo "$activemq_webadmin_username: $activemq_webadmin_pw, admin" >> conf/jetty-realm.properties + fi fi ## Modify activemq.xml