Skip to content

Commit 0a0a4cb

Browse files
Update docker.elastic.co/wolfi/chainguard-base:latest Docker digest to 90888b1 (#114284)
This PR contains the following updates: | Package | Update | Change | |---|---|---| | docker.elastic.co/wolfi/chainguard-base | digest | `c16d3ad` -> `90888b1` | --- ### Configuration 📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] <!-- rebase-check -->If you want to rebase/retry this PR, check this box --- This PR has been generated by [Renovate Bot](https://togithub.com/renovatebot/renovate). <!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiIzNy40MjUuMSIsInVwZGF0ZWRJblZlciI6IjM3LjQyNS4xIiwidGFyZ2V0QnJhbmNoIjoibWFpbiIsImxhYmVscyI6W119-->
1 parent a68fd70 commit 0a0a4cb

File tree

3 files changed

+30
-3
lines changed

3 files changed

+30
-3
lines changed

build-tools-internal/build.gradle

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -384,6 +384,15 @@ tasks.named("jar") {
384384
exclude("classpath.index")
385385
}
386386

387+
spotless {
388+
java {
389+
// IDEs can sometimes run annotation processors that leave files in
390+
// here, causing Spotless to complain. Even though this path ought not
391+
// to exist, exclude it anyway in order to avoid spurious failures.
392+
toggleOffOn()
393+
}
394+
}
395+
387396
def resolveMainWrapperVersion() {
388397
new URL("https://raw.githubusercontent.com/elastic/elasticsearch/main/build-tools-internal/src/main/resources/minimumGradleVersion").text.trim()
389398
}

build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/DockerBase.java

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,11 +29,13 @@ public enum DockerBase {
2929
CLOUD_ESS(null, "-cloud-ess", "apt-get"),
3030

3131
// Chainguard based wolfi image with latest jdk
32-
WOLFI(
33-
"docker.elastic.co/wolfi/chainguard-base:latest@sha256:c16d3ad6cebf387e8dd2ad769f54320c4819fbbaa21e729fad087c7ae223b4d0",
32+
// This is usually updated via renovatebot
33+
// spotless:off
34+
WOLFI("docker.elastic.co/wolfi/chainguard-base:latest@sha256:90888b190da54062f67f3fef1372eb0ae7d81ea55f5a1f56d748b13e4853d984",
3435
"-wolfi",
3536
"apk"
3637
),
38+
// spotless:on
3739

3840
// Based on WOLFI above, with more extras. We don't set a base image because
3941
// we programmatically extend from the Wolfi image.

renovate.json

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,23 @@
11
{
22
"$schema": "https://docs.renovatebot.com/renovate-schema.json",
33
"extends": [
4-
"github>elastic/renovate-config:only-chainguard"
4+
"github>elastic/renovate-config:only-chainguard",
5+
":disableDependencyDashboard"
6+
],
7+
"labels": [">non-issue", ":Delivery/Packaging", "Team:Delivery"],
8+
"baseBranches": ["main", "8.x"],
9+
"packageRules": [
10+
{
11+
"groupName": "wolfi (versioned)",
12+
"groupSlug": "wolfi-versioned",
13+
"description": "Override the `groupSlug` to create a non-special-character branch name",
14+
"matchDatasources": [
15+
"docker"
16+
],
17+
"matchPackagePatterns": [
18+
"^docker.elastic.co/wolfi/chainguard-base$"
19+
]
20+
}
521
],
622
"customManagers": [
723
{

0 commit comments

Comments
 (0)