From 4eb18251a4820f6be529498bdf1a1996fc652dfe Mon Sep 17 00:00:00 2001 From: Igor Rzegocki Date: Wed, 14 Aug 2024 19:00:15 +0200 Subject: [PATCH 1/6] WIP --- .github/renovate/customManagers.json5 | 5 ++--- apps/firefly-iii/metadata.json | 3 ++- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/renovate/customManagers.json5 b/.github/renovate/customManagers.json5 index d5782352..c2a302f0 100644 --- a/.github/renovate/customManagers.json5 +++ b/.github/renovate/customManagers.json5 @@ -10,9 +10,8 @@ "matchStrings": [ "(\"renovate::dataSource\":\\s*\"(?[^\"]+)\",)?\\s*(\"renovate::depName\":\\s*\"(?[^\"]+)\",)?\\s*(\"renovate::packageName\":\\s*\"(?[^\"]+)\",)?\\s*(\"renovate::versioning\":\\s*\"(?[^\"]+)\",)?\\s*\"version\":\\s*\"(?[^\"]+)\"" ], - "extractVersionTemplate": "^v?(?.*)$", "datasourceTemplate": "{{#if datasource}}{{{datasource}}}{{else}}docker{{/if}}", - "versioningTemplate": "{{#if versioning}}{{{versioning}}}{{else}}semver{{/if}}" + "versioningTemplate": "{{#if versioning}}{{{versioning}}}{{else}}semver-coerced{{/if}}" }, { "customType": "regex", "description": "Process renovate comments", @@ -23,7 +22,7 @@ "renovate:\\s*(datasource=(?[^\\s]+)\\s*)?(depName=(?[^\\s]+)\\s*)?(versioning=(?[^\\s]+)\\s*)?[^:]*:\\s*(?v?[0-9.]+)" ], "datasourceTemplate": "{{#if datasource}}{{{datasource}}}{{else}}docker{{/if}}", - "versioningTemplate": "{{#if versioning}}{{{versioning}}}{{else}}semver{{/if}}" + "versioningTemplate": "{{#if versioning}}{{{versioning}}}{{else}}semver-coerced{{/if}}" } ] } diff --git a/apps/firefly-iii/metadata.json b/apps/firefly-iii/metadata.json index 856d9d2f..e258dbde 100644 --- a/apps/firefly-iii/metadata.json +++ b/apps/firefly-iii/metadata.json @@ -7,7 +7,8 @@ "name": "stable", "renovate::dataSource": "docker", "renovate::depName": "fireflyiii/core", - "version": "6.0.30", + "renovate::versioning": "regex:^(?version-)(?\\d+)(\\.(?\\d+))?(\\.(?\\d+))?$", + "version": "version-6.0.30", "platforms": [ "linux/amd64", "linux/arm64" From 4eeaf790a230d157ed4680004a051fd3343c74ad Mon Sep 17 00:00:00 2001 From: Igor Rzegocki Date: Wed, 14 Aug 2024 19:19:19 +0200 Subject: [PATCH 2/6] WIP --- .github/renovate/customManagers.json5 | 13 ++++++++++++- apps/firefly-iii/metadata.json | 1 - apps/firefly-iii/metadata.yaml | 13 +++++++++++++ 3 files changed, 25 insertions(+), 2 deletions(-) create mode 100644 apps/firefly-iii/metadata.yaml diff --git a/.github/renovate/customManagers.json5 b/.github/renovate/customManagers.json5 index c2a302f0..2a94304e 100644 --- a/.github/renovate/customManagers.json5 +++ b/.github/renovate/customManagers.json5 @@ -3,7 +3,7 @@ "customManagers": [ { "customType": "regex", - "description": "Process metadata versions", + "description": "Process metadata.json versions", "fileMatch": [ "apps/.+/metadata\\.json$" ], @@ -12,6 +12,17 @@ ], "datasourceTemplate": "{{#if datasource}}{{{datasource}}}{{else}}docker{{/if}}", "versioningTemplate": "{{#if versioning}}{{{versioning}}}{{else}}semver-coerced{{/if}}" + }, { + "customType": "regex", + "description": "Process metadata.yaml versions", + "fileMatch": [ + "apps/.+/metadata\\.yaml$" + ], + "matchStrings": [ + "(renovate-dataSource:\\s*\"(?[^\"]+)\")?\\s*(renovate-depName:\\s*\"(?[^\"]+)\")?\\s*(renovate-packageName:\\s*\"(?[^\"]+)\")?\\s*(renovate-versioning:\\s*#(?[^#]+)#)?\\s*version: \"(?[^\"]+)\"" + ], + "datasourceTemplate": "{{#if datasource}}{{{datasource}}}{{else}}docker{{/if}}", + "versioningTemplate": "{{#if versioning}}{{{versioning}}}{{else}}semver-coerced{{/if}}" }, { "customType": "regex", "description": "Process renovate comments", diff --git a/apps/firefly-iii/metadata.json b/apps/firefly-iii/metadata.json index e258dbde..8d7f210e 100644 --- a/apps/firefly-iii/metadata.json +++ b/apps/firefly-iii/metadata.json @@ -7,7 +7,6 @@ "name": "stable", "renovate::dataSource": "docker", "renovate::depName": "fireflyiii/core", - "renovate::versioning": "regex:^(?version-)(?\\d+)(\\.(?\\d+))?(\\.(?\\d+))?$", "version": "version-6.0.30", "platforms": [ "linux/amd64", diff --git a/apps/firefly-iii/metadata.yaml b/apps/firefly-iii/metadata.yaml new file mode 100644 index 00000000..25b42054 --- /dev/null +++ b/apps/firefly-iii/metadata.yaml @@ -0,0 +1,13 @@ +--- +app: firefly-iii +base: false +testMuteCmd: false +channels: + - name: stable + renovate-dataSource: "docker" + renovate-depName: "fireflyiii/core" + renovate-versioning: #regex:^(?version-)(?\d+)(\.(?\d+))?(\.(?\d+))?$# + version: "version-6.0.30" + platforms: + - linux/amd64 + - linux/arm64 From 77505becadd52c95c578f4a6681b4fc6240b1f44 Mon Sep 17 00:00:00 2001 From: Igor Rzegocki Date: Wed, 14 Aug 2024 19:26:07 +0200 Subject: [PATCH 3/6] WIP --- .github/renovate/customManagers.json5 | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/renovate/customManagers.json5 b/.github/renovate/customManagers.json5 index 2a94304e..c1bd7ccd 100644 --- a/.github/renovate/customManagers.json5 +++ b/.github/renovate/customManagers.json5 @@ -10,6 +10,7 @@ "matchStrings": [ "(\"renovate::dataSource\":\\s*\"(?[^\"]+)\",)?\\s*(\"renovate::depName\":\\s*\"(?[^\"]+)\",)?\\s*(\"renovate::packageName\":\\s*\"(?[^\"]+)\",)?\\s*(\"renovate::versioning\":\\s*\"(?[^\"]+)\",)?\\s*\"version\":\\s*\"(?[^\"]+)\"" ], + "extractVersionTemplate": "^[^\\d]*(?(?:\\d\\.)+\\d).*$", "datasourceTemplate": "{{#if datasource}}{{{datasource}}}{{else}}docker{{/if}}", "versioningTemplate": "{{#if versioning}}{{{versioning}}}{{else}}semver-coerced{{/if}}" }, { From 28bfbf193fa526e0ec433d3b1cdea8a441668933 Mon Sep 17 00:00:00 2001 From: Igor Rzegocki Date: Wed, 14 Aug 2024 19:33:36 +0200 Subject: [PATCH 4/6] WIP --- .github/renovate.json5 | 3 --- 1 file changed, 3 deletions(-) diff --git a/.github/renovate.json5 b/.github/renovate.json5 index 1524058a..e6dc13c8 100644 --- a/.github/renovate.json5 +++ b/.github/renovate.json5 @@ -15,9 +15,6 @@ "github>deedee-ops/containers//.github/renovate/labels.json5", "github>deedee-ops/containers//.github/renovate/semanticCommits.json5" ], - "platform": "github", - "onboarding": false, - "requireConfig": "optional", "ignoreDeps": [ "public.ecr.aws/docker/library/ubuntu", "node" From f4447e63d65b1befd8575ae62fc2cbb1df26c170 Mon Sep 17 00:00:00 2001 From: RoboDexo2000 <150604236+RoboDexo2000[bot]@users.noreply.github.com> Date: Wed, 14 Aug 2024 17:35:10 +0000 Subject: [PATCH 5/6] docs: render README.md --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index fe4ec7a1..b355aa6f 100644 --- a/README.md +++ b/README.md @@ -79,6 +79,7 @@ Container | Root/RW | Channel | Image | Latest Tags [bazarr](https://github.com/deedee-ops/containers/pkgs/container/bazarr) | | stable | ghcr.io/deedee-ops/bazarr |![1](https://img.shields.io/badge/1-blue?style=flat-square) ![1.4](https://img.shields.io/badge/1.4-blue?style=flat-square) ![1.4.3](https://img.shields.io/badge/1.4.3-blue?style=flat-square) ![latest](https://img.shields.io/badge/latest-green?style=flat-square) [csp-exporter](https://github.com/deedee-ops/containers/pkgs/container/csp-exporter) | | stable | ghcr.io/deedee-ops/csp-exporter |![0](https://img.shields.io/badge/0-blue?style=flat-square) ![0.1](https://img.shields.io/badge/0.1-blue?style=flat-square) ![0.1.0](https://img.shields.io/badge/0.1.0-blue?style=flat-square) ![latest](https://img.shields.io/badge/latest-green?style=flat-square) [firefly-iii](https://github.com/deedee-ops/containers/pkgs/container/firefly-iii) | | stable | ghcr.io/deedee-ops/firefly-iii |![6](https://img.shields.io/badge/6-blue?style=flat-square) ![6.0](https://img.shields.io/badge/6.0-blue?style=flat-square) ![6.0.30](https://img.shields.io/badge/6.0.30-blue?style=flat-square) ![latest](https://img.shields.io/badge/latest-green?style=flat-square) +[firefly-iii](https://github.com/deedee-ops/containers/pkgs/container/firefly-iii) | | stable | ghcr.io/deedee-ops/firefly-iii |![6](https://img.shields.io/badge/6-blue?style=flat-square) ![6.0](https://img.shields.io/badge/6.0-blue?style=flat-square) ![6.0.30](https://img.shields.io/badge/6.0.30-blue?style=flat-square) ![latest](https://img.shields.io/badge/latest-green?style=flat-square) [firefoxsync](https://github.com/deedee-ops/containers/pkgs/container/firefoxsync) | | stable | ghcr.io/deedee-ops/firefoxsync |![1](https://img.shields.io/badge/1-blue?style=flat-square) ![1.9](https://img.shields.io/badge/1.9-blue?style=flat-square) ![1.9.1](https://img.shields.io/badge/1.9.1-blue?style=flat-square) ![latest](https://img.shields.io/badge/latest-green?style=flat-square) [gokapi](https://github.com/deedee-ops/containers/pkgs/container/gokapi) | | stable | ghcr.io/deedee-ops/gokapi |![1](https://img.shields.io/badge/1-blue?style=flat-square) ![1.9](https://img.shields.io/badge/1.9-blue?style=flat-square) ![1.9.0](https://img.shields.io/badge/1.9.0-blue?style=flat-square) ![latest](https://img.shields.io/badge/latest-green?style=flat-square) [home-assistant](https://github.com/deedee-ops/containers/pkgs/container/home-assistant) | | stable | ghcr.io/deedee-ops/home-assistant |![2024](https://img.shields.io/badge/2024-blue?style=flat-square) ![2024.8](https://img.shields.io/badge/2024.8-blue?style=flat-square) ![2024.8.0](https://img.shields.io/badge/2024.8.0-blue?style=flat-square) ![latest](https://img.shields.io/badge/latest-green?style=flat-square) From 822e2366ff0923c36499ef1a11c1070cb00d15bf Mon Sep 17 00:00:00 2001 From: "robodexo2000[bot]" <150604236+robodexo2000[bot]@users.noreply.github.com> Date: Wed, 14 Aug 2024 17:38:59 +0000 Subject: [PATCH 6/6] feat(container): update image ghcr.io/siderolabs/talosctl to v1.8.0 --- apps/talosctl/metadata.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/talosctl/metadata.json b/apps/talosctl/metadata.json index 58ed3d96..49461d84 100644 --- a/apps/talosctl/metadata.json +++ b/apps/talosctl/metadata.json @@ -7,7 +7,7 @@ "name": "stable", "renovate::dataSource": "docker", "renovate::depName": "ghcr.io/siderolabs/talosctl", - "version": "1.7.5", + "version": "1.8.0", "platforms": [ "linux/amd64", "linux/arm64"