Skip to content

Commit 45f57f1

Browse files
authored
[8.x] Update wolfi image and fix breaking change (#114390) (#114489)
* Update wolfi image and fix breaking change (#114390) (cherry picked from commit 190513d) # Conflicts: # build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/DockerBase.java * Fix spotlight
1 parent 0801d0a commit 45f57f1

File tree

3 files changed

+13
-2
lines changed

3 files changed

+13
-2
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: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,10 @@ public enum DockerBase {
2929
CLOUD_ESS(null, "-cloud-ess", "apt-get"),
3030

3131
// Chainguard based wolfi image with latest jdk
32+
// This is usually updated via renovatebot
33+
// spotless:off
3234
WOLFI(
33-
"docker.elastic.co/wolfi/chainguard-base:latest@sha256:c16d3ad6cebf387e8dd2ad769f54320c4819fbbaa21e729fad087c7ae223b4d0",
35+
"docker.elastic.co/wolfi/chainguard-base:latest@sha256:90888b190da54062f67f3fef1372eb0ae7d81ea55f5a1f56d748b13e4853d984",
3436
"-wolfi",
3537
"apk"
3638
),

distribution/docker/src/docker/Dockerfile.ess

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ USER root
2525

2626
COPY plugins/*.zip /opt/plugins/archive/
2727

28-
RUN chown root.root /opt/plugins/archive/*
28+
RUN chown 1000:1000 /opt/plugins/archive/*
2929
RUN chmod 0444 /opt/plugins/archive/*
3030

3131
FROM ${base_image}

0 commit comments

Comments
 (0)