build: switch to Amazon Corretto

Hopefully improved performance on AWS Graviton

1 files changed, 36 insertions, 10 deletions

diff --git a/docker/Dockerfile b/docker/Dockerfile
index 1485e95b..89fa454e 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -2,19 +2,45 @@
 #
 # SPDX-License-Identifier: EPL-2.0
 
-FROM docker.io/eclipse-temurin:17-jammy AS jlink
-# Disable HotSpot C1 compilation, because it causes spurious
-# NullPointerException instances to be thrown when running in
-# qemu-aarch64-static for image cross-building.
-ENV _JAVA_OPTIONS="-XX:CompilationMode=high-only"
-# We need to manually add jdk.zipfs to the list of modules output by jdeps to
-# enable serving static assets from the refinery-language-web-VERSION.jar,
-# because the dependency doesn't get picked up by static analysis.
-RUN jlink --no-header-files --no-man-pages --compress=2 --strip-debug --add-modules \
+FROM public.ecr.aws/amazoncorretto/amazoncorretto:17-al2023-jdk AS jdk
+
+FROM --platform=$BUILDPLATFORM docker.io/eclipse-temurin:17-jammy AS jlink-base
+# Use the Ubuntu Jammy based Temurin image for JLink, because it already
+# contains the require objcopy tool for stripping debug symbols:
+# https://github.com/docker-library/openjdk/issues/351
+# We'll have to cross-jlink the JDK: https://stackoverflow.com/a/47611708
+COPY --link --from=jdk /usr/lib/jvm/java-17-amazon-corretto /crossjdk
+
+FROM --platform=$BUILDPLATFORM jlink-base AS jlink-amd64-on-amd64
+
+FROM --platform=$BUILDPLATFORM jlink-base AS jlink-arm64-on-arm64
+
+FROM --platform=$BUILDPLATFORM jlink-base AS jlink-arm64-on-amd64
+# When cross-building the Docker image, we have the wrong toolchain for the
+# target architecture. We forcibly override the target for the objcopy tool.
+# The cross toolchain is not available in Amazon Linux 2023.
+RUN --mount=type=cache,target=/var/cache/apt \
+    apt-get update && \
+    apt-get install binutils-aarch64-linux-gnu && \
+    ln -sf /usr/bin/aarch64-linux-gnu-objcopy /usr/bin/objcopy
+
+FROM --platform=$BUILDPLATFORM jlink-base AS jlink-amd64-on-arm64
+RUN --mount=type=cache,target=/var/cache/apt \
+    apt-get update && \
+    apt-get install binutils-x86-64-linux-gnu && \
+    ln -sf /usr/bin/x86_64-linux-gnu-objcopy /usr/bin/objcopy
+
+FROM --platform=$BUILDPLATFORM jlink-$TARGETARCH-on-$BUILDARCH as jlink
+RUN jlink --no-header-files --no-man-pages --compress=2 \
+    --module-path=/crossjdk/jmods --strip-debug --add-modules \
     java.base,java.compiler,java.desktop,java.instrument,java.management,java.naming,java.rmi,java.security.jgss,java.sql,jdk.unsupported,jdk.zipfs \
     --output /jlink
 
-FROM docker.io/debian:12-slim AS base
+FROM public.ecr.aws/amazonlinux/amazonlinux:2023-minimal AS base
+# The launcher script generated by Gradle uses xargs to parse the argument list.
+RUN --mount=type=cache,id=yum-$TARGETARCH,target=/var/cache/apt \
+    dnf install -y findutils && \
+    dnf clean all
 # The first layer contains the slimmed down JRE.
 COPY --link --from=jlink /jlink /usr/lib/java
 ENV JAVA_HOME="/usr/lib/java" PATH="/usr/lib/java/bin:${PATH}"