From 22d757f0f29ab4b2842216bc11b56b25e38b76d3 Mon Sep 17 00:00:00 2001
From: Robert Kaussow <mail@thegeeklab.de>
Date: Wed, 15 Nov 2023 09:15:36 +0100
Subject: [PATCH] fix: rename deprecated regexManagers and fix containerfiles
 (#5)

---
 ansible.json    |  3 ++-
 base.json       |  4 +++-
 docker.json     | 10 +++++++---
 kubernetes.json |  5 ++++-
 4 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/ansible.json b/ansible.json
index 4f84e0c..3527742 100644
--- a/ansible.json
+++ b/ansible.json
@@ -2,8 +2,9 @@
   "$schema": "https://docs.renovatebot.com/renovate-schema.json",
   "description": ["Preset for use with ansible repositories"],
   "extends": ["github>thegeeklab/renovate-presets:base"],
-  "regexManagers": [
+  "customManagers": [
     {
+      "customType": "regex",
       "fileMatch": [
         "^(ansible/)?(group_vars|services)/.*?$",
         "^(ansible/)?inventory/group_vars/.*?$"
diff --git a/base.json b/base.json
index 23ae434..dba6332 100644
--- a/base.json
+++ b/base.json
@@ -32,14 +32,16 @@
       "extends": ["schedule:weekly"]
     }
   ],
-  "regexManagers": [
+  "customManagers": [
     {
+      "customType": "regex",
       "fileMatch": ["^Makefile$"],
       "matchStrings": [
         "# renovate: datasource=(?<datasource>\\S+) depName=(?<depName>\\S+)( registryUrl=(?<registryUrl>.*?))?( versioning=(?<versioning>.*?))?\\n.*?_VERSION (:|\\?)= (?<currentValue>.*)\\s"
       ]
     },
     {
+      "customType": "regex",
       "fileMatch": [".drone.env"],
       "matchStrings": [
         "# renovate: datasource=(?<datasource>\\S+) depName=(?<depName>\\S+)( registryUrl=(?<registryUrl>.*?))?( versioning=(?<versioning>.*?))?\\nexport .*?_VERSION=\"\\${.*:-(?<currentValue>.*)}\"\\s"
diff --git a/docker.json b/docker.json
index 07a1e11..ac8bd79 100644
--- a/docker.json
+++ b/docker.json
@@ -25,7 +25,7 @@
       "description": "Helper tools for docker base images",
       "groupName": "docker helper tools",
       "matchDatasources": ["github-releases"],
-      "matchFileNames": ["Dockerfile*", "docker/Dockerfile*"],
+      "matchManagers": ["dockerfile"],
       "matchPackagePatterns": ["^hairyhenderson", "^aptible", "^thegeeklab"],
       "matchUpdateTypes": ["minor", "patch"],
       "automerge": true
@@ -36,9 +36,13 @@
       "pinDigests": false
     }
   ],
-  "regexManagers": [
+  "customManagers": [
     {
-      "fileMatch": ["Dockerfile"],
+      "customType": "regex",
+      "fileMatch": [
+        "(^|/|\\.)([Dd]ocker|[Cc]ontainer)file$",
+        "(^|/)([Dd]ocker|[Cc]ontainer)file[^/]*$"
+      ],
       "matchStrings": [
         "# renovate: datasource=(?<datasource>\\S+) depName=(?<depName>\\S+)( versioning=(?<versioning>.*?))?\\nENV .*?_VERSION=\"\\${.*:-(?<currentValue>.*)}\"\\s"
       ]
diff --git a/kubernetes.json b/kubernetes.json
index c7dff1a..c1c9673 100644
--- a/kubernetes.json
+++ b/kubernetes.json
@@ -38,8 +38,9 @@
       "enabled": false
     }
   ],
-  "regexManagers": [
+  "customManagers": [
     {
+      "customType": "regex",
       "fileMatch": [
         "^flux/(?:.+/)overlays/(?:.+/)patches/(?:postgresCluster)\\.ya?ml$"
       ],
@@ -49,6 +50,7 @@
       "datasourceTemplate": "docker"
     },
     {
+      "customType": "regex",
       "fileMatch": ["^flux/(?:.+/)overlays/(?:.+/)(?:configmap)\\.ya?ml$"],
       "matchStrings": [
         ".+(?:_IMAGE):\\s+\"?'?(?<depName>[^:\\s]+):(?<currentValue>[^\"'@\\s]+)(?:@(?<currentDigest>sha256:[a-f0-9]+))?\"?'?"
@@ -56,6 +58,7 @@
       "datasourceTemplate": "docker"
     },
     {
+      "customType": "regex",
       "fileMatch": ["^flux/crds/.+\\.ya?ml$"],
       "matchStrings": [
         "# renovate: registryUrl=(?<registryUrl>.*?) chart=(?<depName>.*)\\s.+k8up-(?<currentValue>.*?)/.+"