From 939507b5f9862577ca4bb5075c0d11d9921d8dff Mon Sep 17 00:00:00 2001 From: Rene Groeschke Date: Mon, 31 Mar 2025 13:41:04 +0200 Subject: [PATCH] [BUILD] Support AARCH64 for docker fips images (#125927) This updates the docker fips base image which support arm and x84 architectures --- .../org/elasticsearch/gradle/internal/DockerBase.java | 3 +-- .../docker/fips-docker-aarch64-export/build.gradle | 9 +++++++++ settings.gradle | 1 + 3 files changed, 11 insertions(+), 2 deletions(-) create mode 100644 distribution/docker/fips-docker-aarch64-export/build.gradle 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 91bffa28f9ef1..c835deead0ee2 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 @@ -28,8 +28,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 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..0f98e90b4d52e --- /dev/null +++ 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". + */ + diff --git a/settings.gradle b/settings.gradle index 5fd5afad9d912..313d1c2d88cf7 100644 --- a/settings.gradle +++ b/settings.gradle @@ -73,6 +73,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',