Merge branch 'development' into 'master'

Merge Development into Master

See merge request !25

Dockerfile

 ARG BASE_REGISTRY=registry1.dso.mil
 ARG BASE_IMAGE=redhat/ubi/ubi8
-ARG BASE_TAG=8.3
+ARG BASE_TAG=8.4
 
 FROM ${BASE_REGISTRY}/${BASE_IMAGE}:${BASE_TAG}
 
@@ -39,6 +39,9 @@ RUN INSTALL_PKGS="vim-enhanced rsync iputils bind-utils git python36 python36-de
     rpm -V $INSTALL_PKGS && \
     yum -y clean all --enablerepo="*"
 
+# yum Updates
+RUN yum update -y
+
 # Install the OpenShift command line tool, oc
 COPY oc.tar.gz /tmp/oc.tar.gz
 RUN tar xvf /tmp/oc.tar.gz && \

hardening_manifest.yaml

@@ -7,14 +7,14 @@ name: "diat/aap-cli"
 # The most specific version should be the first tag and will be shown
 # on ironbank.dso.mil
 tags:
-- "4.0"
+- "14.1"
 - "latest"
 
 # Build args passed to Dockerfile ARGs
 args:
   BASE_REGISTRY: "registry1.dsop.io"
   BASE_IMAGE: "redhat/ubi/ubi8"
-  BASE_TAG: "8.3"
+  BASE_TAG: "8.4"
 
 # Docker image labels
 labels:
@@ -29,7 +29,7 @@ labels:
   # Name of the distributing entity, organization or individual
   org.opencontainers.image.vendor: "aap-cli"
   # Authoritative version of the software
-  org.opencontainers.image.version: "4.0"
+  org.opencontainers.image.version: "14.0"
   # Keywords to help with search (ex. "cicd,gitops,golang")
   mil.dso.ironbank.image.keywords: "aap,cli,aapcli,aap-cli,client,atlas,diat"
   # This value can be "opensource" or "commercial"
@@ -48,7 +48,7 @@ resources:
     filename: "oc.tar.gz" 
     validation:
       type: "sha256" # supported: sha256, sha512
-      value: "dd78939d5c8ce6990c8e3436610ce635381398b996aadf20f1e3ec4d5ca3968e" # must be lowercase
+      value: "19709565c53a496605c41faa410a6a73ccae4bfe91fbe66cf0a7d581a68aa706" # must be lowercase
   - url: "https://get.helm.sh/helm-v3.5.2-linux-amd64.tar.gz"
     filename: "helm-v3.5.2-linux-amd64.tar.gz" 
     validation: