Merge branch 'development' into 'master'

Update master branch with changes in development branch

See merge request !8

Dockerfile

 ARG BASE_REGISTRY=registry1.dso.mil
 ARG BASE_IMAGE=ironbank/redhat/ubi/ubi8
-ARG BASE_TAG=8.3
+ARG BASE_TAG=8.4
 
 FROM ${BASE_REGISTRY}/${BASE_IMAGE}:${BASE_TAG}
 
-ARG VERSION=1.0.0.1
+ARG VERSION=1.0.0.2
 
 ARG USERNAME=alpha
 ARG GROUPNAME=alpha
@@ -24,14 +24,14 @@ COPY --chown=1000:1000  \
   LICENSE \
   README.md \
   hpac.tar.gz \
-  hpac_dependencies.tar.gz \
+  hpac_dependencies_v2.tar.gz \
   ./
 
 RUN yum install -y python3.8 && \
     yum clean all && \
     rm -rf /var/cache/dnf && \
     mv /hpac.tar.gz /app/hpac.tar.gz && \
-    mv hpac_dependencies.tar.gz /app/ && \
+    mv hpac_dependencies_v2.tar.gz /app/ && \
     mv LICENSE /app/ && \
     mv README.md /app/ && \
     tar -zxf /app/hpac.tar.gz --directory /app/ && \
@@ -41,10 +41,10 @@ RUN yum install -y python3.8 && \
 
 USER $UID:$GID
 
-RUN tar -zxf ./app/hpac_dependencies.tar.gz --directory ./app/dependencies && \
+RUN tar -zxf ./app/hpac_dependencies_v2.tar.gz --directory ./app/dependencies && \
     python3 -m pip install --user --no-warn-script-location --no-index --find-links ./app/dependencies -r ./app/dependencies/requirements.txt && \
     rm -rf /dependencies && \
-    rm /app/hpac_dependencies.tar.gz
+    rm /app/hpac_dependencies_v2.tar.gz
 
 WORKDIR /app
 

hardening_manifest.yaml

@@ -8,13 +8,13 @@ name: "peaxy/hpac-em"
 # The most specific version should be the first tag and will be shown
 # on ironbank.dsop.io
 tags:
-  - "1.0.0.1"
+  - "1.0.0.2"
   - "latest"
 
 # Build args passed to Dockerfile ARGs
 args:
   BASE_IMAGE: "redhat/ubi/ubi8"
-  BASE_TAG: "8.3"
+  BASE_TAG: "8.4"
 
 # Docker image labels
 labels:
@@ -27,7 +27,7 @@ labels:
   org.opencontainers.image.url: "https://peaxy.net/"
   ## Name of the distributing entity, organization or individual
   org.opencontainers.image.vendor: "Peaxy, Inc"
-  org.opencontainers.image.version: "1.0.0.1"
+  org.opencontainers.image.version: "1.0.0.2"
   ## Keywords to help with search (ex. "cicd,gitops,golang")
   # mil.dso.ironbank.image.keywords: "user management"
   ## This value can be "opensource" or "commercial"
@@ -45,11 +45,11 @@ resources:
     auth:
       id: peaxy-credential
       region: us-east-1
-  - filename: hpac_dependencies.tar.gz
-    url: s3://peaxy-core/hpac-em/hpac_dependencies.tar.gz
+  - filename: hpac_dependencies_v2.tar.gz
+    url: s3://peaxy-core/hpac-em/hpac_dependencies_v2.tar.gz
     validation:
       type: sha256
-      value: 173f06599f0cd6f2f33bb72e5455a5f19ec7f3494fe54aeec4870e43fec79096
+      value: 800cda6b1a6b3a55e5ef8f4d78a17ce265b73c14420b84d015ce505da3c60f46
     auth:
       id: peaxy-credential
       region: us-east-1
@@ -65,7 +65,3 @@ maintainers:
   - name: "Joshua Ghallagher"
     username: "JGhallagher"
     email: "JGhallagher@peaxy.net"
-  - name: "Jeff Weatherford"
-    username: "jweatherford"
-    email: "jweatherford@oteemo.com"
-    cht_member: true