From d1aecac05cae7b093b15055d22c6dc84d9aa131c Mon Sep 17 00:00:00 2001
From: Robert Clark <rbclark@mitre.org>
Date: Wed, 2 Jun 2021 07:21:10 -0400
Subject: [PATCH 1/5] Configure renovate.json to update base image

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

diff --git a/renovate.json b/renovate.json
index 21d0d6f..f2440f7 100644
--- a/renovate.json
+++ b/renovate.json
@@ -7,12 +7,12 @@
   ],
   "regexManagers": [{
       "fileMatch": [
-        "^Dockerfile$"
+        "^hardening_manifest.yaml$"
       ],
       "matchStrings": [
-        "version=\"(?<currentValue>.*?)\""
+        "BASE_TAG:\\s+\"(?<currentValue>.+?)\""
       ],
-      "depNameTemplate": "mitre/heimdall2",
+      "depNameTemplate": "registry1.dso.mil/ironbank/nodejs/nodejs14",
       "datasourceTemplate": "docker"
     },
     {
-- 
GitLab


From ea68ca5f1385ea536860cfe5e03311976fbb40b4 Mon Sep 17 00:00:00 2001
From: Robert Clark <rbclark@mitre.org>
Date: Wed, 2 Jun 2021 16:52:13 -0400
Subject: [PATCH 2/5] Automatically merge renovate PRs for this project

---
 renovate.json | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/renovate.json b/renovate.json
index f2440f7..1fcce89 100644
--- a/renovate.json
+++ b/renovate.json
@@ -5,6 +5,8 @@
   "baseBranches": [
     "development"
   ],
+  "automerge": true,
+  "gitLabAutomerge": true,
   "regexManagers": [{
       "fileMatch": [
         "^hardening_manifest.yaml$"
-- 
GitLab


From cdbc7c45bed49ed1b3cd48da435f328d30e02331 Mon Sep 17 00:00:00 2001
From: Robert Clark <rbclark@mitre.org>
Date: Thu, 3 Jun 2021 09:33:19 -0400
Subject: [PATCH 3/5] Simplify renovate.json, better reflect working
 renovate.json

Takes from https://repo1.dso.mil/dsop/container-hardening-tools/renovate/renovate renovate.json since it seems to be functioning properly at this time.
---
 renovate.json | 15 +++------------
 1 file changed, 3 insertions(+), 12 deletions(-)

diff --git a/renovate.json b/renovate.json
index 1fcce89..dc3d76c 100644
--- a/renovate.json
+++ b/renovate.json
@@ -12,19 +12,9 @@
         "^hardening_manifest.yaml$"
       ],
       "matchStrings": [
-        "BASE_TAG:\\s+\"(?<currentValue>.+?)\""
+        "BASE_TAG:\\s+\"(?<currentValue>.*?)\""
       ],
-      "depNameTemplate": "registry1.dso.mil/ironbank/nodejs/nodejs14",
-      "datasourceTemplate": "docker"
-    },
-    {
-      "fileMatch": [
-        "^hardening_manifest.yaml$"
-      ],
-      "matchStrings": [
-        "org\\.opencontainers\\.image\\.version:\\s+\"(?<currentValue>.+?)\""
-      ],
-      "depNameTemplate": "mitre/heimdall2",
+      "depNameTemplate": "registry1.dso.mil/ironbank/opensource/nodejs/nodejs14",
       "datasourceTemplate": "docker"
     },
     {
@@ -32,6 +22,7 @@
         "^hardening_manifest.yaml$"
       ],
       "matchStrings": [
+        "org\\.opencontainers\\.image\\.version:\\s+\"(?<currentValue>.+?)\"",
         "tags:\\s+-\\s+\"(?<currentValue>.+?)\""
       ],
       "depNameTemplate": "mitre/heimdall2",
-- 
GitLab


From 4294eb85167460c5b5ead31fa559a45aa35c9213 Mon Sep 17 00:00:00 2001
From: renovate <renovate@support.dsop.io>
Date: Thu, 24 Jun 2021 18:30:39 +0000
Subject: [PATCH 4/5] Update
 registry1.dso.mil/ironbank/opensource/nodejs/nodejs14 Docker tag to v14.17.1

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

diff --git a/hardening_manifest.yaml b/hardening_manifest.yaml
index 7df996a..7405a2d 100644
--- a/hardening_manifest.yaml
+++ b/hardening_manifest.yaml
@@ -14,7 +14,7 @@ tags:
 # Build args passed to Dockerfile ARGs
 args:
   BASE_IMAGE: "opensource/nodejs/nodejs14"
-  BASE_TAG: "14.17.0"
+  BASE_TAG: "14.17.1"
 
 # Docker image labels
 labels:
-- 
GitLab


From 6c9c6b97677666af0219ff35eb730e3763dc42c0 Mon Sep 17 00:00:00 2001
From: renovate <renovate@support.dsop.io>
Date: Sat, 10 Jul 2021 01:04:10 +0000
Subject: [PATCH 5/5] Update
 registry1.dso.mil/ironbank/opensource/nodejs/nodejs14 Docker tag to v14.17.3

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

diff --git a/hardening_manifest.yaml b/hardening_manifest.yaml
index 7405a2d..eddb46a 100644
--- a/hardening_manifest.yaml
+++ b/hardening_manifest.yaml
@@ -14,7 +14,7 @@ tags:
 # Build args passed to Dockerfile ARGs
 args:
   BASE_IMAGE: "opensource/nodejs/nodejs14"
-  BASE_TAG: "14.17.1"
+  BASE_TAG: "14.17.3"
 
 # Docker image labels
 labels:
-- 
GitLab