From 62b0bdaac85420560c2c3c11ca117aaef3392194 Mon Sep 17 00:00:00 2001
From: Zachary Sanders <sanders_zachary@bah.com>
Date: Tue, 18 May 2021 17:35:48 +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 3a15d0a..70ad577 100644
--- a/renovate.json
+++ b/renovate.json
@@ -19,17 +19,9 @@
       }
     }
   ],
+  "automerge": true,
+  "gitLabAutomerge": true,
   "regexManagers": [
-    {
-      "fileMatch": [
-        "^Dockerfile$"
-      ],
-      "matchStrings": [
-        "version=\"(?<currentValue>.*?)\""
-      ],
-      "depNameTemplate": "minio/mc",
-      "datasourceTemplate": "docker"
-    },
     {
       "fileMatch": [
         "^hardening_manifest.yaml$"
@@ -51,4 +43,4 @@
       "datasourceTemplate": "docker"
     }
   ]
-}
\ No newline at end of file
+}
-- 
GitLab


From 49c9392dbab345ebe76a6955fa64a39e64322e19 Mon Sep 17 00:00:00 2001
From: "sean.melissari" <melissari_sean@bah.com>
Date: Thu, 20 May 2021 13:24:46 +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 0c73b73..f54588a 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 80eb650a8de14971f62c5e2d65f362f537f36f9b Mon Sep 17 00:00:00 2001
From: "sean.melissari" <melissari_sean@bah.com>
Date: Thu, 20 May 2021 19:04:43 +0000
Subject: [PATCH 3/3] Update Dockerfile

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

diff --git a/Dockerfile b/Dockerfile
index e7c07b6..f875824 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,12 +1,11 @@
-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=latest
 
 FROM minio/mc:RELEASE.2021-05-18T03-39-44Z as base
 
 FROM $BASE_REGISTRY/$BASE_IMAGE:$BASE_TAG
 
-
 RUN dnf update -y && \
     dnf clean all && \
     rm -rf /var/cache/dnf
-- 
GitLab