Merge pull request #10 from besanur/release_1.1.0

fix build
besanur · Nov 6, 2022 · f41ef7c · f41ef7c
2 parents 861a11b + 5c95ec8
commit f41ef7c
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 11 deletions.
diff --git a/.github/workflows/builder.yml b/.github/workflows/builder.yml
@@ -14,7 +14,7 @@ jobs:
     strategy:
       matrix:
         addon: ["prayer-times"]
-        arch: ["aarch64", "amd64"]
+        arch: ["aarch64", "amd64", "armv7"]
 
     steps:
       - name: Check out repository
@@ -30,14 +30,14 @@ jobs:
         id: check
         run: |
           if [[ "${{ steps.info.outputs.architectures }}" =~ ${{ matrix.arch }} ]]; then
-             echo "::set-output name=build_arch::true";
-             echo "::set-output name=image::$(echo ${{ steps.info.outputs.image }} | cut -d'/' -f3)";
+             echo "{build_arch}={true}" >> $GITHUB_OUTPUT
+             echo "{image}={$(echo ${{ steps.info.outputs.image }} | cut -d'/' -f3)}" >> $GITHUB_OUTPUT
              if [[ -z "${{ github.head_ref }}" ]] && [[ "${{ github.event_name }}" == "push" ]]; then
                  echo "BUILD_ARGS=" >> $GITHUB_ENV;
              fi
            else
              echo "${{ matrix.arch }} is not a valid arch for ${{ matrix.addon }}, skipping build";
-             echo "::set-output name=build_arch::false";
+             echo "{build_arch}={false}" >> $GITHUB_OUTPUT<
           fi
 
       - name: Login to DockerHub

diff --git a/prayer-times/Dockerfile b/prayer-times/Dockerfile
@@ -1,16 +1,16 @@
 ARG BUILD_FROM
 
 # Builder image
-FROM eclipse-temurin:17-jdk as builder
+FROM --platform=$BUILDPLATFORM eclipse-temurin:17-jdk as builder
 
 # Create a custom Java runtime
 RUN $JAVA_HOME/bin/jlink \
-         --add-modules java.base,java.logging,java.naming,java.desktop,java.management,java.security.jgss,java.instrument,java.sql \
-         --strip-debug \
-         --no-man-pages \
-         --no-header-files \
-         --compress=2 \
-         --output /javaruntime
+    --add-modules java.base,java.logging,java.naming,java.desktop,java.management,java.security.jgss,java.instrument,java.sql \
+    --strip-debug \
+    --no-man-pages \
+    --no-header-files \
+    --compress=2 \
+    --output /javaruntime
 
 WORKDIR /workspace/app