Docker: Add Ubuntu 23.04 (Lunar Lobster) base images #3305

Signed-off-by: Michael Mayer <michael@photoprism.app>
2023-03-27 09:30:17 +02:00 · 2023-03-27 09:30:17 +02:00 · ba85e5df17
commit ba85e5df17
parent b3525d6e49
22 changed files with 411 additions and 36 deletions
--- a/31
+++ b/31
@ -348,12 +348,24 @@ docker-develop-jammy-slim:
 	docker pull --platform=amd64 ubuntu:jammy
 	docker pull --platform=arm64 ubuntu:jammy
 	scripts/docker/buildx-multi.sh develop linux/amd64,linux/arm64 jammy-slim /jammy-slim
+docker-develop-lunar:
+	docker pull --platform=amd64 ubuntu:lunar
+	docker pull --platform=arm64 ubuntu:lunar
+	scripts/docker/buildx-multi.sh develop linux/amd64,linux/arm64 lunar /lunar
+docker-develop-lunar-slim:
+	docker pull --platform=amd64 ubuntu:lunar
+	docker pull --platform=arm64 ubuntu:lunar
+	scripts/docker/buildx-multi.sh develop linux/amd64,linux/arm64 lunar-slim /lunar-slim
 unstable: docker-unstable
 docker-unstable: docker-unstable-jammy
 docker-unstable-jammy:
 	docker pull --platform=amd64 photoprism/develop:jammy
 	docker pull --platform=amd64 photoprism/develop:jammy-slim
 	scripts/docker/buildx-multi.sh photoprism linux/amd64 unstable /jammy
+docker-unstable-lunar:
+	docker pull --platform=amd64 photoprism/develop:lunar
+	docker pull --platform=amd64 photoprism/develop:lunar-slim
+	scripts/docker/buildx-multi.sh photoprism linux/amd64 unstable /lunar
 preview: docker-preview
 docker-preview: docker-preview-latest
 docker-preview-all: docker-preview-latest docker-preview-other
@ -394,6 +406,12 @@ docker-preview-jammy:
 	docker pull --platform=arm64 photoprism/develop:jammy
 	docker pull --platform=arm64 photoprism/develop:jammy-slim
 	scripts/docker/buildx-multi.sh photoprism linux/amd64,linux/arm64 preview /jammy "-t photoprism/photoprism:preview-ubuntu"
+docker-preview-lunar:
+	docker pull --platform=amd64 photoprism/develop:lunar
+	docker pull --platform=amd64 photoprism/develop:lunar-slim
+	docker pull --platform=arm64 photoprism/develop:lunar
+	docker pull --platform=arm64 photoprism/develop:lunar-slim
+	scripts/docker/buildx-multi.sh photoprism linux/amd64,linux/arm64 preview /lunar
 docker-preview-impish:
 	docker pull --platform=amd64 photoprism/develop:impish
 	docker pull --platform=arm64 photoprism/develop:impish
@ -440,6 +458,12 @@ docker-release-jammy:
 	docker pull --platform=arm64 photoprism/develop:jammy
 	docker pull --platform=arm64 photoprism/develop:jammy-slim
 	scripts/docker/buildx-multi.sh photoprism linux/amd64,linux/arm64 jammy /jammy "-t photoprism/photoprism:latest -t photoprism/photoprism:ubuntu"
+docker-release-lunar:
+	docker pull --platform=amd64 photoprism/develop:lunar
+	docker pull --platform=amd64 photoprism/develop:lunar-slim
+	docker pull --platform=arm64 photoprism/develop:lunar
+	docker pull --platform=arm64 photoprism/develop:lunar-slim
+	scripts/docker/buildx-multi.sh photoprism linux/amd64,linux/arm64 lunar /lunar
 docker-release-impish:
 	docker pull --platform=amd64 photoprism/develop:impish
 	docker pull --platform=arm64 photoprism/develop:impish
@ -490,6 +514,10 @@ docker-local-jammy:
 	docker pull photoprism/develop:jammy
 	docker pull ubuntu:jammy
 	scripts/docker/build.sh photoprism jammy /jammy "-t photoprism/photoprism:local"
+docker-local-lunar:
+	docker pull photoprism/develop:lunar
+	docker pull ubuntu:lunar
+	scripts/docker/build.sh photoprism lunar /lunar "-t photoprism/photoprism:local"
 docker-local-impish:
 	docker pull photoprism/develop:impish
 	docker pull ubuntu:impish
@ -508,6 +536,9 @@ docker-local-develop-buster:
 docker-local-develop-jammy:
 	docker pull ubuntu:jammy
 	scripts/docker/build.sh develop jammy /jammy
