Docker: Add "libjxl-dev" and "libjxl-tools" to base images #668

Signed-off-by: Michael Mayer <[email protected]>
photoprism · May 21, 2024 · 781177a · 781177a
1 parent e08640e
commit 781177a
Show file tree

Hide file tree

Showing 13 changed files with 10 additions and 15 deletions.
diff --git a/docker/develop/armv7/Dockerfile b/docker/develop/armv7/Dockerfile
@@ -55,7 +55,7 @@ RUN echo 'APT::Acquire::Retries "3";' > /etc/apt/apt.conf.d/80retries && \
  autoconf automake cmake libtool libjpeg-dev libpng-dev libwebp-dev \
  zip unzip wget curl rsync sqlite3 chrpath gettext libc6-dev \
  libssl-dev libxft-dev libfreetype6 libfreetype6-dev libfontconfig1 \
- libfontconfig1-dev libhdf5-serial-dev libzmq3-dev \
+ libfontconfig1-dev libhdf5-serial-dev libzmq3-dev libjxl-dev libjxl-tools \
  libx264-dev libx265-dev libde265-dev libaom-dev libnss3 libxtst6 librsvg2-bin tzdata \
  exiftool ffmpeg libavcodec-extra libdav1d-dev libvips-dev \
  && \

diff --git a/docker/develop/noble-slim/Dockerfile b/docker/develop/noble-slim/Dockerfile
@@ -46,7 +46,7 @@ RUN echo 'APT::Acquire::Retries "3";' > /etc/apt/apt.conf.d/80retries && \
  apt-get update && apt-get -qq dist-upgrade && \
  apt-get -qq install \
  libc6 ca-certificates bash sudo nano avahi-utils jq lsof lshw libebml5 libgav1-bin libatomic1 \
- exiftool sqlite3 tzdata gpg make zip unzip wget curl rsync imagemagick libvips-dev rawtherapee \
+ exiftool sqlite3 tzdata gpg make zip unzip wget curl rsync imagemagick libvips-dev rawtherapee libjxl-dev libjxl-tools \
  ffmpeg libffmpeg-nvenc-dev libswscale-dev libavfilter-extra libavformat-extra libavcodec-extra \
  x264 x265 libde265-dev libaom-dev libvpx-dev libwebm-dev libjpeg-dev libmatroska-dev libdvdread-dev libdav1d-dev \
  && \

diff --git a/docker/develop/noble/Dockerfile b/docker/develop/noble/Dockerfile
@@ -52,7 +52,7 @@ RUN echo 'APT::Acquire::Retries "3";' > /etc/apt/apt.conf.d/80retries && \
  apt-get update && apt-get -qq dist-upgrade && \
  apt-get -qq install \
  libc6 ca-certificates bash sudo nano avahi-utils jq lsof lshw libebml5 libgav1-bin libatomic1 \
- exiftool sqlite3 tzdata gpg make zip unzip wget curl rsync imagemagick libvips-dev rawtherapee \
+ exiftool sqlite3 tzdata gpg make zip unzip wget curl rsync imagemagick libvips-dev rawtherapee libjxl-dev libjxl-tools \
  ffmpeg libffmpeg-nvenc-dev libswscale-dev libavfilter-extra libavformat-extra libavcodec-extra \
  x264 x265 libde265-dev libaom-dev libvpx-dev libwebm-dev libjpeg-dev libmatroska-dev libdvdread-dev libdav1d-dev \
  && \

diff --git a/docker/photoprism/armv7/Dockerfile b/docker/photoprism/armv7/Dockerfile
@@ -83,8 +83,11 @@ ENV PHOTOPRISM_ARCH=$TARGETARCH \
  PHOTOPRISM_DISABLE_FACES="false" \
  PHOTOPRISM_DISABLE_CLASSIFICATION="false" \
  PHOTOPRISM_RAW_PRESETS="false" \
