Merge pull request vromero#107 from vromero/fix/104-restart-disable-s…

…ecurity

Fix for Can't restart container when DISABLE_SECURITY=true FIX vromero#104

src/Dockerfile

@@ -44,8 +44,8 @@ RUN if (echo "${ACTIVEMQ_DISTRIBUTION_URL}" | grep -Eq  ".zip\$" ) ; \
       wget "https://repository.apache.org/content/repositories/releases/org/apache/activemq/apache-artemis/${ACTIVEMQ_ARTEMIS_VERSION}/apache-artemis-${ACTIVEMQ_ARTEMIS_VERSION}-bin.tar.gz" && \
       wget "https://repository.apache.org/content/repositories/releases/org/apache/activemq/apache-artemis/${ACTIVEMQ_ARTEMIS_VERSION}/apache-artemis-${ACTIVEMQ_ARTEMIS_VERSION}-bin.tar.gz.asc" && \
       wget "http://apache.org/dist/activemq/KEYS" && \
-      gpg --import "KEYS" && \
-      gpg "apache-artemis-${ACTIVEMQ_ARTEMIS_VERSION}-bin.tar.gz.asc" && \
+      gpg --no-tty --import "KEYS" && \
+      gpg --no-tty "apache-artemis-${ACTIVEMQ_ARTEMIS_VERSION}-bin.tar.gz.asc" && \
       tar xfz "apache-artemis-${ACTIVEMQ_ARTEMIS_VERSION}-bin.tar.gz" && \
       ln -s "/opt/apache-artemis-${ACTIVEMQ_ARTEMIS_VERSION}" "/opt/apache-artemis" && \
       rm -f "apache-artemis-${ACTIVEMQ_ARTEMIS_VERSION}-bin.tar.gz" "KEYS" "apache-artemis-${ACTIVEMQ_ARTEMIS_VERSION}-bin.tar.gz.asc"; \

src/Dockerfile.alpine

@@ -3,7 +3,7 @@
 ##########################################################
 ## Build Image                                           #
 ##########################################################
-FROM openjdk:8 as builder
+FROM openjdk:8u171-jdk-stretch as builder
 LABEL maintainer="Victor Romero <[email protected]>"
 
 ARG ACTIVEMQ_ARTEMIS_VERSION
@@ -44,8 +44,8 @@ RUN if (echo "${ACTIVEMQ_DISTRIBUTION_URL}" | grep -Eq  ".zip\$" ) ; \
       wget "https://repository.apache.org/content/repositories/releases/org/apache/activemq/apache-artemis/${ACTIVEMQ_ARTEMIS_VERSION}/apache-artemis-${ACTIVEMQ_ARTEMIS_VERSION}-bin.tar.gz" && \
       wget "https://repository.apache.org/content/repositories/releases/org/apache/activemq/apache-artemis/${ACTIVEMQ_ARTEMIS_VERSION}/apache-artemis-${ACTIVEMQ_ARTEMIS_VERSION}-bin.tar.gz.asc" && \
       wget "http://apache.org/dist/activemq/KEYS" && \
-      gpg --import "KEYS" && \
-      gpg "apache-artemis-${ACTIVEMQ_ARTEMIS_VERSION}-bin.tar.gz.asc" && \
+      gpg --no-tty --import "KEYS" && \
+      gpg --no-tty "apache-artemis-${ACTIVEMQ_ARTEMIS_VERSION}-bin.tar.gz.asc" && \
       tar xfz "apache-artemis-${ACTIVEMQ_ARTEMIS_VERSION}-bin.tar.gz" && \
       ln -s "/opt/apache-artemis-${ACTIVEMQ_ARTEMIS_VERSION}" "/opt/apache-artemis" && \
       rm -f "apache-artemis-${ACTIVEMQ_ARTEMIS_VERSION}-bin.tar.gz" "KEYS" "apache-artemis-${ACTIVEMQ_ARTEMIS_VERSION}-bin.tar.gz.asc"; \

src/assets/docker-entrypoint.sh

@@ -19,7 +19,7 @@ if [ "$DISABLE_SECURITY" ]; then
     xmlstarlet ed -L \
       -N activemq="urn:activemq" \
       -N core="urn:activemq:core" \
-      --subnode "/activemq:configuration/core:core" \
+      --subnode "/activemq:configuration/core:core[not(core:security-enabled)]" \
       -t elem \
       -n "security-enabled" \
       -v "false" ../etc/broker.xml