From 503c63781e60097314b9fe663dba3a742ceafb94 Mon Sep 17 00:00:00 2001 From: Trim21 Date: Wed, 29 May 2024 03:34:25 +0800 Subject: [PATCH] fix: mergefs again (#754) --- distribution/containers/Dockerfile.distroless | 6 ++---- distribution/containers/Dockerfile.release | 3 ++- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/distribution/containers/Dockerfile.distroless b/distribution/containers/Dockerfile.distroless index 59fd973a..6e1d5c79 100644 --- a/distribution/containers/Dockerfile.distroless +++ b/distribution/containers/Dockerfile.distroless @@ -1,5 +1,3 @@ -FROM docker.io/jesec/busybox-applets as busybox - FROM docker.io/alpine as build WORKDIR /root @@ -15,9 +13,9 @@ RUN if [[ `uname -m` == "aarch64" ]]; \ fi RUN mv flood /root/sysroot/bin/flood -COPY --from=busybox /bin/busybox_DF /root/sysroot/bin/df -RUN apk --no-cache add tini-static +RUN apk --no-cache add tini-static coreutils +COPY /bin/df /root/sysroot/bin/df RUN cp /sbin/tini-static /root/sysroot/bin/tini RUN chmod 0555 /root/sysroot/bin/* diff --git a/distribution/containers/Dockerfile.release b/distribution/containers/Dockerfile.release index f9973f7d..4d1e8d53 100644 --- a/distribution/containers/Dockerfile.release +++ b/distribution/containers/Dockerfile.release @@ -13,7 +13,8 @@ RUN npm i -g "${PACKAGE}"@"${VERSION}" &&\ # Install runtime dependencies RUN apk --no-cache add \ mediainfo \ - tini + tini \ + coreutils # Create "download" user RUN adduser -h /home/download -s /sbin/nologin --disabled-password download