UNCLASSIFIED

Skip to content

GitLab

You need to sign in or sign up before continuing.
Commit d0b2cea1 authored by Andy Maksymowicz's avatar Andy Maksymowicz
Browse files

Merge branch 'patch-1' into 'development' 

Patch 1

See merge request !8
parents 52038b97 788a32b1
Pipeline #36484 passed with stage
Hide whitespace changes
Inline Side-by-side
Showing with 13 additions and 13 deletions
Dockerfile
View file @ d0b2cea1
ARG BASE_REGISTRY=nexus-docker-secure.levelup-dev.io ARG BASE_REGISTRY=registry1.dsop.io
ARG BASE_IMAGE=redhat/openjdk/openjdk13 ARG BASE_IMAGE=ironbank/redhat/openjdk/openjdk13
ARG BASE_TAG=1.13.0 ARG BASE_TAG=1.13.0
FROM ${BASE_REGISTRY}/${BASE_IMAGE}:${BASE_TAG} FROM ${BASE_REGISTRY}/${BASE_IMAGE}:${BASE_TAG}
...@@ -7,22 +7,22 @@ FROM ${BASE_REGISTRY}/${BASE_IMAGE}:${BASE_TAG} ...@@ -7,22 +7,22 @@ FROM ${BASE_REGISTRY}/${BASE_IMAGE}:${BASE_TAG}
LABEL name="ActiveMQ" \ LABEL name="ActiveMQ" \
maintainer="bhearn@anchore.com" \ maintainer="bhearn@anchore.com" \
vendor="Apache" \ vendor="Apache" \
version="5.15.13" \ version="5.16.0" \
release="1" \ release="1" \
summary="Image of ActiveMQ" \ summary="Image of ActiveMQ" \
description="Apache ActiveMQ is an open source, multi-protocol, Java-based messaging server" description="Apache ActiveMQ is an open source, multi-protocol, Java-based messaging server"
COPY apache-activemq-5.15.13-bin.tar.gz / COPY apache-activemq-5.16.0-bin.tar.gz /
# root user is needed to extract files from the ActiveMQ gzip # root user is needed to extract files from the ActiveMQ gzip
USER root USER root
RUN dnf update -y && \ RUN dnf update -y && \
tar -zxf apache-activemq-5.15.13-bin.tar.gz && \ tar -zxf apache-activemq-5.16.0-bin.tar.gz && \
rm apache-activemq-5.15.13-bin.tar.gz && \ rm apache-activemq-5.16.0-bin.tar.gz && \
chmod 755 apache-activemq-5.15.13/bin/activemq && \ chmod 755 apache-activemq-5.16.0/bin/activemq && \
useradd -r activemq --uid=1000 && \ useradd -r activemq --uid=1000 && \
chown -R activemq:activemq apache-activemq-5.15.13 chown -R activemq:activemq apache-activemq-5.16.0
USER activemq USER activemq
...@@ -30,4 +30,4 @@ EXPOSE 8161 61616 5672 61613 1833 ...@@ -30,4 +30,4 @@ EXPOSE 8161 61616 5672 61613 1833
HEALTHCHECK CMD curl localhost:8161 HEALTHCHECK CMD curl localhost:8161
CMD ["apache-activemq-5.15.13/bin/activemq", " start"] CMD ["apache-activemq-5.16.0/bin/activemq", " start"]
\ No newline at end of file \ No newline at end of file
Jenkinsfile
View file @ d0b2cea1
@Library('DCCSCR@master') _ @Library('DCCSCR@master') _
dccscrPipeline(version: "5.15.13") dccscrPipeline(version: "5.16.0")
\ No newline at end of file \ No newline at end of file
download.yaml
View file @ d0b2cea1
--- ---
resources: resources:
- url: "https://downloads.apache.org/activemq/5.15.13/apache-activemq-5.15.13-bin.tar.gz" - url: "https://downloads.apache.org/activemq/5.16.0/apache-activemq-5.16.0-bin.tar.gz"
filename: "apache-activemq-5.15.13-bin.tar.gz" filename: "apache-activemq-5.16.0-bin.tar.gz"
validation: validation:
type: "sha512" type: "sha512"
value: "4a237fe2d3cdfbc1b5b45c92a5aab0d009acbfe5383c188b9691100e2e47de0548a1c24e0d8382a88c4600cd2b8792ce75e9be7d88de55f86b0bde7c9a92c285" value: "999928176e57b0805e8a53834e7f4eb648baf271a0c60de31ebd95fa63f2b089aa41c2ef7353790835e2e8cc39c4b778f535b38e6dc0c67a79c3c1da335c4a0a"
\ No newline at end of file \ No newline at end of file
  • jenkins-gitlab @jenkins-gitlab ·

    Pipeline Status: SUCCESS
    Branch: development

    graph LR
  0([setup]):::INTERNAL_SUCCESS --> 3([Import Artifacts]):::SUCCESS --> 4((/)):::INTERNAL_SUCCESS --> 5([Stage Artifacts]):::SUCCESS --> 6((/)):::INTERNAL_SUCCESS --> 7([Build]):::SUCCESS --> 8([Publish, Scan & Report]):::INTERNAL_NOT_BUILT

