make the installer image work for ARM64 and AMD64

This commit is contained in:
Quinten
2023-07-29 19:21:34 +02:00
committed by GitHub
parent 1246f2b681
commit 310ed2569e
2 changed files with 11 additions and 5 deletions

View File

@@ -21,6 +21,7 @@ jobs:
- ubuntu - ubuntu
steps: steps:
- uses: actions/checkout@v3 - uses: actions/checkout@v3
- uses: docker/setup-qemu-action@v2
- uses: docker/setup-buildx-action@v2 - uses: docker/setup-buildx-action@v2
with: with:
buildkitd-flags: --debug buildkitd-flags: --debug
@@ -33,7 +34,7 @@ jobs:
with: with:
context: ./installers context: ./installers
file: ./installers/${{ matrix.tag }}/Dockerfile file: ./installers/${{ matrix.tag }}/Dockerfile
platforms: linux/amd64 platforms: linux/amd64,linux/arm64
push: true push: true
tags: | tags: |
ghcr.io/parkervcp/installers:${{ matrix.tag }} ghcr.io/parkervcp/installers:${{ matrix.tag }}

View File

@@ -29,7 +29,12 @@ LABEL org.opencontainers.image.licenses=MIT
ENV DEBIAN_FRONTEND=noninteractive ENV DEBIAN_FRONTEND=noninteractive
RUN dpkg --add-architecture i386 \ RUN apt update && apt upgrade -y \
&& apt update \ && apt -y --no-install-recommends install ca-certificates curl git unzip zip tar jq wget
&& 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 # 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