Container: Try using arm64 hosted runner

badlop · Jan 17, 2025 · 351a00f · 351a00f
1 parent 17f1f8d
commit 351a00f
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 5 deletions.
diff --git a/.github/container/Dockerfile b/.github/container/Dockerfile
@@ -44,6 +44,7 @@ RUN wget -O - https://github.com/elixir-lang/elixir/archive/v$ELIXIR_VSN.tar.gz
 WORKDIR elixir-$ELIXIR_VSN
 ENV ERL_FLAGS="+JPperf true"
 RUN make install clean
+RUN pwd
 
 RUN mix local.hex --force \
     && mix local.rebar --force
@@ -62,6 +63,9 @@ RUN mv .github/container/ejabberdctl.template . \
 WORKDIR /rootfs
 ARG VERSION
 ARG HOME
+RUN echo "build_dir: $BUILD_DIR"
+RUN echo "home: $HOME"
+RUN echo "home: $HOME"
 RUN mkdir -p $HOME $HOME-$VERSION \
     && cp -r $BUILD_DIR/_build/prod/rel/ejabberd/* $HOME-$VERSION \
     && mv $HOME-$VERSION/conf $HOME/conf

diff --git a/.github/workflows/container.yml b/.github/workflows/container.yml
@@ -17,7 +17,10 @@ env:
 jobs:
   container:
     name: Container
-    runs-on: ubuntu-22.04
+    runs-on: ${{ matrix.platform == 'arm64' && 'ubuntu-22.04-arm' || 'ubuntu-22.04' }}
+    strategy:
+      matrix:
+        platform: [amd64, arm64]
     permissions:
       packages: write
     steps:
@@ -53,9 +56,6 @@ jobs:
             org.opencontainers.image.licenses=GPL-2.0
             org.opencontainers.image.vendor=ProcessOne
 
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v3
-
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3
 
@@ -69,6 +69,6 @@ jobs:
           context: .
           file: .github/container/Dockerfile
           labels: ${{ steps.meta.outputs.labels }}
-          platforms: linux/amd64,linux/arm64
+          platforms: linux/${{ matrix.platform }}
           push: true
           tags: ${{ steps.meta.outputs.tags }}