mirror of
https://github.com/meeb/tubesync.git
synced 2025-06-18 11:06:36 +00:00
Merge 40f8ebc400
into 73fa950c59
This commit is contained in:
commit
fd01eed8be
12
Dockerfile
12
Dockerfile
@ -279,8 +279,14 @@ RUN set -eu ; \
|
|||||||
set +x ; \
|
set +x ; \
|
||||||
unset -v f ;
|
unset -v f ;
|
||||||
|
|
||||||
FROM scratch AS s6-overlay
|
FROM ghcr.io/tcely/s6-overlay:v${S6_VERSION} AS s6-overlay-img
|
||||||
COPY --from=s6-overlay-extracted /s6-overlay-rootfs /
|
|
||||||
|
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
|
FROM tubesync-base AS tubesync-uv
|
||||||
COPY --from=uv-binaries /uv /uvx /usr/local/bin/
|
COPY --from=uv-binaries /uv /uvx /usr/local/bin/
|
||||||
@ -379,7 +385,7 @@ RUN --mount=type=cache,id=apt-lib-cache-${TARGETARCH},sharing=private,target=/va
|
|||||||
rm -v -f /var/cache/debconf/*.dat-old
|
rm -v -f /var/cache/debconf/*.dat-old
|
||||||
|
|
||||||
# Install third party software
|
# Install third party software
|
||||||
COPY --from=s6-overlay / /
|
COPY --from=s6-overlay /old /
|
||||||
COPY --from=ffmpeg /usr/local/bin/ /usr/local/bin/
|
COPY --from=ffmpeg /usr/local/bin/ /usr/local/bin/
|
||||||
|
|
||||||
RUN --mount=type=cache,id=apt-lib-cache-${TARGETARCH},sharing=private,target=/var/lib/apt \
|
RUN --mount=type=cache,id=apt-lib-cache-${TARGETARCH},sharing=private,target=/var/lib/apt \
|
||||||
|
Loading…
Reference in New Issue
Block a user