Merge branch 'main' into haskell-vulnerabilities

.devcontainer/Dockerfile

@@ -1 +1 @@
-FROM ghcr.io/containerbase/devcontainer:13.5.5
+FROM ghcr.io/containerbase/devcontainer:13.5.6

.github/workflows/build.yml

@@ -684,7 +684,7 @@ jobs:
           show-progress: false
 
       - name: docker-config
-        uses: containerbase/internal-tools@c440de95307545d23ff0e0b57018147e02ae217f # v3.5.15
+        uses: containerbase/internal-tools@c8f78cbc830d1883e695d06e3028136656e70f5b # v3.5.17
         with:
           command: docker-config
 

docs/usage/docker.md

@@ -478,7 +478,7 @@ Make sure to install the Google Cloud SDK into the custom image, as you need the
 For example:
 
 ```Dockerfile
-FROM renovate/renovate:39.82.1
+FROM renovate/renovate:39.86.0
 # Include the "Docker tip" which you can find here https://cloud.google.com/sdk/docs/install
 # under "Installation" for "Debian/Ubuntu"
 RUN ...

docs/usage/examples/self-hosting.md

@@ -25,8 +25,8 @@ It builds `latest` based on the `main` branch and all SemVer tags are published
 ```sh title="Example of valid tags"
 docker run --rm renovate/renovate
 docker run --rm renovate/renovate:39
