Update corretto base image to Java 17 and build for arm64 too. (#142)

Author: Anuraag Agrawal

.github/workflows/docker-build-corretto-slim.yml

@@ -27,21 +27,17 @@ jobs:
       - name: Login to ECR
         run: aws ecr-public get-login-password | docker login --username AWS --password-stdin public.ecr.aws
 
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v1
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v1
-      - name: Cache Docker layers
-        uses: actions/cache@v2
-        with:
-          path: /tmp/.buildx-cache
-          key: ${{ runner.os }}-buildx-${{ github.sha }}
-          restore-keys: |
-            ${{ runner.os }}-buildx-
       - name: Build docker image
         uses: docker/build-push-action@v2
         with:
           push: true
           context: scripts/docker/corretto-slim
+          platforms: linux/amd64,linux/arm64
           tags: |
             public.ecr.aws/u0d6r4y4/amazoncorretto-distroless:alpha
-          cache-from: type=local,src=/tmp/.buildx-cache
-          cache-to: type=local,dest=/tmp/.buildx-cache
+          cache-from: type=registry,ref=user/app:latest
+          cache-to: type=inline

scripts/docker/corretto-slim/Dockerfile

@@ -1,24 +1,24 @@
-FROM amazoncorretto:11-alpine-jdk
+FROM amazoncorretto:17-alpine-jdk
 
 # Copied from https://github.com/corretto/corretto-docker/blob/master/11/jre/alpine/Dockerfile
-RUN jlink --endian little --release-info $JAVA_HOME/release \
+RUN apk update && apk add binutils && jlink --endian little --release-info $JAVA_HOME/release \
             --add-modules "java.base,java.datatransfer,java.desktop,java.instrument,java.logging,java.management,java.management.rmi,java.naming,java.prefs,\
 java.rmi,java.security.sasl,java.xml,jdk.internal.vm.ci,jdk.jfr,jdk.management,jdk.management.jfr,jdk.management.agent,jdk.net,jdk.sctp,jdk.unsupported,\
-jdk.naming.rmi,java.compiler,jdk.aot,jdk.internal.vm.compiler,jdk.internal.vm.compiler.management,java.se,java.net.http,java.scripting,java.security.jgss,\
+jdk.naming.rmi,java.compiler,jdk.internal.vm.compiler,jdk.internal.vm.compiler.management,java.se,java.net.http,java.scripting,java.security.jgss,\
 java.smartcardio,java.sql,java.sql.rowset,java.transaction.xa,java.xml.crypto,jdk.accessibility,jdk.charsets,jdk.crypto.cryptoki,jdk.crypto.ec,\
-jdk.dynalink,jdk.httpserver,jdk.jsobject,jdk.localedata,jdk.naming.dns,jdk.scripting.nashorn,jdk.security.auth,jdk.security.jgss,jdk.xml.dom,jdk.zipfs,\
-jdk.pack,jdk.scripting.nashorn.shell,jdk.jcmd,jdk.jfr" \
-            --no-man-pages --no-header-files --strip-debug --output /temp/java-11-amazon-corretto
+jdk.dynalink,jdk.httpserver,jdk.jsobject,jdk.localedata,jdk.naming.dns,jdk.security.auth,jdk.security.jgss,jdk.xml.dom,jdk.zipfs,\
+jdk.jcmd,jdk.jfr" \
+            --no-man-pages --no-header-files --strip-debug --output /temp/java-17-amazon-corretto
 
-FROM alpine:3.12
+FROM alpine:3.14
 
-COPY --from=0 /temp/java-11-amazon-corretto /usr/lib/jvm/java-11-amazon-corretto
+COPY --from=0 /temp/java-17-amazon-corretto /usr/lib/jvm/java-17-amazon-corretto
 COPY --from=0 /licenses /licenses
 
 RUN apk update && apk add libc6-compat ca-certificates && rm -rf /var/cache/apk/*
 
 ENV LANG C.UTF-8
-ENV JAVA_HOME=/usr/lib/jvm/java-11-amazon-corretto
-ENV PATH=$PATH:/usr/lib/jvm/java-11-amazon-corretto/bin
+ENV JAVA_HOME=/usr/lib/jvm/java-17-amazon-corretto
+ENV PATH=$PATH:/usr/lib/jvm/java-17-amazon-corretto/bin
 
 ENTRYPOINT ["java", "-jar"]