From 16ce7c07cf7f25a9b04bcf083277c273136fff7a Mon Sep 17 00:00:00 2001 From: Kroese Date: Mon, 9 Oct 2023 02:50:59 +0200 Subject: [PATCH] fix: Install platform dependant packages --- Dockerfile | 43 +++++++++++++++++++++++-------------------- 1 file changed, 23 insertions(+), 20 deletions(-) diff --git a/Dockerfile b/Dockerfile index 3324338..eebf3e3 100644 --- a/Dockerfile +++ b/Dockerfile @@ -9,32 +9,35 @@ FROM qemux/qemu-host as builder FROM debian:bookworm-slim +ARG TARGETARCH ARG DEBCONF_NOWARNINGS="yes" ARG DEBIAN_FRONTEND noninteractive -RUN if [ "$TARGETPLATFORM" = "linux/amd64" ]; then \ - ADD_PKG="xserver-xorg-video-intel"; fi && \ +RUN if [ "$TARGETARCH" = "arm64" ]; then \ + PKG="qemu-user"; fi && \ + if [ "$TARGETARCH" = "amd64" ]; then \ + PKG="xserver-xorg-video-intel"; fi && \ apt-get update && apt-get -y upgrade && \ apt-get --no-install-recommends -y install \ - curl \ - cpio \ - wget \ - fdisk \ - unzip \ - socat \ - procps \ - xz-utils \ - iptables \ - iproute2 \ - dnsmasq \ - net-tools \ - ca-certificates \ - netcat-openbsd \ - qemu-system-x86 \ - ${ADD_PKG} \ + curl \ + cpio \ + wget \ + fdisk \ + unzip \ + socat \ + procps \ + xz-utils \ + iptables \ + iproute2 \ + dnsmasq \ + net-tools \ + ca-certificates \ + netcat-openbsd \ + qemu-system-x86 \ + ${PKG} \ && apt-get clean \ && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* - + COPY run/*.sh /run/ COPY agent/*.sh /agent/ @@ -46,7 +49,7 @@ VOLUME /storage EXPOSE 22 EXPOSE 80 -EXPOSE 139 +EXPOSE 139 EXPOSE 445 EXPOSE 5000