Skip to content

Commit e6867d5

Browse files
authored
[9.0] [Build] Fix auto merge conflict with docker fips setup (elastic#126683)
1 parent d17a8e4 commit e6867d5

File tree

1 file changed

+0
-2
lines changed
  • build-tools-internal/src/main/java/org/elasticsearch/gradle/internal

1 file changed

+0
-2
lines changed

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,6 @@ public enum DockerBase {
3434
"apk",
3535
"Dockerfile"
3636
),
37-
38-
FIPS("docker.elastic.co/wolfi/chainguard-base-fips:sha256-feb7aeb1bbcb331afa089388f2fa1e81997fc24642ca4fa06b7e502ff599a4cf", "-fips", "apk"),
3937
// spotless:on
4038
// Based on WOLFI above, with more extras. We don't set a base image because
4139
// we programmatically extend from the wolfi image.

0 commit comments

Comments
 (0)