+docker-local-develop-lunar:
+	docker pull ubuntu:lunar
+	scripts/docker/build.sh develop lunar /lunar
 docker-local-develop-impish:
 	docker pull ubuntu:impish
 	scripts/docker/build.sh develop impish /impish
--- a/docker/develop/armv7/Dockerfile
+++ b/docker/develop/armv7/Dockerfile
@ -8,7 +8,7 @@ FROM ubuntu:jammy

 # Add Open Container Initiative (OCI) annotations.
 # 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® Build Image (ARMv7)"
 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.source="https://github.com/photoprism/photoprism"
--- a/docker/develop/bookworm/Dockerfile
+++ b/docker/develop/bookworm/Dockerfile
@ -8,7 +8,7 @@ FROM debian:bookworm-slim

 # Add Open Container Initiative (OCI) annotations.
 # See: https://github.com/opencontainers/image-spec/blob/main/annotations.md
-LABEL org.opencontainers.image.title="PhotoPrism® Dev (Debian 12)"
+LABEL org.opencontainers.image.title="PhotoPrism® Build Image (Debian 12)"
 LABEL org.opencontainers.image.description="Debian 12 (Bookworm)"
 LABEL org.opencontainers.image.url="https://hub.docker.com/repository/docker/photoprism/develop"
 LABEL org.opencontainers.image.source="https://github.com/photoprism/photoprism"
--- a/docker/develop/bullseye/Dockerfile
+++ b/docker/develop/bullseye/Dockerfile
@ -8,7 +8,7 @@ FROM golang:1-bullseye

 # Add Open Container Initiative (OCI) annotations.
 # See: https://github.com/opencontainers/image-spec/blob/main/annotations.md
-LABEL org.opencontainers.image.title="PhotoPrism® Dev (Debian 11)"
+LABEL org.opencontainers.image.title="PhotoPrism® Build Image (Debian 11)"
 LABEL org.opencontainers.image.description="Debian 11 (Bullseye)"
 LABEL org.opencontainers.image.url="https://hub.docker.com/repository/docker/photoprism/develop"
 LABEL org.opencontainers.image.source="https://github.com/photoprism/photoprism"
--- a/docker/develop/buster/Dockerfile
+++ b/docker/develop/buster/Dockerfile
@ -8,7 +8,7 @@ FROM golang:1-buster

 # Open Container Initiative (OCI) Annotations
 # see https://github.com/opencontainers/image-spec/blob/main/annotations.md
-LABEL org.opencontainers.image.title="PhotoPrism® Dev (Debian 10)"
+LABEL org.opencontainers.image.title="PhotoPrism® Build Image (Debian 10)"
 LABEL org.opencontainers.image.description="Debian 10 (Buster)"
 LABEL org.opencontainers.image.url="https://hub.docker.com/repository/docker/photoprism/develop"
 LABEL org.opencontainers.image.source="https://github.com/photoprism/photoprism"
--- a/docker/develop/impish/Dockerfile
+++ b/docker/develop/impish/Dockerfile
@ -8,7 +8,7 @@ FROM ubuntu:impish

 # Add Open Container Initiative (OCI) annotations.
 # See: https://github.com/opencontainers/image-spec/blob/main/annotations.md
-LABEL org.opencontainers.image.title="PhotoPrism® Dev (Ubuntu 21.10)"
+LABEL org.opencontainers.image.title="PhotoPrism® Build Image (Ubuntu 21.10)"
 LABEL org.opencontainers.image.description="Ubuntu 21.10 (Impish Indri)"
 LABEL org.opencontainers.image.url="https://hub.docker.com/repository/docker/photoprism/develop"
 LABEL org.opencontainers.image.source="https://github.com/photoprism/photoprism"
--- a/docker/develop/jammy/Dockerfile
+++ b/docker/develop/jammy/Dockerfile
@ -8,7 +8,7 @@ FROM ubuntu:jammy

 # Add Open Container Initiative (OCI) annotations.
 # See: https://github.com/opencontainers/image-spec/blob/main/annotations.md
-LABEL org.opencontainers.image.title="PhotoPrism® Dev (Ubuntu 22.04 LTS)"
+LABEL org.opencontainers.image.title="PhotoPrism® Build Image (Ubuntu 22.04 LTS)"
 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.source="https://github.com/photoprism/photoprism"
