Merge branch 'development' into 'master'

Development

See merge request !14

Dockerfile

@@ -4,25 +4,19 @@ ARG BASE_TAG=1.13.0
 
 FROM ${BASE_REGISTRY}/${BASE_IMAGE}:${BASE_TAG}
 
-LABEL name="ActiveMQ" \
-      maintainer="bhearn@anchore.com" \
-      vendor="Apache" \
-      version="5.16.0" \
-      release="1" \
-      summary="Image of ActiveMQ" \
-      description="Apache ActiveMQ is an open source, multi-protocol, Java-based messaging server"
+COPY apache-activemq-bin.tar.gz /
 
-COPY apache-activemq-5.16.0-bin.tar.gz /
-
-# root user is needed to extract files from the ActiveMQ gzip
 USER root
 
-RUN dnf update -y && \
-    tar -zxf apache-activemq-5.16.0-bin.tar.gz && \
-    rm apache-activemq-5.16.0-bin.tar.gz && \
-    chmod 755 apache-activemq-5.16.0/bin/activemq && \
+RUN dnf upgrade -y && \
+    dnf clean all && \
+    rm -rf /var/cache/dnf && \
+    mkdir -p apache-activemq && \
+    tar -zxf apache-activemq-bin.tar.gz --strip-components=1 -C apache-activemq && \
+    rm apache-activemq-bin.tar.gz && \
+    chmod 755 apache-activemq/bin/activemq && \
     useradd -r activemq --uid=1000 && \
-    chown -R activemq:activemq apache-activemq-5.16.0
+    chown -R activemq:activemq apache-activemq
 
 USER activemq
 
@@ -30,4 +24,4 @@ EXPOSE 8161 61616 5672 61613 1833
 
 HEALTHCHECK CMD curl localhost:8161
 
-CMD ["apache-activemq-5.16.0/bin/activemq", " start"]
\ No newline at end of file
+CMD ["apache-activemq/bin/activemq", " start"]
\ No newline at end of file

Jenkinsfile

-@Library('DCCSCR@master') _
-dccscrPipeline(version: "5.16.0")
\ No newline at end of file

README.md

@@ -3,13 +3,11 @@
 
 # ActiveMQ
 
-Version: 5.15.13
-
 Apache ActiveMQ is an open source, multi-protocol, Java-based messaging server.
 
 ## Download from Iron Bank
 
-1. Go to the [Apache webpage](https://ironbank.dsop.io/ironbank/repomap/opensource/apache) in Iron Bank and download the latest ActiveMQ tarball.
+1. Go to the [Apache webpage](https://ironbank.dso.mil/ironbank/repomap/opensource/apache) in Iron Bank and download the latest ActiveMQ tarball.
 
 2. Navigate to the location of the download and run:
 ```
@@ -53,5 +51,4 @@ You should now be able to navigate to the ActiveMQ dashboard URL and login using
 
 ## Notes
 
-- root user is needed to extract files from the ActiveMQ gzip
 - exposed ports: 8161, 61616, 5672, 61613, and 1833
\ No newline at end of file

deployment/activemq-deployment.yaml

@@ -27,7 +27,7 @@ spec:
               cpu: 400m
           volumeMounts:
           - name: active-creds
-            mountPath: /apache-activemq-5.15.13/conf/jetty-realm.properties # jetty-realm.properties MUST be configured with proper values first in order to deploy
+            mountPath: /apache-activemq/conf/jetty-realm.properties # jetty-realm.properties MUST be configured with proper values first in order to deploy
             subPath: jetty-realm.properties
       volumes:
       - name: active-creds

download.yaml

----
-resources:
-  - url: "https://downloads.apache.org/activemq/5.16.0/apache-activemq-5.16.0-bin.tar.gz"
-    filename: "apache-activemq-5.16.0-bin.tar.gz"
-    validation:
-      type: "sha512"
-      value: "999928176e57b0805e8a53834e7f4eb648baf271a0c60de31ebd95fa63f2b089aa41c2ef7353790835e2e8cc39c4b778f535b38e6dc0c67a79c3c1da335c4a0a"
\ No newline at end of file

hardening_manifest.yaml

+---
+apiVersion: v1
+
+# The repository name in registry1, excluding /ironbank/
+name: "opensource/apache/activemq"
+
+# List of tags to push for the repository in registry1
+# The most specific version should be the first tag and will be shown
+# on ironbank.dsop.io
+tags:
+- "5.16.0"
+- "latest"
+
+# Build args passed to Dockerfile ARGs
+args:
+  BASE_IMAGE: "redhat/openjdk/openjdk13"
+  BASE_TAG: "1.13.0"
+
+# Docker image labels
+labels:
+  org.opencontainers.image.title: "activemq"
+  ## Human-readable description of the software packaged in the image
+  org.opencontainers.image.description: "Apache ActiveMQ is an open source, multi-protocol, Java-based messaging server."
+  ## License(s) under which contained software is distributed
+  org.opencontainers.image.licenses: "Apache"
+  ## URL to find more information on the image
+  org.opencontainers.image.url: "http://activemq.apache.org/components/classic/"
+  ## Name of the distributing entity, organization or individual
+  org.opencontainers.image.vendor: "Apache"
+  org.opencontainers.image.version: "5.16.0"
+  ## Keywords to help with search (ex. "cicd,gitops,golang")
+  # mil.dso.ironbank.image.keywords: "FIXME"
+  ## This value can be "opensource" or "commercial"
+  mil.dso.ironbank.image.type: "opensource"
+  ## Product the image belongs to for grouping multiple images
+  mil.dso.ironbank.product.name: "opensource/apache"
+
+# List of resources to make available to the offline build context
+resources:
+- filename: apache-activemq-bin.tar.gz
+  url: https://downloads.apache.org/activemq/5.16.0/apache-activemq-5.16.0-bin.tar.gz
+  validation:
+    type: sha512
+    value: 999928176e57b0805e8a53834e7f4eb648baf271a0c60de31ebd95fa63f2b089aa41c2ef7353790835e2e8cc39c4b778f535b38e6dc0c67a79c3c1da335c4a0a
+
+# List of project maintainers
+# FIXME: Fill in the following details for the current container owner in the whitelist
+# FIXME: Include any other vendor information if applicable
+maintainers:
+- email: "bhearn@anchore.com"
+  # The name of the current container owner
+  name: "Blake Hearn"
+  # The gitlab username of the current container owner
+  username: "bhearn"
+  cht_member: true # FIXME: Uncomment if the maintainer is a member of CHT
+# - name: "FIXME"
+#   username: "FIXME"
+#   email: "FIXME"