From 1cda75879c53d71221d5a73b99646909578420ae Mon Sep 17 00:00:00 2001 From: Michael Mayer Date: Tue, 15 Feb 2022 23:29:57 +0100 Subject: [PATCH] Docker: Add backports.list for debian images Signed-off-by: Michael Mayer --- docker/develop/bullseye/Dockerfile | 7 ++++--- docker/develop/bullseye/backports.list | 1 + docker/develop/buster/Dockerfile | 7 ++++--- docker/develop/buster/backports.list | 1 + docker/photoprism/bullseye/Dockerfile | 5 ++++- docker/photoprism/buster/Dockerfile | 5 ++++- 6 files changed, 18 insertions(+), 8 deletions(-) create mode 100644 docker/develop/bullseye/backports.list create mode 100644 docker/develop/buster/backports.list diff --git a/docker/develop/bullseye/Dockerfile b/docker/develop/bullseye/Dockerfile index 2d1169a5f..a533768f0 100644 --- a/docker/develop/bullseye/Dockerfile +++ b/docker/develop/bullseye/Dockerfile @@ -27,8 +27,9 @@ RUN echo 'Acquire::Retries "10";' > /etc/apt/apt.conf.d/80retry && \ echo 'APT::Get::Assume-Yes "true";' > /etc/apt/apt.conf.d/80forceyes && \ echo 'APT::Get::Fix-Missing "true";' > /etc/apt/apt.conf.d/80fixmissing -# copy scripts to /root/.local/bin +# copy scripts and backports sources COPY --chown=root:root --chmod=755 /docker/scripts/*.sh /root/.local/bin/ +COPY --chown=root:root --chmod=644 /docker/develop/bullseye/backports.list /etc/apt/sources.list.d/backports.list # update image and install build dependencies RUN apt-get update && apt-get -qq dist-upgrade && apt-get -qq install --no-install-recommends \ @@ -74,7 +75,6 @@ RUN apt-get update && apt-get -qq dist-upgrade && apt-get -qq install --no-insta fonts-roboto \ tzdata \ exiftool \ - darktable \ rawtherapee \ ffmpeg \ ffmpegthumbnailer \ @@ -83,6 +83,7 @@ RUN apt-get update && apt-get -qq dist-upgrade && apt-get -qq install --no-insta chrpath \ lsof \ apache2-utils && \ + apt-get -qq install -t bullseye-backports darktable && \ curl -sL https://deb.nodesource.com/setup_16.x | bash - && \ apt-get update && apt-get -qq install nodejs && \ npm install --unsafe-perm=true --allow-root -g npm && \ @@ -138,4 +139,4 @@ EXPOSE 2342 2343 9515 40000 ENTRYPOINT ["/entrypoint.sh"] # keep container running -CMD ["tail", "-f", "/dev/null"] \ No newline at end of file +CMD ["tail", "-f", "/dev/null"] diff --git a/docker/develop/bullseye/backports.list b/docker/develop/bullseye/backports.list new file mode 100644 index 000000000..f1461ab84 --- /dev/null +++ b/docker/develop/bullseye/backports.list @@ -0,0 +1 @@ +deb http://deb.debian.org/debian bullseye-backports main contrib non-free diff --git a/docker/develop/buster/Dockerfile b/docker/develop/buster/Dockerfile index 83f61f651..2ebd47d28 100644 --- a/docker/develop/buster/Dockerfile +++ b/docker/develop/buster/Dockerfile @@ -27,8 +27,9 @@ RUN echo 'Acquire::Retries "10";' > /etc/apt/apt.conf.d/80retry && \ echo 'APT::Get::Assume-Yes "true";' > /etc/apt/apt.conf.d/80forceyes && \ echo 'APT::Get::Fix-Missing "true";' > /etc/apt/apt.conf.d/80fixmissing -# copy scripts to /root/.local/bin +# copy scripts and backports sources COPY --chown=root:root --chmod=755 /docker/scripts/*.sh /root/.local/bin/ +COPY --chown=root:root --chmod=644 /docker/develop/buster/backports.list /etc/apt/sources.list.d/backports.list # update image and install build dependencies RUN apt-get update && apt-get -qq dist-upgrade && apt-get -qq install --no-install-recommends \ @@ -74,7 +75,6 @@ RUN apt-get update && apt-get -qq dist-upgrade && apt-get -qq install --no-insta fonts-roboto \ tzdata \ exiftool \ - darktable \ rawtherapee \ ffmpeg \ ffmpegthumbnailer \ @@ -83,6 +83,7 @@ RUN apt-get update && apt-get -qq dist-upgrade && apt-get -qq install --no-insta chrpath \ lsof \ apache2-utils && \ + apt-get -qq install -t buster-backports darktable && \ curl -sL https://deb.nodesource.com/setup_16.x | bash - && \ apt-get update && apt-get -qq install nodejs && \ npm install --unsafe-perm=true --allow-root -g npm && \ @@ -138,4 +139,4 @@ EXPOSE 2342 2343 9515 40000 ENTRYPOINT ["/entrypoint.sh"] # keep container running -CMD ["tail", "-f", "/dev/null"] \ No newline at end of file +CMD ["tail", "-f", "/dev/null"] diff --git a/docker/develop/buster/backports.list b/docker/develop/buster/backports.list new file mode 100644 index 000000000..e3331567d --- /dev/null +++ b/docker/develop/buster/backports.list @@ -0,0 +1 @@ +deb http://deb.debian.org/debian buster-backports main contrib non-free diff --git a/docker/photoprism/bullseye/Dockerfile b/docker/photoprism/bullseye/Dockerfile index 5cfecf454..6d5e79918 100644 --- a/docker/photoprism/bullseye/Dockerfile +++ b/docker/photoprism/bullseye/Dockerfile @@ -33,6 +33,9 @@ RUN echo 'Acquire::Retries "10";' > /etc/apt/apt.conf.d/80retry && \ echo 'APT::Get::Assume-Yes "true";' > /etc/apt/apt.conf.d/80forceyes && \ echo 'APT::Get::Fix-Missing "true";' > /etc/apt/apt.conf.d/80fixmissing +# copy backports sources +COPY --chown=root:root --chmod=644 /docker/develop/bullseye/backports.list /etc/apt/sources.list.d/backports.list + # Install additional distribution packages RUN apt-get update && apt-get -qq dist-upgrade && apt-get -qq install --no-install-recommends \ gpgv \ @@ -57,7 +60,7 @@ RUN apt-get update && apt-get -qq dist-upgrade && apt-get -qq install --no-insta ffmpeg \ ffmpegthumbnailer \ libavcodec-extra && \ - [ "$TARGETARCH" = "arm" ] || apt-get -y install darktable; \ + [ "$TARGETARCH" = "arm" ] || apt-get -qq install -t bullseye-backports darktable && \; \ apt-get -y autoremove && apt-get -y autoclean && apt-get -y clean && rm -rf /var/lib/apt/lists/* # Set environment variables, see https://docs.photoprism.app/getting-started/config-options/ diff --git a/docker/photoprism/buster/Dockerfile b/docker/photoprism/buster/Dockerfile index 3c3bf4094..4726769f6 100644 --- a/docker/photoprism/buster/Dockerfile +++ b/docker/photoprism/buster/Dockerfile @@ -33,6 +33,9 @@ RUN echo 'Acquire::Retries "10";' > /etc/apt/apt.conf.d/80retry && \ echo 'APT::Get::Assume-Yes "true";' > /etc/apt/apt.conf.d/80forceyes && \ echo 'APT::Get::Fix-Missing "true";' > /etc/apt/apt.conf.d/80fixmissing +# copy backports sources +COPY --chown=root:root --chmod=644 /docker/develop/buster/backports.list /etc/apt/sources.list.d/backports.list + # Install additional distribution packages RUN apt-get update && apt-get -qq dist-upgrade && apt-get -qq install --no-install-recommends \ gpgv \ @@ -57,7 +60,7 @@ RUN apt-get update && apt-get -qq dist-upgrade && apt-get -qq install --no-insta ffmpeg \ ffmpegthumbnailer \ libavcodec-extra && \ - [ "$TARGETARCH" = "arm" ] || apt-get -y install darktable; \ + [ "$TARGETARCH" = "arm" ] || apt-get -qq install -t buster-backports darktable; \ apt-get -y autoremove && apt-get -y autoclean && apt-get -y clean && rm -rf /var/lib/apt/lists/* # Set environment variables, see https://docs.photoprism.app/getting-started/config-options/