You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by ro...@apache.org on 2024/08/28 15:05:53 UTC
(activemq-artemis) branch main updated: ARTEMIS-4906 CentOS 7 is EOL so remove Docker file
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 8a56d2ea33 ARTEMIS-4906 CentOS 7 is EOL so remove Docker file
8a56d2ea33 is described below
commit 8a56d2ea337fe3ad0ef13498b7a9000bf386f893
Author: Justin Bertram <jb...@apache.org>
AuthorDate: Mon Aug 26 20:39:29 2024 -0500
ARTEMIS-4906 CentOS 7 is EOL so remove Docker file
---
artemis-docker/Dockerfile-centos7-17 | 69 ----------------------
artemis-docker/prepare-docker.sh | 5 +-
tests/e2e-tests/pom.xml | 2 +-
.../e2e/brokerConnection/QpidDispatchPeerTest.java | 4 +-
.../e2e/brokerConnection/ValidateContainer.java | 4 +-
5 files changed, 6 insertions(+), 78 deletions(-)
diff --git a/artemis-docker/Dockerfile-centos7-17 b/artemis-docker/Dockerfile-centos7-17
deleted file mode 100644
index 7d2fc35418..0000000000
--- a/artemis-docker/Dockerfile-centos7-17
+++ /dev/null
@@ -1,69 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-
-# ActiveMQ Artemis
-
-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"]
-WORKDIR /opt
-
-ENV ARTEMIS_USER artemis
-ENV ARTEMIS_PASSWORD artemis
-ENV ANONYMOUS_LOGIN false
-ENV EXTRA_ARGS --http-host 0.0.0.0 --relax-jolokia
-
-USER root
-
-# add user and group for artemis
-RUN groupadd -g 1001 -r artemis && useradd -r -u 1001 -g artemis artemis \
- && yum install -y libaio && yum -y clean all
-
-USER artemis
-
-ADD . /opt/activemq-artemis
-
-# Web Server
-EXPOSE 8161 \
-# JMX Exporter
- 9404 \
-# Port for CORE,MQTT,AMQP,HORNETQ,STOMP,OPENWIRE
- 61616 \
-# Port for HORNETQ,STOMP
- 5445 \
-# Port for AMQP
- 5672 \
-# Port for MQTT
- 1883 \
-#Port for STOMP
- 61613
-
-USER root
-
-RUN mkdir /var/lib/artemis-instance && chown -R artemis.artemis /var/lib/artemis-instance
-
-COPY ./docker/docker-run.sh /
-
-USER artemis
-
-# Expose some outstanding folders
-VOLUME ["/var/lib/artemis-instance"]
-WORKDIR /var/lib/artemis-instance
-
-ENTRYPOINT ["/docker-run.sh"]
-CMD ["run"]
diff --git a/artemis-docker/prepare-docker.sh b/artemis-docker/prepare-docker.sh
index 2b3eaf01e0..40aefa8b77 100755
--- a/artemis-docker/prepare-docker.sh
+++ b/artemis-docker/prepare-docker.sh
@@ -53,9 +53,6 @@ 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 17
- $ docker build -f ./docker/Dockerfile-centos7-17 -t artemis-centos .
-
# For Ubuntu with full JDK 21
$ docker build -f ./docker/Dockerfile-ubuntu-21 -t artemis-ubuntu .
@@ -71,7 +68,7 @@ Well done! Now you can continue with building the Docker image:
# 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
+Note: -t artemis-alpine and -t artemis-ubuntu are just tag names for the purpose of this guide
For more info see readme.md
diff --git a/tests/e2e-tests/pom.xml b/tests/e2e-tests/pom.xml
index 732fc46beb..89cc234db8 100644
--- a/tests/e2e-tests/pom.xml
+++ b/tests/e2e-tests/pom.xml
@@ -30,7 +30,7 @@
<properties>
<activemq.basedir>${project.basedir}/../..</activemq.basedir>
<e2e-tests.surefire-extra-args />
- <e2e-tests.dockerfile>Dockerfile-centos7-11</e2e-tests.dockerfile>
+ <e2e-tests.dockerfile>Dockerfile-alpine-21</e2e-tests.dockerfile>
<distributionDir>${activemq.basedir}/artemis-distribution/target/apache-artemis-${project.version}-bin/apache-artemis-${project.version}</distributionDir>
<container-service-argline>-DContainerService.artemis-image.version=${project.version} -DContainerService.artemis-image.userid="1000"</container-service-argline>
</properties>
diff --git a/tests/e2e-tests/src/test/java/org/apache/activemq/artemis/tests/e2e/brokerConnection/QpidDispatchPeerTest.java b/tests/e2e-tests/src/test/java/org/apache/activemq/artemis/tests/e2e/brokerConnection/QpidDispatchPeerTest.java
index 6cbf515e4f..f78cd6ee36 100644
--- a/tests/e2e-tests/src/test/java/org/apache/activemq/artemis/tests/e2e/brokerConnection/QpidDispatchPeerTest.java
+++ b/tests/e2e-tests/src/test/java/org/apache/activemq/artemis/tests/e2e/brokerConnection/QpidDispatchPeerTest.java
@@ -38,8 +38,8 @@ import org.slf4j.LoggerFactory;
import java.lang.invoke.MethodHandles;
/**
- * You need to build the Artemis Centos image before this test is executed.
- * Follow the instructions under artemis-docker and build the Docker-centos image.
+ * You need to build the Artemis Docker image with 'mvn install -De2e-tests.skipImageBuild=false' before this test is
+ * executed.
*/
public class QpidDispatchPeerTest extends E2ETestBase {
diff --git a/tests/e2e-tests/src/test/java/org/apache/activemq/artemis/tests/e2e/brokerConnection/ValidateContainer.java b/tests/e2e-tests/src/test/java/org/apache/activemq/artemis/tests/e2e/brokerConnection/ValidateContainer.java
index e96cc69e23..4c4eb76921 100644
--- a/tests/e2e-tests/src/test/java/org/apache/activemq/artemis/tests/e2e/brokerConnection/ValidateContainer.java
+++ b/tests/e2e-tests/src/test/java/org/apache/activemq/artemis/tests/e2e/brokerConnection/ValidateContainer.java
@@ -22,7 +22,7 @@ import java.io.File;
import org.apache.activemq.artemis.tests.e2e.common.ContainerService;
-/** The purpose of this class is to validate if "artemis-centos" and docker (or an equivalent) is available on the environment.
+/** The purpose of this class is to validate if the container and Docker (or an equivalent) is available on the environment.
* Tests can use an assume to be ignored in case the image is not available.
* The test will also cache the result by creating a file target/org.apache.activemq.artemis.tests.smoke.brokerConnection.ValidateContainer.ok
* So, we won't keep redoing the check during development on an IDE. */
@@ -59,7 +59,7 @@ public class ValidateContainer {
/** assume clause to validate the Artemis Container and the Container provider are available */
public static void assumeArtemisContainer() {
- assumeTrue(hasContainer(), "Please build artemis.centos container image before running these tests");
+ assumeTrue(hasContainer(), "Please build the container using 'mvn install -De2e-tests.skipImageBuild=false' before running these tests");
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@activemq.apache.org
For additional commands, e-mail: commits-help@activemq.apache.org
For further information, visit: https://activemq.apache.org/contact