Merge pull request #168 from parkervcp/multi-installers

Make the installer image work for ARM64 and AMD64
pelican-eggs · Aug 14, 2023 · 98585d0 · 98585d0
2 parents 0ac62fc + 310ed25
commit 98585d0
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 5 deletions.
diff --git a/.github/workflows/installers.yml b/.github/workflows/installers.yml
@@ -21,6 +21,7 @@ jobs:
           - ubuntu
     steps:
       - uses: actions/checkout@v3
+      - uses: docker/setup-qemu-action@v2
       - uses: docker/setup-buildx-action@v2
         with:
           buildkitd-flags: --debug
@@ -33,7 +34,7 @@ jobs:
         with:
           context: ./installers
           file: ./installers/${{ matrix.tag }}/Dockerfile
-          platforms: linux/amd64
+          platforms: linux/amd64,linux/arm64
           push: true
           tags: |
             ghcr.io/parkervcp/installers:${{ matrix.tag }}
diff --git a/installers/debian/Dockerfile b/installers/debian/Dockerfile
@@ -29,7 +29,12 @@ LABEL       org.opencontainers.image.licenses=MIT
 
 ENV         DEBIAN_FRONTEND=noninteractive
 
-RUN         dpkg --add-architecture i386 \
-				&& apt update \
-				&& apt upgrade -y \
-				&& apt -y --no-install-recommends install ca-certificates curl lib32gcc-s1 libsdl2-2.0-0:i386 git unzip zip tar jq wget
+RUN      apt update && apt upgrade -y \
+         && apt -y --no-install-recommends install ca-certificates curl git unzip zip tar jq wget
+
+# Only install the needed steamcmd packages on the AMD64 build
+RUN         if [ "$(uname -m)" = "x86_64" ]; then \
+                dpkg --add-architecture i386 && \
+                apt update && \
+                apt -y install lib32gcc-s1 libsdl2-2.0-0:i386; \
+            fi