--- a/docker/develop/lunar-slim/Dockerfile
+++ b/docker/develop/lunar-slim/Dockerfile
@ -0,0 +1,78 @@
+#### Base Image: Ubuntu 23.04 (Lunar Lobster)
+FROM ubuntu:lunar
+
+# Copyright © 2018 - 2023 PhotoPrism UG. All rights reserved.
+#
+# Questions? Email us at hello@photoprism.app or visit our website to learn
+# more about our team, products and services: https://www.photoprism.app/
+
+# Add Open Container Initiative (OCI) annotations.
+# See: https://github.com/opencontainers/image-spec/blob/main/annotations.md
+LABEL org.opencontainers.image.title="PhotoPrism® Base Image (Ubuntu 23.04)"
+LABEL org.opencontainers.image.description="Ubuntu 23.04 (Lunar Lobster)"
+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.documentation="https://docs.photoprism.app/developer-guide/setup/"
+LABEL org.opencontainers.image.authors="Michael Mayer <hello@photoprism.app>"
+LABEL org.opencontainers.image.vendor="PhotoPrism UG"
+
+# Declare build parameters.
+ARG TARGETARCH
+ARG BUILD_TAG
+
+# Set environment variables, see https://docs.photoprism.app/getting-started/config-options/.
+ENV PHOTOPRISM_ARCH=$TARGETARCH \
+    DOCKER_TAG=$BUILD_TAG \
+    DOCKER_ENV="prod" \
+    PS1="\u@$DOCKER_TAG:\w\$ " \
+    PATH="/usr/local/sbin:/usr/sbin:/sbin:/usr/local/bin:/usr/bin:/bin:/scripts:/opt/photoprism/bin" \
+    LD_LIBRARY_PATH="/usr/local/lib:/usr/lib" \
+    TMPDIR="/tmp" \
+    DEBIAN_FRONTEND="noninteractive" \
+    TF_CPP_MIN_LOG_LEVEL="2" \
+    PROG="photoprism"
+
+# Copy scripts and package sources config.
+COPY --chown=root:root --chmod=755 /scripts/dist/ /scripts/
+
+# Update base image and add dependencies.
+RUN echo 'APT::Acquire::Retries "3";' > /etc/apt/apt.conf.d/80retries && \
+    echo 'APT::Install-Recommends "false";' > /etc/apt/apt.conf.d/80recommends && \
+    echo 'APT::Install-Suggests "false";' > /etc/apt/apt.conf.d/80suggests && \
+    echo 'APT::Get::Assume-Yes "true";' > /etc/apt/apt.conf.d/80forceyes && \
+    echo 'APT::Get::Fix-Missing "true";' > /etc/apt/apt.conf.d/80fixmissing && \
+    echo 'force-confold' > /etc/dpkg/dpkg.cfg.d/force-confold && \
+    apt-get update && apt-get -qq upgrade && \
+    apt-get -qq install \
+        libc6 ca-certificates bash sudo nano avahi-utils jq lsof lshw \
+        exiftool sqlite3 tzdata gpg make zip unzip wget curl rsync \
+        imagemagick libvips-dev rawtherapee ffmpeg libavcodec-extra x264 x265 libde265-dev \
+        libaom3 libvpx7 libwebm1 libjpeg8 libmatroska7 libdvdread8 libebml5 libgav1-bin libatomic1 \
+    && \
+    /scripts/install-mariadb.sh mariadb-client && \
+    /scripts/install-darktable.sh && \
+    /scripts/install-libheif.sh && \
+    echo 'alias ll="ls -alh"' >> /etc/skel/.bashrc && \
+    echo 'export PS1="\u@$DOCKER_TAG:\w\$ "' >> /etc/skel/.bashrc && \
+    echo "ALL ALL=(ALL) NOPASSWD:SETENV: /scripts/entrypoint-init.sh" >> /etc/sudoers.d/init && \
+    cp /etc/skel/.bashrc /root/.bashrc && \
+    /scripts/create-users.sh && \
+    install -d -m 0777 -o 1000 -g 1000 \
+        /photoprism/originals \
+        /photoprism/import \
+        /photoprism/storage \
+        /photoprism/storage/sidecar \
+        /photoprism/storage/albums \
+        /photoprism/storage/backups \
+        /photoprism/storage/config \
+        /photoprism/storage/cache && \
+    /scripts/cleanup.sh
+
+# Default working directory.
+WORKDIR /photoprism
+
+# Expose HTTP and HTTPS ports.
+EXPOSE 2342 2442 2443
+
+# Keep container running.
+CMD ["tail", "-f", "/dev/null"]
--- a/docker/develop/lunar/Dockerfile
+++ b/docker/develop/lunar/Dockerfile
@ -0,0 +1,115 @@
+#### Base Image: Ubuntu 23.04 (Lunar Lobster)
+FROM ubuntu:lunar
+
+# Copyright © 2018 - 2023 PhotoPrism UG. All rights reserved.
+#
+# Questions? Email us at hello@photoprism.app or visit our website to learn
+# more about our team, products and services: https://www.photoprism.app/
+
+# Add Open Container Initiative (OCI) annotations.
+# See: https://github.com/opencontainers/image-spec/blob/main/annotations.md
+LABEL org.opencontainers.image.title="PhotoPrism® Build Image (Ubuntu 23.04)"
+LABEL org.opencontainers.image.description="Ubuntu 23.04 (Lunar Lobster)"
+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.documentation="https://docs.photoprism.app/developer-guide/setup/"
+LABEL org.opencontainers.image.authors="Michael Mayer <hello@photoprism.app>"
+LABEL org.opencontainers.image.vendor="PhotoPrism UG"
+
+# Declare build parameters.
+ARG TARGETARCH
+ARG BUILD_TAG
+
+# Set environment variables, see https://docs.photoprism.app/getting-started/config-options/.
+ENV PHOTOPRISM_ARCH=$TARGETARCH \
+    DOCKER_TAG=$BUILD_TAG \
+    DOCKER_ENV="develop" \
+    NODE_ENV="production" \
+    PS1="\u@$DOCKER_TAG:\w\$ " \
+    PATH="/usr/local/sbin:/usr/sbin:/sbin:/usr/local/bin:/usr/bin:/bin:/scripts:/usr/local/go/bin:/go/bin:/opt/photoprism/bin" \
+    LD_LIBRARY_PATH="/usr/local/lib:/usr/lib" \
+    DEBIAN_FRONTEND="noninteractive" \
+    TMPDIR="/tmp" \
+    TF_CPP_MIN_LOG_LEVEL="0" \
+    GOPATH="/go" \
+    GOBIN="/usr/local/bin" \
+    GO111MODULE="on" \
+    CGO_CFLAGS="-g -O2 -Wno-return-local-addr" \
+    PROG="photoprism"
+
+# Copy scripts and package sources config.
+COPY --chown=root:root --chmod=755 /scripts/dist/ /scripts/
+COPY --chown=root:root --chmod=644 /.my.cnf /etc/my.cnf
+
+# Update base image and add dependencies.
+RUN echo 'APT::Acquire::Retries "3";' > /etc/apt/apt.conf.d/80retries && \
+    echo 'APT::Install-Recommends "false";' > /etc/apt/apt.conf.d/80recommends && \
+    echo 'APT::Install-Suggests "false";' > /etc/apt/apt.conf.d/80suggests && \
+    echo 'APT::Get::Assume-Yes "true";' > /etc/apt/apt.conf.d/80forceyes && \
+    echo 'APT::Get::Fix-Missing "true";' > /etc/apt/apt.conf.d/80fixmissing && \
+    echo 'force-confold' > /etc/dpkg/dpkg.cfg.d/force-confold && \
+    apt-get update && apt-get -qq upgrade && \
+    apt-get -qq install \
+        libc6 ca-certificates bash sudo nano avahi-utils jq lsof lshw \
+        exiftool sqlite3 tzdata gpg make zip unzip wget curl rsync \
+        imagemagick libvips-dev rawtherapee ffmpeg libavcodec-extra x264 x265 libde265-dev \
+        libaom3 libvpx7 libwebm1 libjpeg8 libmatroska7 libdvdread8 libebml5 libgav1-bin libatomic1 \
+    && \
+    apt-get -qq install \
+        apt-utils pkg-config software-properties-common \
+        build-essential gcc g++ git gettext davfs2 chrpath apache2-utils \
+        autoconf automake cmake libtool libjpeg8-dev \
+        libx264-dev libx265-dev libaom-dev libvpx-dev libwebm-dev libpng-dev libxft-dev \
+        libc6-dev libhdf5-serial-dev libzmq3-dev libssl-dev libnss3 \
+        libfreetype6 libfreetype6-dev libfontconfig1 libfontconfig1-dev fonts-roboto \
+        librsvg2-bin ghostscript gsfonts \
+    && \
+    /scripts/install-nodejs.sh && \
+    /scripts/install-mariadb.sh mariadb-client && \
+    /scripts/install-tensorflow.sh && \
+    /scripts/install-darktable.sh && \
+    /scripts/install-libheif.sh && \
+    /scripts/install-chrome.sh && \
+    /scripts/install-go.sh && \
+    /scripts/install-go-tools.sh && \
+    echo 'alias go=richgo ll="ls -alh"' >> /etc/skel/.bashrc && \
+    echo 'export PS1="\u@$DOCKER_TAG:\w\$ "' >> /etc/skel/.bashrc && \
+    echo "ALL ALL=(ALL) NOPASSWD:SETENV: ALL" >> /etc/sudoers.d/all && \
+    cp /etc/skel/.bashrc /root/.bashrc && \
+    cp /scripts/convert/policy.xml /etc/ImageMagick-6/policy.xml && \
+    /scripts/create-users.sh && \
+    install -d -m 0777 -o 1000 -g 1000 \
+        /photoprism/originals \
+        /photoprism/import \
+        /photoprism/storage \
+        /photoprism/storage/sidecar \
+        /photoprism/storage/albums \
+        /photoprism/storage/backups \
+        /photoprism/storage/config \
+        /photoprism/storage/cache && \
+    /scripts/cleanup.sh
+
+# Download models and testdata.
+RUN mkdir /tmp/photoprism && \
+    wget "https://dl.photoprism.app/tensorflow/nsfw.zip?${BUILD_TAG}" -O /tmp/photoprism/nsfw.zip && \
+    wget "https://dl.photoprism.app/tensorflow/nasnet.zip?${BUILD_TAG}" -O /tmp/photoprism/nasnet.zip && \
+    wget "https://dl.photoprism.app/tensorflow/facenet.zip?${BUILD_TAG}" -O /tmp/photoprism/facenet.zip && \
+    wget "https://dl.photoprism.app/qa/testdata.zip?${BUILD_TAG}" -O /tmp/photoprism/testdata.zip
+
+# Default working directory.
+WORKDIR "/go/src/github.com/photoprism/photoprism"
+
+# Expose the following container ports:
+# - 2342 (HTTP)
+# - 2343 (Acceptance Tests)
+# - 2442 (HTTP)
+# - 2443 (HTTPS)
+# - 9515 (Chromedriver)
+# - 40000 (Go Debugger)
+EXPOSE 2342 2343 2442 2443 9515 40000
+
+# Declare container entrypoint script.
+ENTRYPOINT ["/scripts/entrypoint.sh"]
+
+# Keep container running.
+CMD ["tail", "-f", "/dev/null"]
--- a/docker/photoprism/armv7/Dockerfile
+++ b/docker/photoprism/armv7/Dockerfile
@ -23,7 +23,7 @@ FROM ubuntu:jammy

 # Add Open Container Initiative (OCI) annotations.
 # 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® (ARMv7)"
 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.source="https://github.com/photoprism/photoprism"
