Merge branch 'master' into next

compose.yml

@@ -48,7 +48,7 @@ services:
 
   tempo:
     <<: *service-base
-    image: grafana/tempo:latest@sha256:89fd395d641588d8714b23d67e93d7502362bf213d3d6d9ecd00f63c1be9a8ea
+    image: grafana/tempo:latest@sha256:692853614cc344c15f5695d3a950fcca326dd7bcffa544fe36b8d978e90a146b
     command: [-config.file=/etc/tempo.yaml]
     volumes:
       - ./telemetry/tempo.yaml:/etc/tempo.yaml

renovate.json

@@ -1,8 +1,7 @@
 {
   "$schema": "https://docs.renovatebot.com/renovate-schema.json",
-  "extends": [
-    "config:recommended"
-  ],
+  "extends": ["config:recommended"],
+  "baseBranchPatterns": ["next"],
   "packageRules": [
     {
       "matchManagers": ["bun", "npm"],
@@ -11,10 +10,10 @@
       "groupSlug": "bun-minor-patch"
     },
     {
-      "matchManagers": ["bun", "npm"],
-      "matchUpdateTypes": ["major"],
-      "groupName": "bun major updates",
-      "groupSlug": "bun-major"
+      "matchManagers": ["dockerfile", "docker-compose"],
+      "matchUpdateTypes": ["minor", "patch", "digest"],
+      "groupName": "docker minor+patch+digest updates",
+      "groupSlug": "docker-minor-patch-digest"
     }
   ]
 }