diff --git a/.github/renovate.json5 b/.github/renovate.json5 index 4db7acaf1..27ea3947f 100644 --- a/.github/renovate.json5 +++ b/.github/renovate.json5 @@ -1,7 +1,8 @@ { "$schema": "https://docs.renovatebot.com/renovate-schema.json", "extends": [ - "config:base" + "config:recommended", + "customManagers:dockerfileVersions" // used by logging-k8s-stdout-otlp-json/Dockerfile ], "packageRules": [ { @@ -17,36 +18,11 @@ // of that release instead of the unstable version for a future release "ignoreUnstable": false }, - { - "matchPackagePrefixes": ["io.opentelemetry"], - "groupName": "opentelemetry packages" - }, - { - "matchPackagePrefixes": ["ch.qos.logback:"], - "groupName": "logback packages" - }, - { - "matchPackagePrefixes": ["com.google.protobuf"], - "groupName": "protobuf packages" - }, { // intentionally using Java 11 in some examples // not using matchUpdateTypes "major", because renovate wants to bump "11-jre" to "11.0.19_7-jre" "matchPackageNames": ["eclipse-temurin"], "enabled": false } - ], - "customManagers": [ - { - "customType": "regex", - "description": "Update _VERSION variables in Dockerfiles", - "fileMatch": [ - "(^|/|\\.)Dockerfile$", - "(^|/)Dockerfile\\.[^/]*$" - ], - "matchStrings": [ - "# renovate: datasource=(?[a-z-]+?)(?: depName=(?.+?))? packageName=(?.+?)(?: versioning=(?[a-z-]+?))?\\s(?:ENV|ARG) .+?_VERSION=(?.+?)\\s" - ] - } ] } diff --git a/logging-k8s-stdout-otlp-json/Dockerfile b/logging-k8s-stdout-otlp-json/Dockerfile index c6f8e2767..11e948228 100644 --- a/logging-k8s-stdout-otlp-json/Dockerfile +++ b/logging-k8s-stdout-otlp-json/Dockerfile @@ -3,7 +3,7 @@ FROM eclipse-temurin:21-jre WORKDIR /usr/src/app/ # renovate: datasource=github-releases depName=opentelemetry-java-instrumentation packageName=open-telemetry/opentelemetry-java-instrumentation -ENV OPENTELEMETRY_JAVA_INSTRUMENTATION_VERSION=v2.12.0 +ENV OPENTELEMETRY_JAVA_INSTRUMENTATION_VERSION=v2.11.0 ADD build/libs/*SNAPSHOT.jar ./app.jar ADD --chmod=644 https://github.com/open-telemetry/opentelemetry-java-instrumentation/releases/download/$OPENTELEMETRY_JAVA_INSTRUMENTATION_VERSION/opentelemetry-javaagent.jar ./opentelemetry-javaagent.jar