--- a/docker/photoprism/bookworm/Dockerfile
+++ b/docker/photoprism/bookworm/Dockerfile
@ -23,7 +23,7 @@ FROM photoprism/develop:bookworm-slim

 # Add Open Container Initiative (OCI) annotations.
 # See: https://github.com/opencontainers/image-spec/blob/main/annotations.md
-LABEL org.opencontainers.image.title="PhotoPrism® Community Edition (Debian 12)"
+LABEL org.opencontainers.image.title="PhotoPrism® (Debian 12)"
 LABEL org.opencontainers.image.description="Debian 12 (Bookworm)"
 LABEL org.opencontainers.image.url="https://hub.docker.com/repository/docker/photoprism/photoprism"
 LABEL org.opencontainers.image.source="https://github.com/photoprism/photoprism"
--- a/docker/photoprism/bullseye/Dockerfile
+++ b/docker/photoprism/bullseye/Dockerfile
@ -23,7 +23,7 @@ FROM photoprism/develop:bullseye-slim

 # Add Open Container Initiative (OCI) annotations.
 # See: https://github.com/opencontainers/image-spec/blob/main/annotations.md
-LABEL org.opencontainers.image.title="PhotoPrism® Community Edition (Debian 11)"
+LABEL org.opencontainers.image.title="PhotoPrism® (Debian 11)"
 LABEL org.opencontainers.image.description="Debian 11 (Bullseye)"
 LABEL org.opencontainers.image.url="https://hub.docker.com/repository/docker/photoprism/photoprism"
 LABEL org.opencontainers.image.source="https://github.com/photoprism/photoprism"
