[pull] main from renovatebot:main

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.4',
+    default: 'ghcr.io/renovatebot/base-image:13.4.0',
     globalOnly: true,
     deprecationMsg:
       'The usage of `binarySource=docker` is deprecated, and will be removed in the future',

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

@@ -196,7 +196,10 @@ export const presets: Record<string, Preset> = {
         description:
           'Limit Java runtime versions to LTS releases. To receive all major releases add `workarounds:javaLTSVersions` to the `ignorePresets` array.',
         matchDatasources: ['docker'],
-        matchPackageNames: ['bellsoft/liberica-runtime-container'],
+        matchPackageNames: [
+          'bellsoft/hardened-liberica-runtime-container',
+          'bellsoft/liberica-runtime-container',
+        ],
       },
     ],
   },
@@ -219,7 +222,10 @@ export const presets: Record<string, Preset> = {
         description: 'Liberica JDK Lite version optimized for the Cloud',
         matchCurrentValue: '/^jdk-[^a][^l]{2}/',
         matchDatasources: ['docker'],
-        matchPackageNames: ['bellsoft/liberica-runtime-container'],
+        matchPackageNames: [
+          'bellsoft/hardened-liberica-runtime-container',
+          'bellsoft/liberica-runtime-container',
+        ],
         versioning:
           'regex:^jdk-(?<major>\\d+)?(\\.(?<minor>\\d+))?(\\.(?<patch>\\d+))?([\\._+](?<build>(\\d\\.?)+))?(-(?<compatibility>.*))?$',
       },
@@ -228,7 +234,10 @@ export const presets: Record<string, Preset> = {
           'Liberica JDK that can be used to create a custom runtime with a help of jlink tool',
         matchCurrentValue: '/^jdk-all/',
         matchDatasources: ['docker'],
-        matchPackageNames: ['bellsoft/liberica-runtime-container'],
+        matchPackageNames: [
+          'bellsoft/hardened-liberica-runtime-container',
+          'bellsoft/liberica-runtime-container',
+        ],
         versioning:
           'regex:^jdk-all-(?<major>\\d+)?(\\.(?<minor>\\d+))?(\\.(?<patch>\\d+))?([\\._+](?<build>(\\d\\.?)+))?(-(?<compatibility>.*))?$',
       },
@@ -237,7 +246,10 @@ export const presets: Record<string, Preset> = {
           'Liberica JRE (only the runtime without the rest of JDK tools) for running Java applications',
         matchCurrentValue: '/^jre-/',
         matchDatasources: ['docker'],
-        matchPackageNames: ['bellsoft/liberica-runtime-container'],
+        matchPackageNames: [
+          'bellsoft/hardened-liberica-runtime-container',
+          'bellsoft/liberica-runtime-container',
+        ],
         versioning:
           'regex:^jre-(?<major>\\d+)?(\\.(?<minor>\\d+))?(\\.(?<patch>\\d+))?([\\._+](?<build>(\\d\\.?)+))?(-(?<compatibility>.*))?$',
       },

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

