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

Docker: Use Jammy instead of Bookworm as ARMv7 base image #2704

Browse source 
Signed-off-by: Michael Mayer <michael@photoprism.app>
This commit is contained in:
Michael Mayer 2022-09-14 23:00:46 +02:00
parent d3d7912b4c
commit de57063118
2 changed files with 6 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
docker/develop/armv7/Dockerfile
View file

@ -1,5 +1,5 @@
#### Base Image: Debian 12 (Bookworm) #### Base Image: Ubuntu 22.04 LTS (Jammy Jellyfish)
FROM debian:bookworm-slim FROM ubuntu:jammy
# Copyright © 2018 - 2022 PhotoPrism UG. All rights reserved. # Copyright © 2018 - 2022 PhotoPrism UG. All rights reserved.
# #
@ -9,7 +9,7 @@ FROM debian:bookworm-slim
# Add Open Container Initiative (OCI) annotations. # Add Open Container Initiative (OCI) annotations.
# See: https://github.com/opencontainers/image-spec/blob/main/annotations.md # See: https://github.com/opencontainers/image-spec/blob/main/annotations.md
LABEL org.opencontainers.image.title="PhotoPrism® Dev (ARMv7)" LABEL org.opencontainers.image.title="PhotoPrism® Dev (ARMv7)"
LABEL org.opencontainers.image.description="Debian 12 (Bookworm)" LABEL org.opencontainers.image.description="Ubuntu 22.04 LTS (Jammy Jellyfish)"
LABEL org.opencontainers.image.url="https://hub.docker.com/repository/docker/photoprism/develop" LABEL org.opencontainers.image.url="https://hub.docker.com/repository/docker/photoprism/develop"
LABEL org.opencontainers.image.source="https://github.com/photoprism/photoprism" LABEL org.opencontainers.image.source="https://github.com/photoprism/photoprism"
LABEL org.opencontainers.image.documentation="https://docs.photoprism.app/developer-guide/setup/" LABEL org.opencontainers.image.documentation="https://docs.photoprism.app/developer-guide/setup/"
@ -39,7 +39,6 @@ ENV PHOTOPRISM_ARCH=$TARGETARCH \
# Copy scripts and package sources config. # Copy scripts and package sources config.
COPY --chown=root:root --chmod=755 /scripts/dist/* /scripts/ COPY --chown=root:root --chmod=755 /scripts/dist/* /scripts/
COPY --chown=root:root --chmod=644 /docker/develop/bookworm/sources.list /etc/apt/sources.list.d/bookworm.list
COPY --chown=root:root --chmod=644 /.my.cnf /etc/my.cnf COPY --chown=root:root --chmod=644 /.my.cnf /etc/my.cnf
# Update base image and add dependencies. # Update base image and add dependencies.

7
docker/photoprism/armv7/Dockerfile
View file

@ -18,13 +18,13 @@ COPY . .
RUN make all install DESTDIR=/opt/photoprism RUN make all install DESTDIR=/opt/photoprism
################################################## PRODUCTION STAGE #################################################### ################################################## PRODUCTION STAGE ####################################################
#### Base Image: Debian 12 (Bookworm) #### Base Image: Ubuntu 22.04 LTS (Jammy Jellyfish)
FROM debian:bookworm-slim FROM ubuntu:jammy
# Add Open Container Initiative (OCI) annotations. # Add Open Container Initiative (OCI) annotations.
# See: https://github.com/opencontainers/image-spec/blob/main/annotations.md # See: https://github.com/opencontainers/image-spec/blob/main/annotations.md
LABEL org.opencontainers.image.title="PhotoPrism® Community Edition (ARMv7)" LABEL org.opencontainers.image.title="PhotoPrism® Community Edition (ARMv7)"
LABEL org.opencontainers.image.description="Debian 12 (Bookworm)" LABEL org.opencontainers.image.description="Ubuntu 22.04 LTS (Jammy Jellyfish)"
LABEL org.opencontainers.image.url="https://hub.docker.com/repository/docker/photoprism/photoprism" LABEL org.opencontainers.image.url="https://hub.docker.com/repository/docker/photoprism/photoprism"
LABEL org.opencontainers.image.source="https://github.com/photoprism/photoprism" LABEL org.opencontainers.image.source="https://github.com/photoprism/photoprism"
LABEL org.opencontainers.image.documentation="https://docs.photoprism.app/getting-started/" LABEL org.opencontainers.image.documentation="https://docs.photoprism.app/getting-started/"
@ -94,7 +94,6 @@ ENV PHOTOPRISM_ARCH=$TARGETARCH \
# Copy dist files, scripts, and debian backports sources list. # Copy dist files, scripts, and debian backports sources list.
COPY --from=build --chown=root:root --chmod=755 /opt/photoprism/ /opt/photoprism COPY --from=build --chown=root:root --chmod=755 /opt/photoprism/ /opt/photoprism
COPY --chown=root:root --chmod=755 /scripts/dist/* /scripts/ COPY --chown=root:root --chmod=755 /scripts/dist/* /scripts/
COPY /docker/develop/bookworm/sources.list /etc/apt/sources.list.d/bookworm.list
# Update base image and add dependencies. # Update base image and add dependencies.
RUN echo 'APT::Acquire::Retries "3";' > /etc/apt/apt.conf.d/80retries && \ RUN echo 'APT::Acquire::Retries "3";' > /etc/apt/apt.conf.d/80retries && \