--- a/docker/photoprism/buster/Dockerfile
+++ b/docker/photoprism/buster/Dockerfile
@ -23,7 +23,7 @@ FROM debian:buster-slim

 # Add Open Container Initiative (OCI) annotations.
 # See: https://github.com/opencontainers/image-spec/blob/main/annotations.md
-LABEL org.opencontainers.image.title="PhotoPrism® Community Edition (Debian 10)"
+LABEL org.opencontainers.image.title="PhotoPrism® (Debian 10)"
 LABEL org.opencontainers.image.description="Debian 10 (Buster)"
 LABEL org.opencontainers.image.url="https://hub.docker.com/repository/docker/photoprism/photoprism"
 LABEL org.opencontainers.image.source="https://github.com/photoprism/photoprism"
--- a/docker/photoprism/impish/Dockerfile
+++ b/docker/photoprism/impish/Dockerfile
@ -23,7 +23,7 @@ FROM ubuntu:impish

 # Add Open Container Initiative (OCI) annotations.
 # See: https://github.com/opencontainers/image-spec/blob/main/annotations.md
-LABEL org.opencontainers.image.title="PhotoPrism® Community Edition (Ubuntu 21.10)"
+LABEL org.opencontainers.image.title="PhotoPrism® (Ubuntu 21.10)"
 LABEL org.opencontainers.image.description="Ubuntu 21.10 (Impish Indri)"
 LABEL org.opencontainers.image.url="https://hub.docker.com/repository/docker/photoprism/photoprism"
 LABEL org.opencontainers.image.source="https://github.com/photoprism/photoprism"
--- a/docker/photoprism/jammy/Dockerfile
+++ b/docker/photoprism/jammy/Dockerfile
@ -24,7 +24,7 @@ FROM photoprism/develop:jammy-slim

 # Add Open Container Initiative (OCI) annotations.
 # See: https://github.com/opencontainers/image-spec/blob/main/annotations.md
-LABEL org.opencontainers.image.title="PhotoPrism® Community Edition (Ubuntu 22.04 LTS)"
+LABEL org.opencontainers.image.title="PhotoPrism® (Ubuntu 22.04 LTS)"
 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.source="https://github.com/photoprism/photoprism"
--- a/docker/photoprism/lunar/Dockerfile
+++ b/docker/photoprism/lunar/Dockerfile
@ -0,0 +1,113 @@
+##################################################### BUILD STAGE ######################################################
+FROM photoprism/develop:lunar as build
+
+# Copyright © 2018 - 2023 PhotoPrism UG. All rights reserved.
+#
+# Questions? Email us at hello@photoprism.app or visit our website to learn
+# more about our team, products and services: https://www.photoprism.app/
+
+# Declare build parameters.
+ARG TARGETARCH
+ARG TARGETPLATFORM
+ARG BUILD_TAG
+
+# Copy source to image.
+WORKDIR "/go/src/github.com/photoprism/photoprism"
+COPY . .
+
+# Build app.
+RUN make all install DESTDIR=/opt/photoprism
+
+################################################## PRODUCTION STAGE ####################################################
+#### Base Image: Ubuntu 23.04 (Lunar Lobster)
+FROM photoprism/develop:lunar-slim
+
+# Add Open Container Initiative (OCI) annotations.
+# See: https://github.com/opencontainers/image-spec/blob/main/annotations.md
+LABEL org.opencontainers.image.title="PhotoPrism® (Ubuntu 23.04)"
+LABEL org.opencontainers.image.description="Ubuntu 23.04 (Lunar Lobster)"
+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.documentation="https://docs.photoprism.app/getting-started/"
+LABEL org.opencontainers.image.authors="Michael Mayer <hello@photoprism.app>"
+LABEL org.opencontainers.image.vendor="PhotoPrism UG"
+
+# Declare build parameters.
+ARG TARGETARCH
+ARG BUILD_TAG
+
+# Set environment variables, see https://docs.photoprism.app/getting-started/config-options/.
+ENV PHOTOPRISM_ARCH=$TARGETARCH \
+    DOCKER_TAG=$BUILD_TAG \
+    DOCKER_ENV="prod" \
+    TMPDIR="/tmp" \
+    DEBIAN_FRONTEND="noninteractive" \
+    TF_CPP_MIN_LOG_LEVEL="2" \
+    PROG="photoprism" \
+    PHOTOPRISM_ASSETS_PATH="/opt/photoprism/assets" \
+    PHOTOPRISM_IMPORT_PATH="/photoprism/import" \
+    PHOTOPRISM_ORIGINALS_PATH="/photoprism/originals" \
+    PHOTOPRISM_STORAGE_PATH="/photoprism/storage" \
+    PHOTOPRISM_BACKUP_PATH="/photoprism/storage/backups" \
+    PHOTOPRISM_LOG_FILENAME="/photoprism/storage/photoprism.log" \
+    PHOTOPRISM_PID_FILENAME="/photoprism/storage/photoprism.pid" \
+    PHOTOPRISM_DEBUG="false" \
+    PHOTOPRISM_PUBLIC="false" \
+    PHOTOPRISM_READONLY="false" \
+    PHOTOPRISM_UPLOAD_NSFW="true" \
+    PHOTOPRISM_DETECT_NSFW="false" \
+    PHOTOPRISM_EXPERIMENTAL="false" \
+    PHOTOPRISM_SITE_URL="http://photoprism.me:2342/" \
+    PHOTOPRISM_SITE_CAPTION="AI-Powered Photos App" \
+    PHOTOPRISM_SITE_DESCRIPTION="" \
+    PHOTOPRISM_SITE_AUTHOR="" \
+    PHOTOPRISM_HTTP_HOST="0.0.0.0" \
+    PHOTOPRISM_HTTP_PORT=2342 \
+    PHOTOPRISM_DATABASE_DRIVER="sqlite" \
+    PHOTOPRISM_DATABASE_SERVER="" \
+    PHOTOPRISM_DATABASE_NAME="photoprism" \
+    PHOTOPRISM_DATABASE_USER="photoprism" \
+    PHOTOPRISM_DATABASE_PASSWORD="" \
+    PHOTOPRISM_DISABLE_CHOWN="false" \
+    PHOTOPRISM_DISABLE_WEBDAV="false" \
+    PHOTOPRISM_DISABLE_SETTINGS="false" \
+    PHOTOPRISM_DISABLE_BACKUPS="false" \
+    PHOTOPRISM_DISABLE_EXIFTOOL="false" \
+    PHOTOPRISM_DISABLE_PLACES="false" \
+    PHOTOPRISM_DISABLE_TENSORFLOW="false" \
+    PHOTOPRISM_DISABLE_FACES="false" \
+    PHOTOPRISM_DISABLE_CLASSIFICATION="false" \
+    PHOTOPRISM_RAW_PRESETS="false" \
+    PHOTOPRISM_THUMB_FILTER="lanczos" \
+    PHOTOPRISM_THUMB_UNCACHED="false" \
+    PHOTOPRISM_THUMB_SIZE=2048 \
+    PHOTOPRISM_THUMB_SIZE_UNCACHED=7680 \
+    PHOTOPRISM_JPEG_SIZE=7680 \
+    PHOTOPRISM_JPEG_QUALITY=85 \
+    PHOTOPRISM_WORKERS=0 \
+    PHOTOPRISM_WAKEUP_INTERVAL=900 \
+    PHOTOPRISM_AUTO_INDEX=300 \
+    PHOTOPRISM_AUTO_IMPORT=300
+
+# Copy scripts.
+COPY --chown=root:root --chmod=755 /scripts/dist/ /scripts/
+
+# Update pre-installed packages.
+RUN apt-get update && \
+    apt-get -qq upgrade && \
+    /scripts/cleanup.sh
+
+# Default working directory.
+WORKDIR /photoprism
+
+# Expose HTTP(S) ports.
+EXPOSE 2342 2443
+
+# Copy app files.
+COPY --from=build --chown=root:root --chmod=755 /opt/photoprism/ /opt/photoprism
+
+# Declare container entrypoint script.
+ENTRYPOINT ["/scripts/entrypoint.sh"]
+
+# Start app.
+CMD ["/opt/photoprism/bin/photoprism", "start"]
--- a/scripts/dist/install-darktable.sh
+++ b/scripts/dist/install-darktable.sh
@ -39,7 +39,6 @@ case $DESTARCH in
      apt-get update
      apt-get -qq install -t buster-backports darktable
    else
