From a2aec35feb42ff685782dba51262b597a0bda570 Mon Sep 17 00:00:00 2001 From: Dulmandakh Date: Mon, 26 Jun 2023 21:29:52 +0800 Subject: [PATCH 1/3] publish linux/arm64 image --- .github/workflows/publish.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index caaba64..5c00e4f 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -38,5 +38,6 @@ jobs: - name: Build & publish to Docker Hub uses: docker/build-push-action@v2 with: + platforms: linux/amd64,linux/arm64 push: true tags: ${{ steps.tags.outputs.tags }} From e3970223988bdfa13c679aa615007523086152ee Mon Sep 17 00:00:00 2001 From: Dulmandakh Date: Mon, 26 Jun 2023 21:32:29 +0800 Subject: [PATCH 2/3] Update publish.yml --- .github/workflows/publish.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 5c00e4f..86baf07 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -12,6 +12,9 @@ jobs: - name: Check out the repo uses: actions/checkout@v2 + - name: Set up QEMU + uses: docker/setup-qemu-action@v2 + - name: Set up Docker Buildx uses: docker/setup-buildx-action@v1 From c4146419030c6b63d426a489c9cfdcf1513be0a2 Mon Sep 17 00:00:00 2001 From: Dulmandakh Date: Tue, 27 Jun 2023 14:53:31 +0800 Subject: [PATCH 3/3] Update Dockerfile --- Dockerfile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 3889b99..8e78b74 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,7 @@ FROM ubuntu:20.04 +ARG TARGETARCH + LABEL Description="This image provides a base Android development environment for React Native, and may be used to run tests." ENV DEBIAN_FRONTEND=noninteractive @@ -20,7 +22,7 @@ ENV ANDROID_HOME=/opt/android ENV ANDROID_SDK_ROOT=${ANDROID_HOME} ENV ANDROID_NDK_HOME=${ANDROID_HOME}/ndk/$NDK_VERSION -ENV JAVA_HOME=/usr/lib/jvm/java-17-openjdk-amd64 +ENV JAVA_HOME=/usr/lib/jvm/java-17-openjdk-$TARGETARCH ENV CMAKE_BIN_PATH=${ANDROID_HOME}/cmake/$CMAKE_VERSION/bin ENV PATH=${CMAKE_BIN_PATH}:${ANDROID_HOME}/cmdline-tools/latest/bin:${ANDROID_HOME}/emulator:${ANDROID_HOME}/platform-tools:${ANDROID_HOME}/tools:${ANDROID_HOME}/tools/bin:${PATH}