From 7bd8ec225d61e46479a7fee79242d0834f925dbf Mon Sep 17 00:00:00 2001
From: ironbank-bot <ironbank-bot@dsop.io>
Date: Mon, 28 Jun 2021 12:51:32 +0000
Subject: [PATCH] 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.
---
 hardening_manifest.yaml |  2 +-
 renovate.json           | 17 +++++------------
 2 files changed, 6 insertions(+), 13 deletions(-)

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:
diff --git a/renovate.json b/renovate.json
index 21d0d6f..dc3d76c 100644
--- a/renovate.json
+++ b/renovate.json
@@ -5,24 +5,16 @@
   "baseBranches": [
     "development"
   ],
+  "automerge": true,
+  "gitLabAutomerge": true,
   "regexManagers": [{
-      "fileMatch": [
-        "^Dockerfile$"
-      ],
-      "matchStrings": [
-        "version=\"(?<currentValue>.*?)\""
-      ],
-      "depNameTemplate": "mitre/heimdall2",
-      "datasourceTemplate": "docker"
-    },
-    {
       "fileMatch": [
         "^hardening_manifest.yaml$"
       ],
       "matchStrings": [
-        "org\\.opencontainers\\.image\\.version:\\s+\"(?<currentValue>.+?)\""
+        "BASE_TAG:\\s+\"(?<currentValue>.*?)\""
       ],
-      "depNameTemplate": "mitre/heimdall2",
+      "depNameTemplate": "registry1.dso.mil/ironbank/opensource/nodejs/nodejs14",
       "datasourceTemplate": "docker"
     },
     {
@@ -30,6 +22,7 @@
         "^hardening_manifest.yaml$"
       ],
       "matchStrings": [
+        "org\\.opencontainers\\.image\\.version:\\s+\"(?<currentValue>.+?)\"",
         "tags:\\s+-\\s+\"(?<currentValue>.+?)\""
       ],
       "depNameTemplate": "mitre/heimdall2",
-- 
GitLab