From 75e84ec718572b793a8cf20f198a2ddd066a7bc2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=B3=E9=88=9E?= Date: Sat, 11 May 2024 19:55:04 +0800 Subject: [PATCH] feat: change to upx compressed ffmpeg and dumb-init MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - Remove `dumb-init` from the list of installed packages in the Dockerfile - Update the ffmpeg and ffprobe sources from `mwader/static-ffmpeg:7.0-1` to `ghcr.io/jim60105/static-ffmpeg-upx:7.0-1` - Add `dumb-init` to the Dockerfile explicitly using a COPY instruction rather than installing as a package Signed-off-by: 陳鈞 --- Dockerfile | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/Dockerfile b/Dockerfile index 2b121d4..5b5c583 100644 --- a/Dockerfile +++ b/Dockerfile @@ -30,8 +30,7 @@ RUN --mount=type=cache,id=apt-$TARGETARCH$TARGETVARIANT,sharing=locked,target=/v # https://pillow.readthedocs.io/en/stable/installation/building-from-source.html libjpeg62-turbo-dev libwebp-dev zlib1g-dev \ libgl1 libglib2.0-0 libgoogle-perftools-dev \ - git libglfw3-dev libgles2-mesa-dev pkg-config libcairo2 build-essential \ - dumb-init + git libglfw3-dev libgles2-mesa-dev pkg-config libcairo2 build-essential ######################################## # Build stage @@ -126,8 +125,11 @@ RUN install -d -m 775 -o $UID -g 0 ${CACHE_HOME} && \ COPY --link --from=ghcr.io/tarampampam/curl:8.7.1 /bin/curl /usr/local/bin/ # ffmpeg -COPY --link --from=mwader/static-ffmpeg:7.0-1 /ffmpeg /usr/local/bin/ -COPY --link --from=mwader/static-ffmpeg:7.0-1 /ffprobe /usr/local/bin/ +COPY --link --from=ghcr.io/jim60105/static-ffmpeg-upx:7.0-1 /ffmpeg /usr/local/bin/ +COPY --link --from=ghcr.io/jim60105/static-ffmpeg-upx:7.0-1 /ffprobe /usr/local/bin/ + +# dumb-init +COPY --link --from=ghcr.io/jim60105/static-ffmpeg-upx:7.0-1 /dumb-init /usr/bin/ # Copy licenses (OpenShift Policy) COPY --link --chown=$UID:0 --chmod=775 LICENSE /licenses/Dockerfile.LICENSE