-      echo "install-darktable: installing standard amd64 (Intel 64-bit) package"
      apt-get -qq install darktable
    fi
    ;;
@ -52,7 +51,6 @@ case $DESTARCH in
      apt-get update
      apt-get -qq install -t buster-backports darktable
    else
-      echo "install-darktable: installing standard arm64 (ARM 64-bit) package"
      apt-get -qq install darktable
    fi
    ;;
--- a/scripts/dist/install-docker.sh
+++ b/scripts/dist/install-docker.sh
@ -22,5 +22,11 @@ echo "deb [arch=$(dpkg --print-architecture) signed-by=/etc/apt/keyrings/docker.
 sudo apt-get update
 sudo apt-get -qq install docker-ce docker-ce-cli docker-ce-rootless-extras containerd.io docker-compose-plugin cgroupfs-mount libltdl7 pigz

+# Add docker-compose alias for Compose Plugin.
+if [ ! -f "/bin/docker-compose" ]; then
+  echo 'docker compose "$@"' | sudo tee /bin/docker-compose
+  sudo chmod +x /bin/docker-compose
+fi
+
 # Verify installation works.
 sudo docker run hello-world
--- a/scripts/dist/install-jxl.sh
+++ b/scripts/dist/install-jxl.sh
@ -25,20 +25,20 @@ set -e

 . /etc/os-release

-ARCHIVE="jxl-debs-${DESTARCH}-ubuntu-22.04-${LIB_VERSION}.tar.gz"
-URL="https://github.com/libjxl/libjxl/releases/download/${LIB_VERSION}/${ARCHIVE}"
-TMPDIR="/tmp/jpegxl"
-
-echo "------------------------------------------------"
-echo "VERSION: $LIB_VERSION"
-echo "ARCHIVE: $ARCHIVE"
-echo "------------------------------------------------"
-
-echo "Installing JPEG XL for ${DESTARCH^^}..."
-
 case $DESTARCH in
  amd64 | AMD64 | x86_64 | x86-64)
    if [[ $VERSION_CODENAME == "jammy" ]]; then
