Merge pull request #73 from tyzbit/renovate/dockerfile-deps

kairos-io · Jul 3, 2024 · a770e56 · a770e56
2 parents 644202c + a904a05
commit a770e56
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 22 deletions.
diff --git a/flux/Dockerfile b/flux/Dockerfile
@@ -1,8 +1,9 @@
 FROM alpine as build
-ENV VERSION=2.1.2
+# renovate: datasource=github-releases depName=fluxcd/flux2 extractVersionTemplate=^v(?<version>.*)$
+ENV VERSION=v2.1.2
 ENV CHECKSUM=61b360b50d6cfc34410730b1cebeb75f5eda2b484e47b9a083412f51ad56de68
 
-ADD https://github.com/fluxcd/flux2/releases/download/v${VERSION}/flux_${VERSION}_linux_amd64.tar.gz /tmp
+ADD https://github.com/fluxcd/flux2/releases/download/v${VERSION}/flux_${VERSION#v}_linux_amd64.tar.gz /tmp
 RUN DOWNLOAD_FILE="/tmp/flux_${VERSION}_linux_amd64.tar.gz" && \
     DOWNLOAD_CHECKSUM=$(sha256sum "${DOWNLOAD_FILE}" | awk '{print $1}') && \
     if [[ ${DOWNLOAD_CHECKSUM} != ${CHECKSUM} ]]; then \

diff --git a/renovate.json b/renovate.json
@@ -1,8 +1,6 @@
 {
   "$schema": "https://docs.renovatebot.com/renovate-schema.json",
-  "extends": [
-    "config:base"
-  ],
+  "extends": ["config:base"],
   "schedule": [
     "after 11pm every weekday",
     "before 7am every weekday",
@@ -17,40 +15,29 @@
   ],
   "regexManagers": [
     {
-      "fileMatch": [
-        "^Earthfile$",
-        "/Dockerfile$"
-      ],
+      "fileMatch": ["^Earthfile$", "/Dockerfile$"],
       "matchStrings": [
-        "#\\s*renovate:\\s*datasource=(?<datasource>.*?)\\s+depName=(?<depName>.*?)(\\s+versioning=(?<versioning>.*?))?(\\s+extractVersion=(?<extractVersion>.*?))?\\sARG\\s+.+_VERSION=(?<currentValue>.*?)\\s"
+        "#\\s*renovate:\\s*datasource=(?<datasource>[^\\s]+)\\s+depName=(?<depName>[^\\s]+)(\\s+versioning=(?<versioning>[^\\s]+))?(\\s+extractVersion=(?<extractVersion>[^\\n]+))?(\\s+extractVersionTemplate=(?<extractVersionTemplate>[^\\n]+))?\\n(ARG|ENV)\\s+([^\\s]+)?VERSION=(?<currentValue>[^\\n]+)(\\n(ARG|ENV)\\s+([^\\s]+)?CHECKSUM=(?<currentDigest>[a-f0-9]+))?"
       ],
       "versioningTemplate": "{{#if versioning}}{{versioning}}{{else}}semver{{/if}}"
     },
     {
-      "fileMatch": [
-        "^earthly\\.(sh|ps1)$"
-      ],
+      "fileMatch": ["^earthly\\.(sh|ps1)$"],
       "datasourceTemplate": "docker",
       "depNameTemplate": "earthly/earthly",
-      "matchStrings": [
-        "earthly\\/earthly:(?<currentValue>.*?)\\s"
-      ],
+      "matchStrings": ["earthly\\/earthly:(?<currentValue>.*?)\\s"],
       "versioningTemplate": "semver-coerced"
     },
     {
       "datasourceTemplate": "helm",
-      "fileMatch": [
-        "^.+/run\\.sh$"
-      ],
+      "fileMatch": ["^.+/run\\.sh$"],
       "matchStrings": [
         "#\\s*renovate:\\s*depName=(?<depName>.*?)(\\s+repoUrl=(?<registryUrl>.*?))?\\s([A-Z0-9_]*)VERSION=\"(?<currentValue>.*?)\"\\s"
       ]
     },
     {
       "datasourceTemplate": "helm",
-      "fileMatch": [
-        "^tests/.+_test\\.go$"
-      ],
+      "fileMatch": ["^tests/.+_test\\.go$"],
       "matchStrings": [
         "//\\s*renovate:\\s*depName=(?<depName>.*?)(\\s+repoUrl=(?<registryUrl>.*?))?\\s+.*version: \\\"(?<currentValue>.*?)\\\"\""
       ]