Merge branch 'development' into 'master'

Merge Development branch to Master branch See merge request !9

Merge branch 'development' into 'master'
Merge Development branch to Master branch See merge request !9
c102528e · riveraj · e53b095b · aeda6085 · c102528e · c102528e
Commit c102528e authored Jul 06, 2021 by riveraj
Show whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

Dockerfile Dockerfile +1 -1

hardening_manifest.yaml hardening_manifest.yaml +1 -1

No files found.
--- a/Dockerfile
+++ b/Dockerfile
 # Build the intermediate container
 ARG BASE_REGISTRY=registry1.dso.mil
 ARG BASE_IMAGE=ironbank/redhat/ubi/ubi8
-ARG BASE_TAG=8.3
+ARG BASE_TAG=8.4
 FROM kubeflow-images-public/admission-webhook:v20190520-v0-139-gcee39dbc-dirty-0d8f4c AS base
 FROM ${BASE_REGISTRY}/${BASE_IMAGE}:${BASE_TAG}
 RUN mkdir -p /app

--- a/hardening_manifest.yaml
+++ b/hardening_manifest.yaml
@@ -10,7 +10,7 @@ tags:
 # Build args passed to Dockerfile ARGs
 args:
  BASE_IMAGE: "redhat/ubi/ubi8"
-  BASE_TAG: "8.3"
+  BASE_TAG: "8.4"

 # Docker image labels
 labels: