Skip to content

Commit 0ecfd92

Browse files
authored
Simplify renovate config (#594)
1 parent c8f1794 commit 0ecfd92

File tree

2 files changed

+3
-27
lines changed

2 files changed

+3
-27
lines changed

.github/renovate.json5

Lines changed: 2 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
{
22
"$schema": "https://docs.renovatebot.com/renovate-schema.json",
33
"extends": [
4-
"config:base"
4+
"config:recommended",
5+
"customManagers:dockerfileVersions" // used by logging-k8s-stdout-otlp-json/Dockerfile
56
],
67
"packageRules": [
78
{
@@ -17,36 +18,11 @@
1718
// of that release instead of the unstable version for a future release
1819
"ignoreUnstable": false
1920
},
20-
{
21-
"matchPackagePrefixes": ["io.opentelemetry"],
22-
"groupName": "opentelemetry packages"
23-
},
24-
{
25-
"matchPackagePrefixes": ["ch.qos.logback:"],
26-
"groupName": "logback packages"
27-
},
28-
{
29-
"matchPackagePrefixes": ["com.google.protobuf"],
30-
"groupName": "protobuf packages"
31-
},
3221
{
3322
// intentionally using Java 11 in some examples
3423
// not using matchUpdateTypes "major", because renovate wants to bump "11-jre" to "11.0.19_7-jre"
3524
"matchPackageNames": ["eclipse-temurin"],
3625
"enabled": false
3726
}
38-
],
39-
"customManagers": [
40-
{
41-
"customType": "regex",
42-
"description": "Update _VERSION variables in Dockerfiles",
43-
"fileMatch": [
44-
"(^|/|\\.)Dockerfile$",
45-
"(^|/)Dockerfile\\.[^/]*$"
46-
],
47-
"matchStrings": [
48-
"# renovate: datasource=(?<datasource>[a-z-]+?)(?: depName=(?<depName>.+?))? packageName=(?<packageName>.+?)(?: versioning=(?<versioning>[a-z-]+?))?\\s(?:ENV|ARG) .+?_VERSION=(?<currentValue>.+?)\\s"
49-
]
50-
}
5127
]
5228
}

logging-k8s-stdout-otlp-json/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ FROM eclipse-temurin:21-jre
33
WORKDIR /usr/src/app/
44

55
# renovate: datasource=github-releases depName=opentelemetry-java-instrumentation packageName=open-telemetry/opentelemetry-java-instrumentation
6-
ENV OPENTELEMETRY_JAVA_INSTRUMENTATION_VERSION=v2.12.0
6+
ENV OPENTELEMETRY_JAVA_INSTRUMENTATION_VERSION=v2.11.0
77

88
ADD build/libs/*SNAPSHOT.jar ./app.jar
99
ADD --chmod=644 https://github.com/open-telemetry/opentelemetry-java-instrumentation/releases/download/$OPENTELEMETRY_JAVA_INSTRUMENTATION_VERSION/opentelemetry-javaagent.jar ./opentelemetry-javaagent.jar

0 commit comments

Comments
 (0)