From 4ad56b62be4e73bc6f747896210eecb3f80ac2c5 Mon Sep 17 00:00:00 2001
From: Zachary Sanders <sanders_zachary@bah.com>
Date: Thu, 6 May 2021 20:15:00 +0000
Subject: [PATCH 1/3] renovate-automerge

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

diff --git a/renovate.json b/renovate.json
index ec4f46a..f004124 100644
--- a/renovate.json
+++ b/renovate.json
@@ -5,17 +5,9 @@
   "baseBranches": [
     "development"
   ],
+  "automerge": true,
+  "gitLabAutomerge": true,
   "regexManagers": [
-    {
-      "fileMatch": [
-        "^Dockerfile$"
-      ],
-      "matchStrings": [
-        "version=\"(?<currentValue>.*?)\""
-      ],
-      "depNameTemplate": "goharbor/notary-signer-photon",
-      "datasourceTemplate": "docker"
-    },
     {
       "fileMatch": [
         "^hardening_manifest.yaml$"
@@ -37,4 +29,4 @@
       "datasourceTemplate": "docker"
     }
   ]
-}
\ No newline at end of file
+}
-- 
GitLab


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

---
 hardening_manifest.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/hardening_manifest.yaml b/hardening_manifest.yaml
index 5659adb..e7667de 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


From 972fece37ccbfa1d4270753312b34e5326475e4d Mon Sep 17 00:00:00 2001
From: "sean.melissari" <melissari_sean@bah.com>
Date: Thu, 20 May 2021 17:08:06 +0000
Subject: [PATCH 3/3] Update Dockerfile

---
 Dockerfile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index c73463b..68dd36b 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,6 +1,6 @@
-ARG BASE_REGISTRY=registry1.dsop.io
+ARG BASE_REGISTRY=registry1.dso.mil
 ARG BASE_IMAGE=ironbank/redhat/ubi/ubi8
-ARG BASE_TAG=8.2
+ARG BASE_TAG=8.4
 
 FROM goharbor/notary-signer-photon:v2.2.1 as base
 
-- 
GitLab