From 7875129922f44af0218d518f536b23df6534256a Mon Sep 17 00:00:00 2001 From: tcely Date: Fri, 13 Jun 2025 18:45:59 -0400 Subject: [PATCH 1/2] Use the `s6-overlay` image --- Dockerfile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index a54c68e6..aaff8392 100644 --- a/Dockerfile +++ b/Dockerfile @@ -279,9 +279,11 @@ RUN set -eu ; \ set +x ; \ unset -v f ; -FROM scratch AS s6-overlay +FROM scratch AS s6-overlay-old COPY --from=s6-overlay-extracted /s6-overlay-rootfs / +FROM ghcr.io/tcely/s6-overlay:v${S6_VERSION} AS s6-overlay + FROM tubesync-base AS tubesync-uv COPY --from=uv-binaries /uv /uvx /usr/local/bin/ From 40f8ebc400a0ef40380c524de754e029207d9f2f Mon Sep 17 00:00:00 2001 From: tcely Date: Fri, 13 Jun 2025 19:19:28 -0400 Subject: [PATCH 2/2] Compare the s6-overlay files --- Dockerfile | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/Dockerfile b/Dockerfile index aaff8392..7a79ddd5 100644 --- a/Dockerfile +++ b/Dockerfile @@ -279,10 +279,14 @@ RUN set -eu ; \ set +x ; \ unset -v f ; -FROM scratch AS s6-overlay-old -COPY --from=s6-overlay-extracted /s6-overlay-rootfs / +FROM ghcr.io/tcely/s6-overlay:v${S6_VERSION} AS s6-overlay-img -FROM ghcr.io/tcely/s6-overlay:v${S6_VERSION} AS s6-overlay +FROM tubesync-base AS s6-overlay +COPY --from=s6-overlay-extracted /s6-overlay-rootfs /old +COPY --from=s6-overlay-img / /new +RUN echo Old tar: && tar -C /old -c . | sha256sum ; \ + echo New tar: && tar -C /new -c . | sha256sum ; \ + diff -r /old /new FROM tubesync-base AS tubesync-uv COPY --from=uv-binaries /uv /uvx /usr/local/bin/ @@ -381,7 +385,7 @@ RUN --mount=type=cache,id=apt-lib-cache-${TARGETARCH},sharing=private,target=/va rm -v -f /var/cache/debconf/*.dat-old # Install third party software -COPY --from=s6-overlay / / +COPY --from=s6-overlay /old / COPY --from=ffmpeg /usr/local/bin/ /usr/local/bin/ RUN --mount=type=cache,id=apt-lib-cache-${TARGETARCH},sharing=private,target=/var/lib/apt \