-docker run --rm renovate/renovate:39.82
-docker run --rm renovate/renovate:39.82.1
+docker run --rm renovate/renovate:39.86
+docker run --rm renovate/renovate:39.86.0
 ```
 
 <!-- prettier-ignore -->
@@ -62,7 +62,7 @@ spec:
             - name: renovate
               # Update this to the latest available and then enable Renovate on
               # the manifest
-              image: renovate/renovate:39.82.1
+              image: renovate/renovate:39.86.0
               args:
                 - user/repo
               # Environment Variables
@@ -121,7 +121,7 @@ spec:
       template:
         spec:
           containers:
-            - image: renovate/renovate:39.82.1
+            - image: renovate/renovate:39.86.0
               name: renovate-bot
               env: # For illustration purposes, please use secrets.
                 - name: RENOVATE_PLATFORM
@@ -367,7 +367,7 @@ spec:
           containers:
             - name: renovate
               # Update this to the latest available and then enable Renovate on the manifest
-              image: renovate/renovate:39.82.1
+              image: renovate/renovate:39.86.0
               volumeMounts:
                 - name: ssh-key-volume
                   readOnly: true

lib/config/options/index.ts

@@ -516,7 +516,7 @@ const options: RenovateOptions[] = [
     description:
       'Change this value to override the default Renovate sidecar image.',
     type: 'string',
-    default: 'ghcr.io/containerbase/sidecar:13.5.5',
+    default: 'ghcr.io/containerbase/sidecar:13.5.6',
     globalOnly: true,
   },
   {

lib/config/presets/common.ts

@@ -74,6 +74,7 @@ const renamedMonorepos: Record<string, string> = {
   Steeltoe: 'steeltoe',
   stryker: 'stryker-js',
   Swashbuckle: 'swashbuckle-aspnetcore',
+  nrwl: 'nx',
 };
 
 for (const [from, to] of Object.entries(renamedMonorepos)) {

lib/data/monorepo.json

@@ -435,6 +435,8 @@
     "opentelemetry-java-contrib": "https://github.com/open-telemetry/opentelemetry-java-contrib",
     "opentelemetry-js": "https://github.com/open-telemetry/opentelemetry-js",
     "opentelemetry-js-contrib": "https://github.com/open-telemetry/opentelemetry-js-contrib",
+    "opentelemetry-python": "https://github.com/open-telemetry/opentelemetry-python",
+    "opentelemetry-python-contrib": "https://github.com/open-telemetry/opentelemetry-python-contrib",
     "opentelemetry-rust": "https://github.com/open-telemetry/opentelemetry-rust",
     "opentelemetry-rust-contrib": "https://github.com/open-telemetry/opentelemetry-rust-contrib",
     "orleans": "https://github.com/dotnet/orleans",
@@ -584,7 +586,7 @@
     "hapijs": "https://github.com/hapijs/",
     "lodash": "https://github.com/lodash/",
     "ngrx": "https://github.com/ngrx/",
-    "nrwl": "https://github.com/nrwl/",
+    "nx": "https://github.com/nrwl/nx",
     "octokit": "https://github.com/octokit/",
     "semantic-release": "https://github.com/semantic-release/",
     "swc": "https://github.com/swc-project/"

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

@@ -76,6 +76,7 @@ describe('modules/versioning/hex/index', () => {
     ${'~> 1.2.0'}              | ${'replace'}         | ${'1.2.3'}     | ${'2.0.7'} | ${'~> 2.0.0'}
     ${'~> 1.2.0'}              | ${'pin'}             | ${'1.2.3'}     | ${'2.0.7'} | ${'== 2.0.7'}
     ${'~> 1.2.0'}              | ${'bump'}            | ${'1.2.3'}     | ${'2.0.7'} | ${'~> 2.0.7'}
+    ${'~> 0.2 and <= 0.2.6'}   | ${'widen'}           | ${'0.2.6'}     | ${'0.2.8'} | ${'~> 0.2 and <= 0.2.8'}
     ${'>= 1.0.0 and <= 2.0.0'} | ${'widen'}           | ${'1.2.3'}     | ${'2.0.7'} | ${'>= 1.0.0 and <= 2.0.7'}
     ${'>= 1.0.0 and <= 2.0.0'} | ${'replace'}         | ${'1.2.3'}     | ${'2.0.7'} | ${'<= 2.0.7'}
     ${'>= 1.0.0 and <= 2.0.0'} | ${'pin'}             | ${'1.2.3'}     | ${'2.0.7'} | ${'== 2.0.7'}

lib/modules/versioning/hex/index.ts

@@ -31,7 +31,7 @@ function npm2hex(input: string): string {
     .map((str) => str.trim())
     .filter((str) => str !== '');
   let output = '';
-  const operators = ['^', '=', '>', '<', '<=', '>=', '~'];
+  const operators = ['^', '=', '>', '<', '<=', '>=', '~>'];
   for (let i = 0; i < res.length; i += 1) {
     if (i === res.length - 1) {
       output += res[i];

lib/modules/versioning/regex/readme.md

@@ -49,21 +49,35 @@ Here is another example, this time for handling Bitnami Docker images, which use
   "packageRules": [
     {
       "matchDatasources": ["docker"],
-      "matchPackageNamees": ["bitnami/**", "docker.io/bitnami/**"],
+      "matchPackageNames": ["bitnami/**", "docker.io/bitnami/**"],
       "versioning": "regex:^(?<major>\\d+)\\.(?<minor>\\d+)\\.(?<patch>\\d+)(?:-(?<compatibility>.+)(?<build>\\d+)-r(?<revision>\\d+))?$"
     }
   ]
 }
 ```
 
+Here is another example, this time for handling `ghcr.io/linuxserver/tautulli` Docker images, which use `major` and `build` indicators with string prefixes:
+
+```json
+{
+  "packageRules": [
+    {
+      "matchDatasources": ["docker"],
+      "matchPackageNames": ["ghcr.io/linuxserver/tautulli"],
+      "versioning": "regex:^v(?<major>\\d+)\\.(?<minor>\\d+)\\.(?<patch>\\d+)-ls(?<build>.+)$"
+    }
+  ]
+}
+```
+
 Here is another example, this time for handling `ghcr.io/linuxserver/openssh-server` Docker images, which use `patch`, `build` and `revision` indicators with string prefixes:
 
 ```json
 {
   "packageRules": [
     {
       "matchDatasources": ["docker"],
-      "matchPackageNamees": ["ghcr.io/linuxserver/openssh-server"],
+      "matchPackageNames": ["ghcr.io/linuxserver/openssh-server"],
       "versioning": "regex:^(?<major>\\d+)\\.(?<minor>\\d+)_p(?<patch>\\d+)-r(?<build>\\d)-ls(?<revision>.+)$"
     }
   ]