Merge branch 'development' into 'master'

master: bump ubi See merge request !22

Merge branch 'development' into 'master'
master: bump ubi See merge request !22
1f854100 · Andy Maksymowicz · 57be0ec8 · 7599d8ed · 1f854100 · 1f854100
Commit 1f854100 authored May 24, 2021 by Andy Maksymowicz
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 6 deletions

Dockerfile Dockerfile +3 -5

hardening_manifest.yaml hardening_manifest.yaml +1 -1

No files found.
--- a/Dockerfile
+++ b/Dockerfile
-###############################################################
-# base registry variables
-ARG BASE_REGISTRY=nexus-docker-secure.levelup-dev.io
-ARG BASE_IMAGE=redhat/ubi/ubi8
-ARG BASE_TAG=8.2
+ARG BASE_REGISTRY=registry1.dso.mil
+ARG BASE_IMAGE=ironbank/redhat/ubi/ubi8
+ARG BASE_TAG=8.4

 # Updated by Renovate
 ARG version="1.5.10"

--- a/hardening_manifest.yaml
+++ b/hardening_manifest.yaml
@@ -14,7 +14,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: