[pull] main from renovatebot:main

.nvmrc

@@ -1 +1 @@
-24.13.0
+24.13.1

lib/config/options/index.ts

@@ -618,7 +618,7 @@ const options: Readonly<RenovateOptions>[] = [
     description:
       'Change this value to override the default Renovate sidecar image.',
     type: 'string',
-    default: 'ghcr.io/renovatebot/base-image:13.3.1',
+    default: 'ghcr.io/renovatebot/base-image:13.3.4',
     globalOnly: true,
     deprecationMsg:
       'The usage of `binarySource=docker` is deprecated, and will be removed in the future',

lib/config/presets/__snapshots__/index.spec.ts.snap

@@ -90,6 +90,7 @@ exports[`config/presets/index > resolveConfigPresets > migrates automerge in pre
       ],
       "matchManagers": [
         "pep621",
+        "poetry",
       ],
       "semanticCommitType": "fix",
     },

lib/config/presets/internal/default.preset.ts

@@ -586,7 +586,7 @@ See [Docker - Disable digest pinning](./docker.md#disable-digest-pinning) for mo
           'project.dependencies',
           'project.optional-dependencies',
         ],
-        matchManagers: ['pep621'],
+        matchManagers: ['pep621', 'poetry'],
         semanticCommitType: 'fix',
       },
       {

lib/modules/versioning/redhat/index.spec.ts

@@ -2,26 +2,27 @@ import redhat from './index.ts';
 
 describe('modules/versioning/redhat/index', () => {
   it.each`
-    input                     | expected
-    ${'1'}                    | ${true}
-    ${'17.04'}                | ${true}
-    ${'9.0.0'}                | ${true}
-    ${'1-632'}                | ${true}
-    ${'1.2-62'}               | ${true}
-    ${'1.2.3-62'}             | ${true}
-    ${'8.5-239.1651231664'}   | ${true}
-    ${'8.5.0-239.1651231664'} | ${true}
-    ${'9.0.0-62'}             | ${true}
-    ${'v0.4.0-383'}           | ${true}
-    ${'1.2.3.4-62'}           | ${false}
-    ${'1.2.3 -62'}            | ${false}
-    ${'8.5-'}                 | ${false}
-    ${'3.0.0-beta'}           | ${false}
-    ${'2.0.2-pre2019100318'}  | ${false}
-    ${'1.0.0+c30d7625'}       | ${false}
-    ${'2.3.4-beta+1990ef74'}  | ${false}
-    ${'5.1.2-+'}              | ${false}
-    ${'5.1.2+1'}              | ${false}
+    input                       | expected
+    ${'1'}                      | ${true}
+    ${'17.04'}                  | ${true}
+    ${'9.0.0'}                  | ${true}
+    ${'1-632'}                  | ${true}
+    ${'1.2-62'}                 | ${true}
+    ${'1.2.3-62'}               | ${true}
+    ${'8.5-239.1651231664'}     | ${true}
+    ${'8.5.0-239.1651231664'}   | ${true}
+    ${'9.0.0-62'}               | ${true}
+    ${'1.0.0.GA-20.1770236070'} | ${true}
+    ${'v0.4.0-383'}             | ${true}
+    ${'1.2.3.4-62'}             | ${false}
+    ${'1.2.3 -62'}              | ${false}
+    ${'8.5-'}                   | ${false}
+    ${'3.0.0-beta'}             | ${false}
+    ${'2.0.2-pre2019100318'}    | ${false}
+    ${'1.0.0+c30d7625'}         | ${false}
+    ${'2.3.4-beta+1990ef74'}    | ${false}
+    ${'5.1.2-+'}                | ${false}
+    ${'5.1.2+1'}                | ${false}
   `('isValid("$input") === $expected', ({ input, expected }) => {
     expect(redhat.isValid(input)).toBe(expected);
   });

lib/modules/versioning/redhat/index.ts

@@ -9,7 +9,7 @@ export const urls = [];
 export const supportsRanges = false;
 
 const pattern = regEx(
-  /^v?(?<major>\d+)(?:\.(?<minor>\d+))?(?:\.(?<patch>\d+))?(?:-(?<releaseMajor>\d+)(?:\.(?<releaseMinor>\d+))?)?$/,
+  /^v?(?<major>\d+)(?:\.(?<minor>\d+))?(?:\.(?<patch>\d+))?(\.GA)?(?:-(?<releaseMajor>\d+)(?:\.(?<releaseMinor>\d+))?)?$/,
 );
 
 class RedhatVersioningApi extends GenericVersioningApi {

lib/modules/versioning/redhat/readme.md

@@ -3,6 +3,7 @@ Red Hat versioning is used with container images that are maintained by Red Hat.
 Red Hat version definitions follow this pattern:
 
 - the version of the main component, where major is required, but minor and patch are optional
+- optionally a '.GA"
 - optionally a hyphen followed by release information
 - the version of Red Hat's release as an integer, optionally followed by a timestamp like: `1645808164`
 - optionally a "v"-prefix
@@ -14,5 +15,6 @@ Examples of valid Red Hat versions:
 - `7.9-628`
 - `v0.4.0-383`
 - `9.0.0-19.1655192132`
+- `1.0.0.GA-20.1770236070`
 
 Ranges are not supported by this versioning.

package.json

@@ -149,7 +149,7 @@
     "pnpm": "^10.0.0"
   },
   "volta": {
-    "node": "24.13.0",
+    "node": "24.13.1",
     "pnpm": "10.28.2"
   },
   "dependencies": {
@@ -278,7 +278,7 @@
     "re2": "1.23.2"
   },
   "devDependencies": {
-    "@biomejs/biome": "2.3.13",
+    "@biomejs/biome": "2.3.14",
     "@commander-js/extra-typings": "14.0.0",
     "@containerbase/eslint-plugin": "1.1.31",
     "@containerbase/istanbul-reports-html": "1.1.30",

tools/docker/Dockerfile

@@ -5,23 +5,23 @@ ARG BASE_IMAGE_TYPE=slim
 # --------------------------------------
 # slim image
 # --------------------------------------
-FROM ghcr.io/renovatebot/base-image:13.3.1@sha256:15cd4af83e8beb397960908a8b5d6a44641111fa62bf174dd0ba7a17d99720e5 AS slim-base
+FROM ghcr.io/renovatebot/base-image:13.3.4@sha256:8c1b03f5758ff636d2f8b49d575116e116eaf93dc618db8522555165851036ce AS slim-base
 
 # --------------------------------------
 # full image
 # --------------------------------------
-FROM ghcr.io/renovatebot/base-image:13.3.1-full@sha256:3029dac3c28110f30cc2369d8f2520a4382313f4c1e1008db902bf44d4966ae5 AS full-base
+FROM ghcr.io/renovatebot/base-image:13.3.4-full@sha256:db7533a96c6cc5e0198cd5c17e7ce2398d502e7c6aa50e62d33022162d9dc2ac AS full-base
 
 ENV RENOVATE_BINARY_SOURCE=global
 
 # --------------------------------------
 # build image
 # --------------------------------------
-FROM --platform=$BUILDPLATFORM ghcr.io/renovatebot/base-image:13.3.1@sha256:15cd4af83e8beb397960908a8b5d6a44641111fa62bf174dd0ba7a17d99720e5 AS build
+FROM --platform=$BUILDPLATFORM ghcr.io/renovatebot/base-image:13.3.4@sha256:8c1b03f5758ff636d2f8b49d575116e116eaf93dc618db8522555165851036ce AS build
 
 # We want a specific node version here
 # renovate: datasource=github-releases packageName=containerbase/node-prebuild versioning=node
-RUN install-tool node 24.13.0
+RUN install-tool node 24.13.1
 
 # corepack is too buggy 😞
 # renovate: datasource=npm

tools/mkdocs.ts

@@ -29,6 +29,10 @@ program
     const res = exec('pdm', args, {
       cwd: 'tools/mkdocs',
       stdio: 'inherit',
+      env: {
+        ...process.env,
+        RENOVATE_VERSION: opts.version ?? '',
+      },
     });
     checkResult(res);
   });