@@ -101,6 +101,8 @@ describe('modules/versioning/pep440/index', () => {
     currentValue            | rangeStrategy    | currentVersion | newVersion   | expected
     ${'1.0.0'}              | ${'bump'}        | ${'1.0.0'}     | ${'1.2.3'}   | ${'1.2.3'}
     ${'1.0.0'}              | ${'replace'}     | ${'1.0.0'}     | ${'1.2.3'}   | ${'1.2.3'}
+    ${'v1.0.0'}             | ${'bump'}        | ${'1.0.0'}     | ${'1.2.3'}   | ${'v1.2.3'}
+    ${'v1.0.0'}             | ${'replace'}     | ${'1.0.0'}     | ${'1.2.3'}   | ${'v1.2.3'}
     ${'==1.0.3'}            | ${'bump'}        | ${'1.0.0'}     | ${'1.2.3'}   | ${'==1.2.3'}
     ${'==1.0.3'}            | ${'replace'}     | ${'1.0.0'}     | ${'1.2.3'}   | ${'==1.2.3'}
     ${'>=1.2.0'}            | ${'bump'}        | ${'1.0.0'}     | ${'1.2.3'}   | ${'>=1.2.3'}

lib/modules/versioning/pep440/range.spec.ts

@@ -35,4 +35,24 @@ describe('modules/versioning/pep440/range', () => {
     );
     expect(logger.warn).not.toHaveBeenCalled();
   });
+
+  it('handles v-prefixed version as currentValue', () => {
+    const res = getNewValue({
+      currentValue: 'v0.7.15',
+      rangeStrategy: 'auto',
+      newVersion: '0.8.0',
+      currentVersion: '0.7.15',
+    });
+    expect(res).toBe('v0.8.0');
+  });
+
+  it('handles bare version that differs from currentVersion without v-prefix', () => {
+    const res = getNewValue({
+      currentValue: '1.0.0.0',
+      rangeStrategy: 'auto',
+      newVersion: '1.2.3',
+      currentVersion: '1.0.0',
+    });
+    expect(res).toBe('1.2.3');
+  });
 });

lib/modules/versioning/pep440/range.ts

@@ -117,6 +117,17 @@ export function getNewValue({
     return newVersion;
   }
 
+  // Handle bare versions (e.g., "v0.7.15") that don't strictly equal
+  // currentVersion due to normalization, treating them as pinned while
+  // preserving the v-prefix.
+  if (parseVersion(currentValue)) {
+    const vPrefix = regEx(/^(?<prefix>[vV])/).exec(currentValue);
+    if (vPrefix) {
+      return `${vPrefix.groups!.prefix}${newVersion}`;
+    }
+    return newVersion;
+  }
+
   try {
     ranges = parseCurrentRange(currentValue);
     if (!ranges.length) {

package.json

@@ -219,7 +219,7 @@
     "fs-extra": "11.3.3",
     "git-url-parse": "16.1.0",
     "github-url-from-git": "1.5.0",
-    "glob": "13.0.0",
+    "glob": "13.0.1",
     "global-agent": "3.0.0",
     "google-auth-library": "10.5.0",
     "got": "11.8.6",

tools/docker/Dockerfile

@@ -5,19 +5,19 @@ ARG BASE_IMAGE_TYPE=slim
 # --------------------------------------
 # slim image
 # --------------------------------------
-FROM ghcr.io/renovatebot/base-image:13.3.4@sha256:8c1b03f5758ff636d2f8b49d575116e116eaf93dc618db8522555165851036ce AS slim-base
+FROM ghcr.io/renovatebot/base-image:13.4.0@sha256:43eebc6627d4b5c7a6fec0528f904e551f0dab986109ce1013eea9358f21f465 AS slim-base
 
 # --------------------------------------
 # full image
 # --------------------------------------
-FROM ghcr.io/renovatebot/base-image:13.3.4-full@sha256:db7533a96c6cc5e0198cd5c17e7ce2398d502e7c6aa50e62d33022162d9dc2ac AS full-base
+FROM ghcr.io/renovatebot/base-image:13.4.0-full@sha256:5f5624c8a5ad20d6fb7fddc89c09ec4ad1ed379a97356c8c58cfeb87861b448a AS full-base
 
 ENV RENOVATE_BINARY_SOURCE=global
 
 # --------------------------------------
 # build image
 # --------------------------------------
-FROM --platform=$BUILDPLATFORM ghcr.io/renovatebot/base-image:13.3.4@sha256:8c1b03f5758ff636d2f8b49d575116e116eaf93dc618db8522555165851036ce AS build
+FROM --platform=$BUILDPLATFORM ghcr.io/renovatebot/base-image:13.4.0@sha256:43eebc6627d4b5c7a6fec0528f904e551f0dab986109ce1013eea9358f21f465 AS build
 
 # We want a specific node version here
 # renovate: datasource=github-releases packageName=containerbase/node-prebuild versioning=node