From ea61b156b151cb606723ce0ab3a889c6f1dd1bc3 Mon Sep 17 00:00:00 2001 From: Kroese Date: Fri, 12 May 2023 13:29:54 +0200 Subject: [PATCH 1/4] Update build.yml --- .github/workflows/build.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 118286c..009d160 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -11,6 +11,7 @@ on: - '.dockerignore' - '.github/**' - '.github/workflows/**' + - 'Dockerfile' jobs: shellcheck: From 54336bb8c998783066b91c9895dbbcfd57caf889 Mon Sep 17 00:00:00 2001 From: Kroese Date: Fri, 12 May 2023 13:39:55 +0200 Subject: [PATCH 2/4] Clean apt lists --- Dockerfile | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/Dockerfile b/Dockerfile index a9751e6..95f3dec 100644 --- a/Dockerfile +++ b/Dockerfile @@ -13,7 +13,7 @@ ARG DEBCONF_NOWARNINGS="yes" ARG DEBIAN_FRONTEND noninteractive RUN apt-get update && apt-get -y upgrade && \ - apt-get --no-install-recommends -y install \ + apt-get --no-install-recommends -y install \ curl \ cpio \ wget \ @@ -31,16 +31,14 @@ RUN apt-get update && apt-get -y upgrade && \ ca-certificates \ qemu-system-x86 \ && apt-get clean - + && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* + COPY run/*.sh /run/ COPY agent/*.sh /agent/ COPY --from=builder /qemu-host.bin /run/host.bin -RUN ["chmod", "+x", "/run/run.sh"] -RUN ["chmod", "+x", "/run/check.sh"] -RUN ["chmod", "+x", "/run/server.sh"] -RUN ["chmod", "+x", "/run/host.bin"] +RUN ["chmod", "+x", "/run/run.sh /run/check.sh /run/server.sh /run/host.bin"] VOLUME /storage From c25ab5e6548a6cbc745d5e62082f37b869fd4e27 Mon Sep 17 00:00:00 2001 From: Kroese Date: Fri, 12 May 2023 13:42:20 +0200 Subject: [PATCH 3/4] Clean apt lists --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 95f3dec..28372f6 100644 --- a/Dockerfile +++ b/Dockerfile @@ -30,7 +30,7 @@ RUN apt-get update && apt-get -y upgrade && \ netcat-openbsd \ ca-certificates \ qemu-system-x86 \ - && apt-get clean + && apt-get clean \ && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* COPY run/*.sh /run/ From ee28f72737a267b50e90b21b483524252ddadcd0 Mon Sep 17 00:00:00 2001 From: Kroese Date: Fri, 12 May 2023 13:51:11 +0200 Subject: [PATCH 4/4] chmod scripts --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 28372f6..9efb952 100644 --- a/Dockerfile +++ b/Dockerfile @@ -38,7 +38,7 @@ COPY agent/*.sh /agent/ COPY --from=builder /qemu-host.bin /run/host.bin -RUN ["chmod", "+x", "/run/run.sh /run/check.sh /run/server.sh /run/host.bin"] +RUN chmod +x /run/*.sh && chmod +x /run/*.bin VOLUME /storage