This is an automated email from the ASF dual-hosted git repository.
robbie 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 8b2255d78d ARTEMIS-4554 upgrade to latest Java for Docker images
8b2255d78d is described below
commit 8b2255d78df7bd863aaeacaabe5f71488124443f
Author: Justin Bertram <[email protected]>
AuthorDate: Fri Jan 5 15:51:11 2024 -0600
ARTEMIS-4554 upgrade to latest Java for Docker images
---
...ckerfile-alpine-11-jre => Dockerfile-alpine-21} | 2 +-
...ckerfile-alpine-17 => Dockerfile-alpine-21-jre} | 2 +-
...Dockerfile-centos7-11 => Dockerfile-centos7-17} | 2 +-
...ckerfile-ubuntu-11-jre => Dockerfile-ubuntu-21} | 2 +-
...ckerfile-ubuntu-11 => Dockerfile-ubuntu-21-jre} | 2 +-
artemis-docker/prepare-docker.sh | 24 +++++++++++-----------
scripts/release-docker.sh | 8 ++++----
7 files changed, 21 insertions(+), 21 deletions(-)
diff --git a/artemis-docker/Dockerfile-alpine-11-jre
b/artemis-docker/Dockerfile-alpine-21
similarity index 98%
rename from artemis-docker/Dockerfile-alpine-11-jre
rename to artemis-docker/Dockerfile-alpine-21
index c72799cd5c..105b4c9b2c 100644
--- a/artemis-docker/Dockerfile-alpine-11-jre
+++ b/artemis-docker/Dockerfile-alpine-21
@@ -17,7 +17,7 @@
# ActiveMQ Artemis
-FROM eclipse-temurin:11-jre-alpine
+FROM eclipse-temurin:21-jdk-alpine
LABEL maintainer="Apache ActiveMQ Team"
# add user and group for artemis
diff --git a/artemis-docker/Dockerfile-alpine-17
b/artemis-docker/Dockerfile-alpine-21-jre
similarity index 98%
rename from artemis-docker/Dockerfile-alpine-17
rename to artemis-docker/Dockerfile-alpine-21-jre
index b462b73f75..9ccd1844a9 100644
--- a/artemis-docker/Dockerfile-alpine-17
+++ b/artemis-docker/Dockerfile-alpine-21-jre
@@ -17,7 +17,7 @@
# ActiveMQ Artemis
-FROM eclipse-temurin:17-jdk-alpine
+FROM eclipse-temurin:21-jre-alpine
LABEL maintainer="Apache ActiveMQ Team"
# add user and group for artemis
diff --git a/artemis-docker/Dockerfile-centos7-11
b/artemis-docker/Dockerfile-centos7-17
similarity index 98%
rename from artemis-docker/Dockerfile-centos7-11
rename to artemis-docker/Dockerfile-centos7-17
index 5c8fb723da..7d2fc35418 100644
--- a/artemis-docker/Dockerfile-centos7-11
+++ b/artemis-docker/Dockerfile-centos7-17
@@ -17,7 +17,7 @@
# ActiveMQ Artemis
-FROM eclipse-temurin:11-centos7
+FROM eclipse-temurin:17-jdk-centos7
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"]
diff --git a/artemis-docker/Dockerfile-ubuntu-11-jre
b/artemis-docker/Dockerfile-ubuntu-21
similarity index 98%
rename from artemis-docker/Dockerfile-ubuntu-11-jre
rename to artemis-docker/Dockerfile-ubuntu-21
index 8751d4d707..53e6c26913 100644
--- a/artemis-docker/Dockerfile-ubuntu-11-jre
+++ b/artemis-docker/Dockerfile-ubuntu-21
@@ -17,7 +17,7 @@
# ActiveMQ Artemis
-FROM eclipse-temurin:11-jre
+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"]
diff --git a/artemis-docker/Dockerfile-ubuntu-11
b/artemis-docker/Dockerfile-ubuntu-21-jre
similarity index 98%
rename from artemis-docker/Dockerfile-ubuntu-11
rename to artemis-docker/Dockerfile-ubuntu-21-jre
index 71145cd937..d4a6f95ed2 100644
--- a/artemis-docker/Dockerfile-ubuntu-11
+++ b/artemis-docker/Dockerfile-ubuntu-21-jre
@@ -17,7 +17,7 @@
# ActiveMQ Artemis
-FROM eclipse-temurin:11
+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"]
diff --git a/artemis-docker/prepare-docker.sh b/artemis-docker/prepare-docker.sh
index e58c15f66d..31e7eeba49 100755
--- a/artemis-docker/prepare-docker.sh
+++ b/artemis-docker/prepare-docker.sh
@@ -53,23 +53,23 @@ Well done! Now you can continue with building the Docker
image:
# Go to $ARTEMIS_DIST_DIR
$ cd $ARTEMIS_DIST_DIR
- # For CentOS with full JDK 11
- $ docker build -f ./docker/Dockerfile-centos7-11 -t artemis-centos .
+ # For CentOS with full JDK 17
+ $ docker build -f ./docker/Dockerfile-centos7-17 -t artemis-centos .
- # For Ubuntu with full JDK 11
- $ docker build -f ./docker/Dockerfile-ubuntu-11 -t artemis-ubuntu .
+ # For Ubuntu with full JDK 21
+ $ docker build -f ./docker/Dockerfile-ubuntu-21 -t artemis-ubuntu .
- # For Ubuntu with just JRE 11
- $ docker build -f ./docker/Dockerfile-ubuntu-11-jre -t artemis-ubuntu-jre .
+ # For Ubuntu with just JRE 21
+ $ docker build -f ./docker/Dockerfile-ubuntu-21-jre -t artemis-ubuntu-jre .
- # For Alpine with full JDK 17
- $ docker build -f ./docker/Dockerfile-alpine-17 -t artemis-alpine .
+ # For Alpine with full JDK 21
+ $ docker build -f ./docker/Dockerfile-alpine-21 -t artemis-alpine .
- # For Alpine with just JRE 11
- $ docker build -f ./docker/Dockerfile-alpine-11-jre -t artemis-alpine-jre .
+ # For Alpine with just JRE 21
+ $ docker build -f ./docker/Dockerfile-alpine-21-jre -t artemis-alpine-jre .
- # For Ubuntu on Linux ARMv7/ARM64 with full JDK
- $ docker buildx build --platform linux/arm64,linux/arm/v7 --push -t
{your-repository}/apache-artemis:2.17.0-SNAPSHOT -f
./docker/Dockerfile-ubuntu-11 .
+ # Multi-platform for Ubuntu on Linux AMD64 & ARM64 with full JDK
+ $ docker buildx build --platform linux/amd64,linux/arm64 --push -t
{your-repository}/apache-artemis:{your-version} -f
./docker/Dockerfile-ubuntu-21 .
Note: -t artemis-centos and -t artemis-ubuntu are just tag names for the
purpose of this guide
diff --git a/scripts/release-docker.sh b/scripts/release-docker.sh
index 264217490c..4352bab967 100755
--- a/scripts/release-docker.sh
+++ b/scripts/release-docker.sh
@@ -31,11 +31,11 @@ cd ../artemis-docker
rm -Rf _TMP_/
./prepare-docker.sh --from-release --artemis-version ${VERSION}
cd _TMP_/artemis/${VERSION}
-docker pull eclipse-temurin:11-jre-alpine
-docker pull eclipse-temurin:11-jre
-docker build -f ./docker/Dockerfile-alpine-11-jre -t
${REPO}/activemq-artemis:${VERSION}-alpine .
+docker pull eclipse-temurin:21-jre-alpine
+docker pull eclipse-temurin:21-jre
+docker build -f ./docker/Dockerfile-alpine-21-jre -t
${REPO}/activemq-artemis:${VERSION}-alpine .
docker tag ${REPO}/activemq-artemis:${VERSION}-alpine
${REPO}/activemq-artemis:latest-alpine
-docker build -f ./docker/Dockerfile-ubuntu-11-jre -t
${REPO}/activemq-artemis:${VERSION} .
+docker build -f ./docker/Dockerfile-ubuntu-21-jre -t
${REPO}/activemq-artemis:${VERSION} .
docker tag ${REPO}/activemq-artemis:${VERSION} ${REPO}/activemq-artemis:latest
docker login
docker push ${REPO}/activemq-artemis:${VERSION}-alpine