+      ARCHIVE="jxl-debs-${DESTARCH}-ubuntu-22.04-${LIB_VERSION}.tar.gz"
+      URL="https://github.com/libjxl/libjxl/releases/download/${LIB_VERSION}/${ARCHIVE}"
+      TMPDIR="/tmp/jpegxl"
+
+      echo "------------------------------------------------"
+      echo "VERSION: $LIB_VERSION"
+      echo "ARCHIVE: $ARCHIVE"
+      echo "------------------------------------------------"
+
+      echo "Installing JPEG XL for ${DESTARCH^^}..."
+
      apt-get update
      apt-get install -f libtcmalloc-minimal4 libhwy-dev libhwy0
      rm -rf /tmp/jpegxl
@ -48,8 +48,20 @@ case $DESTARCH in
      (cd "$TMPDIR" && dpkg -i jxl_0.8.1_amd64.deb libjxl_0.8.1_amd64.deb libjxl-dev_0.8.1_amd64.deb)
      apt --fix-broken install
      rm -rf /tmp/jpegxl
+    elif [[ $VERSION_CODENAME == "lunar" ]]; then
+      echo "Installing JPEG XL distribution packages for amd64 (Intel 64-bit)"
+      apt-get -qq install libjxl-dev libjxl-tools
    else
-      echo "install-jxl: target distribution currently unsupported"
+      echo "JPEG XL is currently unsupported."
+    fi
+    ;;
+
+  arm64 | ARM64 | aarch64)
+    if [[ $VERSION_CODENAME == "lunar" ]]; then
+      echo "Installing JPEG XL distribution packages for arm64 (ARM 64-bit)"
+      apt-get -qq install libjxl-dev libjxl-tools
+    else
+      echo "JPEG XL is currently unsupported."
    fi
    ;;

--- a/scripts/dist/install-libheif.sh
+++ b/scripts/dist/install-libheif.sh
@ -15,6 +15,15 @@ if [[ $(id -u) != "0" ]] && [[ $DESTDIR == "/usr" || $DESTDIR == "/usr/local" ]]
  exit 1
 fi

+. /etc/os-release
+
+if [[ $VERSION_CODENAME == "lunar" ]]; then
+  echo "Installing libheif distribution packages..."
+  apt-get update && apt-get -qq install libheif-dev libheif-examples
+  echo "Done."
+  exit 0
+fi
+
 mkdir -p "$DESTDIR"

 ARCHIVE="libheif-${VERSION_CODENAME}-${DESTARCH}-${LIBHEIF_VERSION}.tar.gz"
--- a/scripts/dist/install-mariadb.sh
+++ b/scripts/dist/install-mariadb.sh
@ -18,12 +18,18 @@ fi

 set -e

-MARIADB_VERSION="10.10"
-MARIADB_URL="https://downloads.mariadb.com/MariaDB/mariadb_repo_setup"
+. /etc/os-release

-if [ ! -f "/etc/apt/sources.list.d/mariadb.list" ]; then
-  echo "Installing MariaDB $MARIADB_VERSION package sources..."
-  curl -Ls $MARIADB_URL | bash  -s -- --mariadb-server-version="mariadb-$MARIADB_VERSION"
+if [[ $VERSION_CODENAME == "lunar" ]]; then
+  echo "Installing MariaDB distribution packages..."
+else
+  MARIADB_VERSION="10.10"
+  MARIADB_URL="https://downloads.mariadb.com/MariaDB/mariadb_repo_setup"
+
+  if [ ! -f "/etc/apt/sources.list.d/mariadb.list" ]; then
+    echo "Installing MariaDB $MARIADB_VERSION package sources..."
+    curl -Ls $MARIADB_URL | bash  -s -- --mariadb-server-version="mariadb-$MARIADB_VERSION"
+  fi
 fi

 echo "Installing \"$1\"..."
--- a/scripts/dist/install-nodejs.sh
+++ b/scripts/dist/install-nodejs.sh
@ -13,13 +13,20 @@ fi

 set -e

-SETUP_URL="https://deb.nodesource.com/setup_18.x"
+. /etc/os-release

-echo "Fetching packages from \"$SETUP_URL\"..."
-wget --inet4-only -c -qO- $SETUP_URL | bash -
+if [[ $VERSION_CODENAME == "lunar" ]]; then
+  echo "Installing NodeJS and NPM distribution packages..."
+  apt-get update && apt-get -qq install nodejs npm
+else
+  SETUP_URL="https://deb.nodesource.com/setup_18.x"

-echo "Installing NodeJS, NPM, and TestCafe..."
-apt-get update && apt-get -qq install nodejs
+  echo "Fetching packages from \"$SETUP_URL\"..."
+  wget --inet4-only -c -qO- $SETUP_URL | bash -
+
+  echo "Installing NodeJS, NPM, and TestCafe..."
+  apt-get update && apt-get -qq install nodejs
+fi

 npm install --unsafe-perm=true --allow-root -g npm testcafe
 npm config set cache ~/.cache/npm