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] 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