luisgulo/photoprism
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Docker: Add backports.list for debian images

Browse source 
Signed-off-by: Michael Mayer <michael@liquidbytes.net>
This commit is contained in:
Michael Mayer 2022-02-15 23:29:57 +01:00
parent 371a4a9272
commit 1cda75879c
6 changed files with 18 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
docker/develop/bullseye/Dockerfile
View file

@ -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"]
CMD ["tail", "-f", "/dev/null"]

1
docker/develop/bullseye/backports.list Normal file
View file

@ -0,0 +1 @@
deb http://deb.debian.org/debian bullseye-backports main contrib non-free

7
docker/develop/buster/Dockerfile
View file

@ -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"]
CMD ["tail", "-f", "/dev/null"]

1
docker/develop/buster/backports.list Normal file
View file

@ -0,0 +1 @@
deb http://deb.debian.org/debian buster-backports main contrib non-free

5
docker/photoprism/bullseye/Dockerfile
View file

@ -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/

5
docker/photoprism/buster/Dockerfile
View file

@ -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/