From 0cd8ace7bb60612364747d19aae437d41d9bc4e6 Mon Sep 17 00:00:00 2001 From: Rene Groeschke Date: Mon, 31 Mar 2025 11:58:17 +0200 Subject: [PATCH 1/3] [BUILD] Support AARCH64 for docker fips images This updates the docker fips base image which support arm and x84 architectures --- .../java/org/elasticsearch/gradle/internal/DockerBase.java | 3 +-- settings.gradle | 1 + 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/DockerBase.java b/build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/DockerBase.java index a3c20bf62b7f4..cc0c9239d93fd 100644 --- a/build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/DockerBase.java +++ b/build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/DockerBase.java @@ -26,8 +26,7 @@ public enum DockerBase { "-wolfi", "apk" ), - - FIPS("docker.elastic.co/wolfi/chainguard-base-fips:sha256-feb7aeb1bbcb331afa089388f2fa1e81997fc24642ca4fa06b7e502ff599a4cf", "-fips", "apk"), + FIPS("docker.elastic.co/wolfi/chainguard-base-fips:sha256-ebfc3f1d7dba992231747a2e05ad1b859843e81b5e676ad342859d7cf9e425a7", "-fips", "apk"), // spotless:on // Based on WOLFI above, with more extras. We don't set a base image because // we programmatically extend from the wolfi image. diff --git a/settings.gradle b/settings.gradle index e34a5eaede50e..d105677560464 100644 --- a/settings.gradle +++ b/settings.gradle @@ -71,6 +71,7 @@ List projects = [ 'distribution:docker:wolfi-docker-aarch64-export', 'distribution:docker:wolfi-docker-export', 'distribution:docker:fips-docker-export', + 'distribution:docker:fips-docker-aarch64-export', 'distribution:packages:aarch64-deb', 'distribution:packages:deb', 'distribution:packages:aarch64-rpm', From 4ed91dfab45a235a620b3ed494e8201220b7467d Mon Sep 17 00:00:00 2001 From: Rene Groeschke Date: Mon, 31 Mar 2025 12:21:39 +0200 Subject: [PATCH 2/3] Add fips aarch64 project folder --- distribution/docker/fips-docker-aarch64-export/build.gradle | 0 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 distribution/docker/fips-docker-aarch64-export/build.gradle diff --git a/distribution/docker/fips-docker-aarch64-export/build.gradle b/distribution/docker/fips-docker-aarch64-export/build.gradle new file mode 100644 index 0000000000000..e69de29bb2d1d From 6ea37a2c2ee384c467720fc4c3bb86f306832c4d Mon Sep 17 00:00:00 2001 From: Rene Groeschke Date: Mon, 31 Mar 2025 12:36:31 +0200 Subject: [PATCH 3/3] Tweak empty build script --- .../docker/fips-docker-aarch64-export/build.gradle | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/distribution/docker/fips-docker-aarch64-export/build.gradle b/distribution/docker/fips-docker-aarch64-export/build.gradle index e69de29bb2d1d..0f98e90b4d52e 100644 --- a/distribution/docker/fips-docker-aarch64-export/build.gradle +++ b/distribution/docker/fips-docker-aarch64-export/build.gradle @@ -0,0 +1,9 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the "Elastic License + * 2.0", the "GNU Affero General Public License v3.0 only", and the "Server Side + * Public License v 1"; you may not use this file except in compliance with, at + * your election, the "Elastic License 2.0", the "GNU Affero General Public + * License v3.0 only", or the "Server Side Public License, v 1". + */ +