From e2fd0c86f71f1be23ff6b3bbd9362c83001ee5a7 Mon Sep 17 00:00:00 2001
From: Zachary Sanders <sanders_zachary@bah.com>
Date: Mon, 10 May 2021 20:56:51 +0000
Subject: [PATCH 1/2] renovate-automerge

---
 renovate.json | 14 +++-----------
 1 file changed, 3 insertions(+), 11 deletions(-)

diff --git a/renovate.json b/renovate.json
index 0dc249f..9e9e969 100644
--- a/renovate.json
+++ b/renovate.json
@@ -19,17 +19,9 @@
       }
     }
   ],
+  "automerge": true,
+  "gitLabAutomerge": true,
   "regexManagers": [
-    {
-      "fileMatch": [
-        "^Dockerfile$"
-      ],
-      "matchStrings": [
-        "version=\"(?<currentValue>.*?)\""
-      ],
-      "depNameTemplate": "istio/istioctl",
-      "datasourceTemplate": "docker"
-    },
     {
       "fileMatch": [
         "^hardening_manifest.yaml$"
@@ -51,4 +43,4 @@
       "datasourceTemplate": "docker"
     }
   ]
-}
\ No newline at end of file
+}
-- 
GitLab


From a89956aa7336ce85827ea92db2c6d722ab618893 Mon Sep 17 00:00:00 2001
From: "sean.melissari" <melissari_sean@bah.com>
Date: Thu, 20 May 2021 13:20:57 +0000
Subject: [PATCH 2/2] bump ubi

---
 Dockerfile              | 2 +-
 hardening_manifest.yaml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 43ec35b..f117cae 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,6 +1,6 @@
 ARG BASE_REGISTRY=registry1.dsop.io
 ARG BASE_IMAGE=ironbank/redhat/ubi/ubi8
-ARG BASE_TAG=8.3
+ARG BASE_TAG=8.4
 
 FROM istio/istioctl:1.7.8 AS base
 
diff --git a/hardening_manifest.yaml b/hardening_manifest.yaml
index de02229..019705c 100644
--- 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:
-- 
GitLab