You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by jb...@apache.org on 2022/05/23 19:32:58 UTC
[activemq-artemis] branch main updated: NO-JIRA update JDK image in Docker file
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 8a95f1a4cd NO-JIRA update JDK image in Docker file
new 6952fe0ab6 This closes #4092
8a95f1a4cd is described below
commit 8a95f1a4cd881c6f41653e9b3ac27ebbb376aa2a
Author: Kent Bair <ke...@sdl.usu.edu>
AuthorDate: Mon May 23 11:07:03 2022 -0600
NO-JIRA update JDK image in Docker file
Eclipse is now maintaining the Adopt OpenJDK project. Due to that change
the base adoptopenjdk image used in the Dockerfile is no longer
supported. This commit is just changing the base image to match the
recommended replacement in the deprecation notice (i.e.
https://hub.docker.com/_/adoptopenjdk).
---
...e-adoptopenjdk-11 => Dockerfile-eclipse-temurin-11} | 2 +-
artemis-docker/prepare-docker.sh | 6 +++---
artemis-docker/readme.md | 18 +++++++++---------
3 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/artemis-docker/Dockerfile-adoptopenjdk-11 b/artemis-docker/Dockerfile-eclipse-temurin-11
similarity index 98%
rename from artemis-docker/Dockerfile-adoptopenjdk-11
rename to artemis-docker/Dockerfile-eclipse-temurin-11
index 499f8717e3..71145cd937 100644
--- a/artemis-docker/Dockerfile-adoptopenjdk-11
+++ b/artemis-docker/Dockerfile-eclipse-temurin-11
@@ -17,7 +17,7 @@
# ActiveMQ Artemis
-FROM adoptopenjdk:11-jre-hotspot
+FROM eclipse-temurin:11
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 53af6fd999..c6b766f078 100755
--- a/artemis-docker/prepare-docker.sh
+++ b/artemis-docker/prepare-docker.sh
@@ -62,12 +62,12 @@ Building the Docker Image:
$ docker build -f ./docker/Dockerfile-centos -t artemis-centos .
# For AdoptOpen JDK 11
- $ docker build -f ./docker/Dockerfile-adoptopenjdk-11 -t artemis-adoptopenjdk-11 .
+ $ docker build -f ./docker/Dockerfile-eclipse-temurin-11 -t artemis-eclipse-temurin-11 .
# For AdoptOpen JDK 11 (Build for linux ARMv7/ARM64)
- $ docker buildx build --platform linux/arm64,linux/arm/v7 --push -t {your-repository}/apache-artemis:2.17.0-SNAPSHOT -f ./docker/Dockerfile-adoptopenjdk-11 .
+ $ docker buildx build --platform linux/arm64,linux/arm/v7 --push -t {your-repository}/apache-artemis:2.17.0-SNAPSHOT -f ./docker/Dockerfile-eclipse-temurin-11 .
-Note: -t artemis-debian, -t artemis-centos and artemis-adoptopenjdk-11 are just
+Note: -t artemis-debian, -t artemis-centos and artemis-eclipse-temurin-11 are just
tag names for the purpose of this guide
For more info read the readme.md
diff --git a/artemis-docker/readme.md b/artemis-docker/readme.md
index 3f17743d06..7799bd4838 100644
--- a/artemis-docker/readme.md
+++ b/artemis-docker/readme.md
@@ -25,7 +25,7 @@ Using Artemis dist: ../artemis-distribution/target/apache-artemis-2.17.0-SNAPSHO
Clean up the ../artemis-distribution/target/apache-artemis-2.17.0-SNAPSHOT-bin/apache-artemis-2.17.0-SNAPSHOT/docker directory
Docker file support files at : ../artemis-distribution/target/apache-artemis-2.17.0-SNAPSHOT-bin/apache-artemis-2.17.0-SNAPSHOT/docker
../artemis-distribution/target/apache-artemis-2.17.0-SNAPSHOT-bin/apache-artemis-2.17.0-SNAPSHOT/docker
-├── Dockerfile-adoptopenjdk-11
+├── Dockerfile-eclipse-temurin-11
├── Dockerfile-centos
├── Dockerfile-debian
└── docker-run.sh
@@ -46,9 +46,9 @@ Building the Docker Image:
$ docker build -f ./docker/Dockerfile-centos -t artemis-centos .
# For AdoptOpen JDK 11
- $ docker build -f ./docker/Dockerfile-adoptopenjdk-11 -t artemis-adoptopenjdk-11 .
+ $ docker build -f ./docker/Dockerfile-eclipse-temurin-11 -t artemis-eclipse-temurin-11 .
-Note: -t artemis-debian, -t artemis-centos and artemis-adoptopenjdk-11 are just
+Note: -t artemis-debian, -t artemis-centos and artemis-eclipse-temurin-11 are just
tag names for the purpose of this guide
For more info read the readme.md
@@ -75,7 +75,7 @@ Removing _TMP_/artemis/2.16.0/apache-artemis-2.16.0-bin.tar.gz...
Using Artemis dist: _TMP_/artemis/2.16.0
Docker file support files at : _TMP_/artemis/2.16.0/docker
_TMP_/artemis/2.16.0/docker
-├── Dockerfile-adoptopenjdk-11
+├── Dockerfile-eclipse-temurin-11
├── Dockerfile-centos
├── Dockerfile-debian
└── docker-run.sh
@@ -96,9 +96,9 @@ Building the Docker Image:
$ docker build -f ./docker/Dockerfile-centos -t artemis-centos .
# For AdoptOpen JDK 11
- $ docker build -f ./docker/Dockerfile-adoptopenjdk-11 -t artemis-adoptopenjdk-11 .
+ $ docker build -f ./docker/Dockerfile-eclipse-temurin-11 -t artemis-eclipse-temurin-11 .
-Note: -t artemis-debian, -t artemis-centos and artemis-adoptopenjdk-11 are just
+Note: -t artemis-debian, -t artemis-centos and artemis-eclipse-temurin-11 are just
tag names for the purpose of this guide
For more info read the readme.md
@@ -125,16 +125,16 @@ $ docker build -f ./docker/Dockerfile-centos -t artemis-centos .
## For AdoptOpen JDK 11
From within the `$ARTEMIS_DIST` folder:
```
-$ docker build -f ./docker/Dockerfile-adoptopenjdk-11 -t artemis-adoptopenjdk-11 .
+$ docker build -f ./docker/Dockerfile-eclipse-temurin-11 -t artemis-eclipse-temurin-11 .
```
# For AdoptOpen JDK 11 (Build for linux ARMv7/ARM64)
```
-$ docker buildx build --platform linux/arm64,linux/arm/v7 --push -t {your-repository}/apache-artemis:2.17.0-SNAPSHOT -f ./docker/Dockerfile-adoptopenjdk-11 .
+$ docker buildx build --platform linux/arm64,linux/arm/v7 --push -t {your-repository}/apache-artemis:2.17.0-SNAPSHOT -f ./docker/Dockerfile-eclipse-temurin-11 .
```
**Note:**
-`-t artemis-debian`,`-t artemis-centos`,`artemis-adoptopenjdk-11` are just tag
+`-t artemis-debian`,`-t artemis-centos`,`artemis-eclipse-temurin-11` are just tag
names for the purpose of this guide