This is an automated email from the ASF dual-hosted git repository.
jbertram pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/activemq-artemis.git
The following commit(s) were added to refs/heads/main by this push:
new c2d69479b8 ARTEMIS-5263 Remove unused Docker directive
c2d69479b8 is described below
commit c2d69479b87eec7c497212b8f61b2d93d41417c0
Author: Vilius Šumskas <[email protected]>
AuthorDate: Sun Jan 26 23:07:05 2025 +0200
ARTEMIS-5263 Remove unused Docker directive
Pipes are not used in the scripts anymore, so there is no need for
pipefail support. Plus some minor cosmetic tweaks.
---
artemis-docker/Dockerfile-alpine-21 | 6 ++----
artemis-docker/Dockerfile-alpine-21-jre | 6 ++----
artemis-docker/Dockerfile-ubuntu-21 | 11 ++++-------
artemis-docker/Dockerfile-ubuntu-21-jre | 11 ++++-------
4 files changed, 12 insertions(+), 22 deletions(-)
diff --git a/artemis-docker/Dockerfile-alpine-21
b/artemis-docker/Dockerfile-alpine-21
index 758b97d150..6ea3133107 100644
--- a/artemis-docker/Dockerfile-alpine-21
+++ b/artemis-docker/Dockerfile-alpine-21
@@ -26,8 +26,6 @@ RUN addgroup --gid 1001 --system artemis && adduser --uid
1001 --ingroup artemis
# alpine doesn't come with bash
RUN /bin/sh -c "apk update && apk upgrade --no-cache && apk add --no-cache
bash libaio"
-# Make sure pipes are considered to determine success, see:
https://github.com/hadolint/hadolint/wiki/DL4006
-SHELL ["/bin/bash", "-o", "pipefail", "-c"]
WORKDIR /opt
ENV ARTEMIS_USER artemis
@@ -44,13 +42,13 @@ EXPOSE \
8161 \
# Port for CORE,MQTT,AMQP,HORNETQ,STOMP,OPENWIRE
61616 \
-# Port for HORNETQ,STOMP
+# Port for legacy HORNETQ,STOMP clients
5445 \
# Port for AMQP
5672 \
# Port for MQTT
1883 \
-#Port for STOMP
+# Port for STOMP
61613
USER root
diff --git a/artemis-docker/Dockerfile-alpine-21-jre
b/artemis-docker/Dockerfile-alpine-21-jre
index b1910761ec..b66e1bc7af 100644
--- a/artemis-docker/Dockerfile-alpine-21-jre
+++ b/artemis-docker/Dockerfile-alpine-21-jre
@@ -26,8 +26,6 @@ RUN addgroup --gid 1001 --system artemis && adduser --uid
1001 --ingroup artemis
# alpine doesn't come with bash
RUN /bin/sh -c "apk update && apk upgrade --no-cache && apk add --no-cache
bash libaio"
-# Make sure pipes are considered to determine success, see:
https://github.com/hadolint/hadolint/wiki/DL4006
-SHELL ["/bin/bash", "-o", "pipefail", "-c"]
WORKDIR /opt
ENV ARTEMIS_USER artemis
@@ -44,13 +42,13 @@ EXPOSE \
8161 \
# Port for CORE,MQTT,AMQP,HORNETQ,STOMP,OPENWIRE
61616 \
-# Port for HORNETQ,STOMP
+# Port for legacy HORNETQ,STOMP clients
5445 \
# Port for AMQP
5672 \
# Port for MQTT
1883 \
-#Port for STOMP
+# Port for STOMP
61613
USER root
diff --git a/artemis-docker/Dockerfile-ubuntu-21
b/artemis-docker/Dockerfile-ubuntu-21
index 82432014e8..28932cc160 100644
--- a/artemis-docker/Dockerfile-ubuntu-21
+++ b/artemis-docker/Dockerfile-ubuntu-21
@@ -19,8 +19,6 @@
FROM eclipse-temurin:21-jdk
LABEL maintainer="Apache ActiveMQ Team"
-# Make sure pipes are considered to determine success, see:
https://github.com/hadolint/hadolint/wiki/DL4006
-SHELL ["/bin/bash", "-o", "pipefail", "-c"]
WORKDIR /opt
ENV ARTEMIS_USER artemis
@@ -34,9 +32,8 @@ RUN groupadd -g 1001 -r artemis && useradd -r -u 1001 -g
artemis artemis
# install AIO
RUN apt-get -qq -o=Dpkg::Use-Pty=0 update && \
apt-get -qq -o=Dpkg::Use-Pty=0 install -y libaio1t64 && \
- rm -rf /var/lib/apt/lists/*
-
-RUN ln -s /usr/lib/x86_64-linux-gnu/libaio.so.1t64 /usr/lib/libaio.so.1
+ rm -rf /var/lib/apt/lists/* && \
+ ln -s /usr/lib/x86_64-linux-gnu/libaio.so.1t64 /usr/lib/libaio.so.1
USER artemis
@@ -47,13 +44,13 @@ EXPOSE \
8161 \
# Port for CORE,MQTT,AMQP,HORNETQ,STOMP,OPENWIRE
61616 \
-# Port for HORNETQ,STOMP
+# Port for legacy HORNETQ,STOMP clients
5445 \
# Port for AMQP
5672 \
# Port for MQTT
1883 \
-#Port for STOMP
+# Port for STOMP
61613
USER root
diff --git a/artemis-docker/Dockerfile-ubuntu-21-jre
b/artemis-docker/Dockerfile-ubuntu-21-jre
index a46b62cb53..c6eea56cf4 100644
--- a/artemis-docker/Dockerfile-ubuntu-21-jre
+++ b/artemis-docker/Dockerfile-ubuntu-21-jre
@@ -19,8 +19,6 @@
FROM eclipse-temurin:21-jre
LABEL maintainer="Apache ActiveMQ Team"
-# Make sure pipes are considered to determine success, see:
https://github.com/hadolint/hadolint/wiki/DL4006
-SHELL ["/bin/bash", "-o", "pipefail", "-c"]
WORKDIR /opt
ENV ARTEMIS_USER artemis
@@ -34,9 +32,8 @@ RUN groupadd -g 1001 -r artemis && useradd -r -u 1001 -g
artemis artemis
# install AIO
RUN apt-get -qq -o=Dpkg::Use-Pty=0 update && \
apt-get -qq -o=Dpkg::Use-Pty=0 install -y libaio1t64 && \
- rm -rf /var/lib/apt/lists/*
-
-RUN ln -s /usr/lib/x86_64-linux-gnu/libaio.so.1t64 /usr/lib/libaio.so.1
+ rm -rf /var/lib/apt/lists/* && \
+ ln -s /usr/lib/x86_64-linux-gnu/libaio.so.1t64 /usr/lib/libaio.so.1
USER artemis
@@ -47,13 +44,13 @@ EXPOSE \
8161 \
# Port for CORE,MQTT,AMQP,HORNETQ,STOMP,OPENWIRE
61616 \
-# Port for HORNETQ,STOMP
+# Port for legacy HORNETQ,STOMP clients
5445 \
# Port for AMQP
5672 \
# Port for MQTT
1883 \
-#Port for STOMP
+# Port for STOMP
61613
USER root
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
For further information, visit: https://activemq.apache.org/contact
