Merge branch 'development' into 'master'

Merge Development branch to Master branch See merge request !13

Merge branch 'development' into 'master'
Merge Development branch to Master branch See merge request !13
5fbaf89c · riveraj · 5bf9fe25 · 149e8834 · 5fbaf89c · 5fbaf89c
Commit 5fbaf89c authored Jun 21, 2021 by riveraj
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 3 deletions

Dockerfile Dockerfile +1 -1

hardening_manifest.yaml hardening_manifest.yaml +1 -2

No files found.
--- a/Dockerfile
+++ b/Dockerfile
@@ -3,7 +3,7 @@
 #
 ARG BASE_REGISTRY=registry1.dsop.io
 ARG BASE_IMAGE=redhat/ubi/ubi8
-ARG BASE_TAG=8.3
+ARG BASE_TAG=8.4

 FROM quay.io/mongodb/mongodb-enterprise-database-ubi:1.5.3 as official
 FROM ${BASE_REGISTRY}/${BASE_IMAGE}:${BASE_TAG}

--- 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:
@@ -54,4 +54,3 @@ maintainers:
  username: "alexander.klepal"
  cht_member: true

-