Skip to content

Commit 24e4895

Browse files
committed
Restructure docker files for docker distributions
- put Dockerfiles in specific distro specific folders keeping "Dockerfile" naming convention - Allows better ide support - Allows easier renovate integration
1 parent de1351d commit 24e4895

File tree

3 files changed

+2
-2
lines changed

3 files changed

+2
-2
lines changed

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
*/
1515
public enum DockerBase {
1616
// "latest" here is intentional, since the image name specifies "9"
17-
DEFAULT("redhat/ubi9-minimal:latest", "", "microdnf", "Dockerfile.default"),
17+
DEFAULT("redhat/ubi9-minimal:latest", "", "microdnf", "dockerfiles/default/Dockerfile"),
1818

1919
// The Iron Bank base image is UBI (albeit hardened), but we are required to parameterize the Docker build
2020
IRON_BANK("${BASE_REGISTRY}/${BASE_IMAGE}:${BASE_TAG}", "-ironbank", "yum", "Dockerfile"),
@@ -37,7 +37,7 @@ public enum DockerBase {
3737
"docker.elastic.co/wolfi/chainguard-base-fips:sha256-ebfc3f1d7dba992231747a2e05ad1b859843e81b5e676ad342859d7cf9e425a7@sha256:ebfc3f1d7dba992231747a2e05ad1b859843e81b5e676ad342859d7cf9e425a7",
3838
"-cloud-ess-fips",
3939
"apk",
40-
"Dockerfile.ess-fips"
40+
"dockerfiles/cloud_ess_fips/Dockerfile"
4141
);
4242

4343
private final String image;

0 commit comments

Comments
 (0)