- PHOTOPRISM_THUMB_FILTER="lanczos" \
+ PHOTOPRISM_THUMB_SIZE=1920 \
+ PHOTOPRISM_THUMB_SIZE_UNCACHED=7680 \
  PHOTOPRISM_THUMB_UNCACHED="false" \
+ PHOTOPRISM_JPEG_SIZE=7680 \
+ PHOTOPRISM_PNG_SIZE=7680 \
  PHOTOPRISM_WORKERS=0 \
  PHOTOPRISM_WAKEUP_INTERVAL=900 \
  PHOTOPRISM_AUTO_INDEX=120 \
@@ -105,7 +108,7 @@ RUN echo 'APT::Acquire::Retries "3";' > /etc/apt/apt.conf.d/80retries && \
  apt-get update && apt-get -qq dist-upgrade && \
  apt-get -qq install --no-install-recommends \
  libc6 ca-certificates bash sudo nano avahi-utils jq lsof lshw \
- exiftool mariadb-client sqlite3 tzdata gpg make zip unzip wget curl rsync \
+ exiftool mariadb-client sqlite3 tzdata gpg make zip unzip wget curl rsync libjxl-dev libjxl-tools \
  imagemagick libvips-dev rawtherapee ffmpeg libavcodec-extra libdav1d-dev x264 x265 libde265-dev \
  libaom-dev libvpx-dev libwebm-dev libjpeg-dev libmatroska-dev libdvdread-dev libebml5 libgav1-bin libatomic1 \
  && \

diff --git a/docker/photoprism/bookworm/Dockerfile b/docker/photoprism/bookworm/Dockerfile
@@ -78,7 +78,6 @@ ENV PHOTOPRISM_ARCH=$TARGETARCH \
  PHOTOPRISM_DISABLE_FACES="false" \
  PHOTOPRISM_DISABLE_CLASSIFICATION="false" \
  PHOTOPRISM_RAW_PRESETS="false" \
- PHOTOPRISM_THUMB_FILTER="lanczos" \
  PHOTOPRISM_THUMB_UNCACHED="false" \
  PHOTOPRISM_WORKERS=0 \
  PHOTOPRISM_WAKEUP_INTERVAL=900 \

diff --git a/docker/photoprism/bullseye/Dockerfile b/docker/photoprism/bullseye/Dockerfile
@@ -78,7 +78,6 @@ ENV PHOTOPRISM_ARCH=$TARGETARCH \
  PHOTOPRISM_DISABLE_FACES="false" \
  PHOTOPRISM_DISABLE_CLASSIFICATION="false" \
  PHOTOPRISM_RAW_PRESETS="false" \
- PHOTOPRISM_THUMB_FILTER="lanczos" \
  PHOTOPRISM_THUMB_UNCACHED="false" \
  PHOTOPRISM_WORKERS=0 \
  PHOTOPRISM_WAKEUP_INTERVAL=900 \

diff --git a/docker/photoprism/buster/Dockerfile b/docker/photoprism/buster/Dockerfile
@@ -81,7 +81,6 @@ ENV PHOTOPRISM_ARCH=$TARGETARCH \
  PHOTOPRISM_DISABLE_FACES="false" \
  PHOTOPRISM_DISABLE_CLASSIFICATION="false" \
  PHOTOPRISM_RAW_PRESETS="false" \
- PHOTOPRISM_THUMB_FILTER="lanczos" \
  PHOTOPRISM_THUMB_UNCACHED="false" \
  PHOTOPRISM_WORKERS=0 \
  PHOTOPRISM_WAKEUP_INTERVAL=900 \

diff --git a/docker/photoprism/impish/Dockerfile b/docker/photoprism/impish/Dockerfile
@@ -81,7 +81,6 @@ ENV PHOTOPRISM_ARCH=$TARGETARCH \
  PHOTOPRISM_DISABLE_FACES="false" \
  PHOTOPRISM_DISABLE_CLASSIFICATION="false" \
  PHOTOPRISM_RAW_PRESETS="false" \