classDef SUCCESS font-size:10px
classDef FAILURE fill:#f44, font-size:10px
classDef SKIPPED font-size:10px
classDef ABORTED fill:#889, font-size:10px
classDef INTERNAL_SUCCESS font-size:10px, stroke-dasharray: 2, 1
classDef INTERNAL_FAILURE fill:#f44, font-size:10px, stroke-dasharray: 2, 1
classDef INTERNAL_SKIPPED font-size:10px, stroke-dasharray: 2, 1
classDef INTERNAL_ABORTED fill:#889, font-size:10px, stroke-dasharray: 2, 1
  • jenkins-gitlab @jenkins-gitlab ·

    Pipeline Status: SUCCESS
    Branch: development

    graph LR
  0([setup]):::INTERNAL_SUCCESS --> 3([Import Artifacts]):::SUCCESS --> 4((/)):::INTERNAL_SUCCESS --> 5([Stage Artifacts]):::SUCCESS --> 6((/)):::INTERNAL_SUCCESS --> 7([Build]):::SUCCESS --> 8([Publish, Scan & Report]):::INTERNAL_NOT_BUILT

classDef SUCCESS font-size:10px
classDef FAILURE fill:#f44, font-size:10px
classDef SKIPPED font-size:10px
classDef ABORTED fill:#889, font-size:10px
classDef INTERNAL_SUCCESS font-size:10px, stroke-dasharray: 2, 1
classDef INTERNAL_FAILURE fill:#f44, font-size:10px, stroke-dasharray: 2, 1
classDef INTERNAL_SKIPPED font-size:10px, stroke-dasharray: 2, 1
classDef INTERNAL_ABORTED fill:#889, font-size:10px, stroke-dasharray: 2, 1
  • jenkins-gitlab @jenkins-gitlab ·

    Pipeline Status: SUCCESS
    Branch: development

    graph LR
  0([setup]):::INTERNAL_SUCCESS --> 3([Import Artifacts]):::SUCCESS --> 4((/)):::INTERNAL_SUCCESS --> 5([Stage Artifacts]):::SUCCESS --> 6((/)):::INTERNAL_SUCCESS --> 7([Build]):::SUCCESS --> 8([Publish, Scan & Report]):::INTERNAL_NOT_BUILT

classDef SUCCESS font-size:10px
classDef FAILURE fill:#f44, font-size:10px
classDef SKIPPED font-size:10px
classDef ABORTED fill:#889, font-size:10px
classDef INTERNAL_SUCCESS font-size:10px, stroke-dasharray: 2, 1
classDef INTERNAL_FAILURE fill:#f44, font-size:10px, stroke-dasharray: 2, 1
classDef INTERNAL_SKIPPED font-size:10px, stroke-dasharray: 2, 1
classDef INTERNAL_ABORTED fill:#889, font-size:10px, stroke-dasharray: 2, 1
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment

UNCLASSIFIED