diff --git a/Dockerfile b/Dockerfile index 6a97b465128dff5af7105d8806d00e95264edce5..923017e0bf48cb961fea0b882c99c001f910205b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ 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 && \ diff --git a/hardening_manifest.yaml b/hardening_manifest.yaml index 7e6a5a96a575ea3866cd877bb0055a6346c07d70..f78d79ac8edee0fc2e139f330e311c6d4b589346 100644 --- a/hardening_manifest.yaml +++ b/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: "06dbfb7f29e56a98246519ed33a6119a1c01d363aecdb0d2cfd21c9f69dc4ebc" # 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: