[camel] branch master updated: camel-test-infra-artemis: Apache Artemis container cleanups (#5061)

[da...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

davsclaus pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git


The following commit(s) were added to refs/heads/master by this push:
     new 18531c9  camel-test-infra-artemis: Apache Artemis container cleanups (#5061)
18531c9 is described below

commit 18531c9e0423add72f04e4162d0aa8ae377d626d
Author: Otavio Rodolfo Piske <or...@users.noreply.github.com>
AuthorDate: Tue Feb 9 17:18:03 2021 +0100

    camel-test-infra-artemis: Apache Artemis container cleanups (#5061)
    
    Includes:
            - updated container to use a newer Fedora version
            - reduce used disk space
            - removed deprecated elements
---
 .../apache/camel/test/infra/artemis/services/Dockerfile  | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/test-infra/camel-test-infra-artemis/src/test/resources/org/apache/camel/test/infra/artemis/services/Dockerfile b/test-infra/camel-test-infra-artemis/src/test/resources/org/apache/camel/test/infra/artemis/services/Dockerfile
index 1cfd66e..f0b4a18 100644
--- a/test-infra/camel-test-infra-artemis/src/test/resources/org/apache/camel/test/infra/artemis/services/Dockerfile
+++ b/test-infra/camel-test-infra-artemis/src/test/resources/org/apache/camel/test/infra/artemis/services/Dockerfile
@@ -12,21 +12,23 @@
 #  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.
-FROM centos:8 as artemis-base
-MAINTAINER Otavio Rodolfo Piske <an...@gmail.com>
+FROM fedora:33 as artemis-base
+LABEL maintainer="orpiske@apache.org"
 ARG ARTEMIS_VERSION
 ENV ARTEMIS_VERSION ${ARTEMIS_VERSION:-2.7.0}
 ARG ARTEMIS_JOURNAL
 ENV ARTEMIS_JOURNAL ${ARTEMIS_JOURNAL:-aio}
 ENV JMS_BROKER_ROOT /opt/camel-kafka-connector/artemis/
 EXPOSE 1883 5672 8161 61616
-RUN dnf install -y java-1.8.0-openjdk-headless libaio tar gzip && dnf clean all
-ENV JAVA_HOME /etc/alternatives/jre
-RUN mkdir -p ${JMS_BROKER_ROOT}
-WORKDIR ${JMS_BROKER_ROOT}
-RUN curl https://archive.apache.org/dist/activemq/activemq-artemis/${ARTEMIS_VERSION}/apache-artemis-${ARTEMIS_VERSION}-bin.tar.gz -o apache-artemis.tar.gz && \
+RUN dnf install -y java-1.8.0-openjdk-headless libaio tar gzip && \
+    dnf clean all && \
+    mkdir -p ${JMS_BROKER_ROOT} && \
+    cd ${JMS_BROKER_ROOT} && \
+    curl https://archive.apache.org/dist/activemq/activemq-artemis/${ARTEMIS_VERSION}/apache-artemis-${ARTEMIS_VERSION}-bin.tar.gz -o apache-artemis.tar.gz && \
     mkdir -p apache-artemis && tar --strip-components=1 -xvf apache-artemis.tar.gz -C apache-artemis && \
     rm -f apache-artemis.tar.gz
+WORKDIR ${JMS_BROKER_ROOT}
+ENV JAVA_HOME /etc/alternatives/jre
 
 FROM artemis-base as artemis
 RUN ${JMS_BROKER_ROOT}/apache-artemis/bin/artemis create --${ARTEMIS_JOURNAL} --relax-jolokia --allow-anonymous --http-host 0.0.0.0 --user admin --password "admin" --role amq --data /artemis-storage ${JMS_BROKER_ROOT}/apache-artemis-instance