From fdf946698336b000bf79cacd3f85be7ff3654ff4 Mon Sep 17 00:00:00 2001
From: Arne Franken <coding@techotronic.de>
Date: Tue, 23 Nov 2021 12:47:53 +0100
Subject: [PATCH] WIP try building arm64 image on arm64

Currently still fails without rosetta compatibility mode, see ticket.

Fixes #313
---
 docker/src/main/docker/Dockerfile | 30 +-----------------------------
 1 file changed, 1 insertion(+), 29 deletions(-)

diff --git a/docker/src/main/docker/Dockerfile b/docker/src/main/docker/Dockerfile
index b61b2f775..001bde35e 100644
--- a/docker/src/main/docker/Dockerfile
+++ b/docker/src/main/docker/Dockerfile
@@ -14,39 +14,11 @@
 #  limitations under the License.
 #
 
-FROM adoptopenjdk/openjdk11:${adoptopenjdk11.image.version} as staging_area
-
-# create a minimal jdk assembly with those modules that we need
-RUN jlink \
-    --module-path $JAVA_HOME/jmods \
-    --verbose \
-    --add-modules java.base,java.logging,java.xml,jdk.unsupported,java.sql,java.naming,java.desktop,java.management,java.security.jgss,java.instrument \
-    --compress 2 \
-    --no-header-files \
-    --no-man-pages \
-    --strip-debug \
-    --output /target/opt/jdk-minimal
-
-# add libz* files, so that we don't have to re-install that (not included in alpine-glibc)
-RUN mkdir -p /target/usr/glibc-compat/lib; \
-    cp /usr/glibc-compat/lib/libz* /target/usr/glibc-compat/lib
-
-#
-# build the actual image
-#
-FROM frolvlad/alpine-glibc:${alpine-glibc.image.version}
-
-# copy files prepared in the other container
-COPY --from=staging_area /target /
-
-# rebuild ld.so.cache to add libz
-RUN /usr/glibc-compat/sbin/ldconfig
+FROM arm64v8/openjdk:17
 
 ENV LANG=en_US.UTF-8 \
     LANGUAGE=en_US:en \
     LC_ALL=en_US.UTF-8 \
-    JAVA_HOME=/opt/jdk-minimal \
-    PATH="$PATH:/opt/jdk-minimal/bin" \
     root=/s3mockroot
 
 EXPOSE 9090 9191