From ab6ba410b3aba37c329c2d7f09bd669cae76bae0 Mon Sep 17 00:00:00 2001 From: Kroese Date: Mon, 25 Mar 2024 15:18:37 +0100 Subject: [PATCH] build: Install wimtools from sid (#312) --- .github/workflows/check.yml | 2 +- Dockerfile | 17 ++++++++++------- 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml index 2c1ce5a..ea76481 100644 --- a/.github/workflows/check.yml +++ b/.github/workflows/check.yml @@ -21,5 +21,5 @@ jobs: uses: hadolint/hadolint-action@v3.1.0 with: dockerfile: Dockerfile - ignore: DL3008 + ignore: DL3008,DL4006,SC3037 failure-threshold: warning diff --git a/Dockerfile b/Dockerfile index e2f6aa5..1c1f450 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,23 +1,26 @@ FROM scratch -COPY --from=qemux/qemu-docker:4.18 / / +COPY --from=qemux/qemu-docker:4.19 / / ARG DEBCONF_NOWARNINGS "yes" ARG DEBIAN_FRONTEND "noninteractive" ARG DEBCONF_NONINTERACTIVE_SEEN "true" -RUN apt-get update \ - && apt-get --no-install-recommends -y install \ +RUN apt-get update && \ + apt-get --no-install-recommends -y install \ curl \ 7zip \ wsdd \ samba \ - wimtools \ dos2unix \ cabextract \ genisoimage \ - libxml2-utils \ - && apt-get clean \ - && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* + libxml2-utils && \ + echo "deb http://deb.debian.org/debian/ sid main" >> /etc/apt/sources.list.d/sid.list && \ + echo -e "Package: *\nPin: release n=trixie\nPin-Priority: 900\nPackage: *\nPin: release n=sid\nPin-Priority: 400" | tee /etc/apt/preferences.d/preferences > /dev/null && \ + apt-get update && \ + apt-get -t sid --no-install-recommends -y install wimtools && \ + apt-get clean && \ + rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* COPY ./src /run/ COPY ./assets /run/assets