From 06e51bfec63d938d8cdefa2c9728092cbbeeda05 Mon Sep 17 00:00:00 2001 From: pi-farm Date: Thu, 30 Jan 2025 19:51:04 +0100 Subject: [PATCH] dockerfile fixed --- dockerfile | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/dockerfile b/dockerfile index de4be73..b5a3737 100644 --- a/dockerfile +++ b/dockerfile @@ -1,4 +1,4 @@ -FROM ubuntu:20.10 +FROM ubuntu:24.10 RUN apt-get update && apt-get upgrade -y && apt-get autoremove -y RUN apt-get install unzip fdisk util-linux nano xz-utils wget systemctl sudo git tcpdump -y @@ -6,12 +6,13 @@ RUN apt-get install unzip fdisk util-linux nano xz-utils wget systemctl sudo git ADD https://github.com/just-containers/s6-overlay/releases/download/v3.1.6.0/s6-overlay-noarch.tar.xz /tmp RUN tar -C / -Jxpf /tmp/s6-overlay-noarch.tar.xz -ARG arch -RUN if [ "$arch" = "x86_64" ] ; then wget -O /tmp/s6-overlay-i686.tar.xz https://github.com/just-containers/s6-overlay/releases/download/v3.1.6.0/s6-overlay-i686.tar.xz ; fi; -RUN if [ "$arch" = "x86_64" ] ; then tar -C / -Jxpf /tmp/s6-overlay-i686.tar.xz ; fi; - -RUN if [ "$arch" = "arm64" ] ; then wget -O /tmp/s6-overlay-aarch64.tar.xz https://github.com/just-containers/s6-overlay/releases/download/v3.1.6.0/s6-overlay-aarch64.tar.xz ; fi; -RUN if [ "$arch" = "arm64" ] ; then tar -C / -Jxpf /tmp/s6-overlay-aarch64.tar.xz ; fi; +#ARG arch +RUN if [ "$(arch)" = "x86_64" ] ; then wget -O /tmp/s6-overlay-i686.tar.xz https://github.com/just-containers/s6-overlay/releases/download/v3.1.6.0/s6-overlay-i686.tar.xz ; fi; +RUN if [ "$(arch)" = "x86_64" ] ; then tar -C / -Jxpf /tmp/s6-overlay-i686.tar.xz ; fi; +RUN wget -O /tmp/s6-overlay-aarch64.tar.xz https://github.com/just-containers/s6-overlay/releases/download/v3.1.6.0/s6-overlay-aarch64.tar.xz +RUN if [ "$(arch)" = "aarch64" ] ; then wget -O /tmp/s6-overlay-aarch64.tar.xz https://github.com/just-containers/s6-overlay/releases/download/v3.1.6.0/s6-overlay-aarch64.tar.xz ; fi; +RUN if [ "$(arch)" = "aarch64" ] ; then tar -C / -Jxpf /tmp/s6-overlay-aarch64.tar.xz ; fi; +RUN tar -C / -Jxpf /tmp/s6-overlay-aarch64.tar.xz RUN mkdir /app RUN mkdir /app/RPi-PXE-Server @@ -27,4 +28,4 @@ RUN rm -rf /temp/* WORKDIR /app/RPi-PXE-Server -ENTRYPOINT [ "/init" ] \ No newline at end of file +ENTRYPOINT [ "/init" ]