- PHOTOPRISM_THUMB_FILTER="lanczos" \
  PHOTOPRISM_THUMB_UNCACHED="false" \
  PHOTOPRISM_WORKERS=0 \
  PHOTOPRISM_WAKEUP_INTERVAL=900 \

diff --git a/docker/photoprism/jammy/Dockerfile b/docker/photoprism/jammy/Dockerfile
@@ -79,7 +79,6 @@ ENV PHOTOPRISM_ARCH=$TARGETARCH \
  PHOTOPRISM_DISABLE_FACES="false" \
  PHOTOPRISM_DISABLE_CLASSIFICATION="false" \
  PHOTOPRISM_RAW_PRESETS="false" \
- PHOTOPRISM_THUMB_FILTER="lanczos" \
  PHOTOPRISM_THUMB_UNCACHED="false" \
  PHOTOPRISM_WORKERS=0 \
  PHOTOPRISM_WAKEUP_INTERVAL=900 \

diff --git a/docker/photoprism/lunar/Dockerfile b/docker/photoprism/lunar/Dockerfile
@@ -79,7 +79,6 @@ ENV PHOTOPRISM_ARCH=$TARGETARCH \
  PHOTOPRISM_DISABLE_FACES="false" \
  PHOTOPRISM_DISABLE_CLASSIFICATION="false" \
  PHOTOPRISM_RAW_PRESETS="false" \
- PHOTOPRISM_THUMB_FILTER="lanczos" \
  PHOTOPRISM_THUMB_UNCACHED="false" \
  PHOTOPRISM_WORKERS=0 \
  PHOTOPRISM_WAKEUP_INTERVAL=900 \

diff --git a/docker/photoprism/mantic/Dockerfile b/docker/photoprism/mantic/Dockerfile
@@ -79,7 +79,6 @@ ENV PHOTOPRISM_ARCH=$TARGETARCH \
  PHOTOPRISM_DISABLE_FACES="false" \
  PHOTOPRISM_DISABLE_CLASSIFICATION="false" \
  PHOTOPRISM_RAW_PRESETS="false" \
- PHOTOPRISM_THUMB_FILTER="lanczos" \
  PHOTOPRISM_THUMB_UNCACHED="false" \
  PHOTOPRISM_WORKERS=0 \
  PHOTOPRISM_WAKEUP_INTERVAL=900 \

diff --git a/docker/photoprism/noble/Dockerfile b/docker/photoprism/noble/Dockerfile
@@ -79,7 +79,6 @@ ENV PHOTOPRISM_ARCH=$TARGETARCH \
  PHOTOPRISM_DISABLE_FACES="false" \
  PHOTOPRISM_DISABLE_CLASSIFICATION="false" \
  PHOTOPRISM_RAW_PRESETS="false" \
- PHOTOPRISM_THUMB_FILTER="lanczos" \
  PHOTOPRISM_THUMB_UNCACHED="false" \
  PHOTOPRISM_WORKERS=0 \
  PHOTOPRISM_WAKEUP_INTERVAL=900 \

diff --git a/scripts/dist/install-jxl.sh b/scripts/dist/install-jxl.sh
@@ -50,7 +50,7 @@ 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" || $VERSION_CODENAME == "mantic" ]]; then
+ elif [[ $VERSION_CODENAME == "lunar" || $VERSION_CODENAME == "mantic" || $VERSION_CODENAME == "noble" ]]; then
  echo "Installing JPEG XL distribution packages for amd64 (Intel 64-bit)"
  apt-get -qq install libjxl-dev libjxl-tools
  else
@@ -59,7 +59,7 @@ case $DESTARCH in
  ;;
 
  arm64 | ARM64 | aarch64)
- if [[ $VERSION_CODENAME == "lunar" || $VERSION_CODENAME == "mantic" ]]; then
+ if [[ $VERSION_CODENAME == "lunar" || $VERSION_CODENAME == "mantic" || $VERSION_CODENAME == "noble" ]]; then
  echo "Installing JPEG XL distribution packages for arm64 (ARM 64-bit)"
  apt-get -qq install libjxl-dev libjxl-tools
  else