From 863f74be20ebf53cbdb7429c37d946b74d122ae5 Mon Sep 17 00:00:00 2001 From: Edmund Miller Date: Tue, 9 Jan 2024 08:33:51 -0600 Subject: [PATCH 1/4] ci(renovate): Set renovate docker registry to docker.io Not using quay.io here https://github.com/nf-core/ops/blob/a76929cf2e11777d360c319554ca895c9899683f/.github/renovate/default.json5#L52-L57 --- .github/renovate.json5 | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.github/renovate.json5 b/.github/renovate.json5 index f9b377c615..42ba9276cd 100644 --- a/.github/renovate.json5 +++ b/.github/renovate.json5 @@ -2,4 +2,10 @@ $schema: "https://docs.renovatebot.com/renovate-schema.json", extends: ["github>nf-core/ops//.github/renovate/default.json5"], baseBranches: ["dev"], + packageRules: [ + { + matchDatasources: ["docker"], + registryUrls: ["docker.io"], + }, + ], } From ba6b7accad5d21d13b7d55ad4eac11e230059e6c Mon Sep 17 00:00:00 2001 From: Edmund Miller Date: Tue, 9 Jan 2024 08:34:38 -0600 Subject: [PATCH 2/4] ci(renovate): Add python pep440 versioning https://docs.renovatebot.com/docker/#version-compatibility --- .github/renovate.json5 | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.github/renovate.json5 b/.github/renovate.json5 index 42ba9276cd..23316b5c36 100644 --- a/.github/renovate.json5 +++ b/.github/renovate.json5 @@ -3,6 +3,11 @@ extends: ["github>nf-core/ops//.github/renovate/default.json5"], baseBranches: ["dev"], packageRules: [ + { + matchDatasources: ["docker"], + matchPackageNames: ["python"], + versioning: "pep440", + }, { matchDatasources: ["docker"], registryUrls: ["docker.io"], From 14f594c2de4431eb57da55438ef4ccec2be738e9 Mon Sep 17 00:00:00 2001 From: Edmund Miller Date: Tue, 9 Jan 2024 08:37:12 -0600 Subject: [PATCH 3/4] ci(renovate): Ignore modules in pipeline template https://github.com/nf-core/ops/issues/29 --- .github/renovate.json5 | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/renovate.json5 b/.github/renovate.json5 index 23316b5c36..1813c08e6e 100644 --- a/.github/renovate.json5 +++ b/.github/renovate.json5 @@ -1,6 +1,7 @@ { $schema: "https://docs.renovatebot.com/renovate-schema.json", extends: ["github>nf-core/ops//.github/renovate/default.json5"], + ignorePaths: ["nf_core/pipeline-template/modules/nf-core/"], baseBranches: ["dev"], packageRules: [ { From 9cfea63732d2e7711cfc73253978f48282b5ea8a Mon Sep 17 00:00:00 2001 From: Edmund Miller Date: Tue, 9 Jan 2024 08:40:19 -0600 Subject: [PATCH 4/4] chore: Update Changelog --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5ba689598f..e11b4da152 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -26,6 +26,7 @@ - Update mshick/add-pr-comment action to v2 ([#2632](https://github.com/nf-core/tools/pull/2632)) - update python image version in docker file ([#2636](https://github.com/nf-core/tools/pull/2636)) - Set pdiff as nf-test differ in Docker image for Gitpod ([#2642](https://github.com/nf-core/tools/pull/2642)) +- Fix Renovate Dockerfile updating issues ([#2648](https://github.com/nf-core/tools/pull/2648)) # [v2.11.1 - Magnesium Dragon Patch](https://github.com/nf-core/tools/releases/tag/2.11) - [2023-12-20]