From 420ff2f2f5092c14e71d7e16f7027371740ba979 Mon Sep 17 00:00:00 2001
From: evazion <noizave@gmail.com>
Date: Mon, 24 Oct 2022 19:58:24 -0500
Subject: [PATCH] docker: update base image dependencies.

* Update base Ubuntu image from 22.04 to 22.10.
* Update FFmpeg from 4.4.1 to 5.1.2
* Update MozJPEG from 4.0.3 to 4.1.1.
* Update ExifTool from 12.30 to 12.42.

The FFmpeg upgrade is necessary for .avif file support. Older versions
of ffprobe don't handle .avif files correctly. It either returns an
error, or in certain cases it can interpret a static .avif image as a
video (since .avif files are basically .mp4 files in disguise).
---
 config/docker/Dockerfile.danbooru | 2 +-
 config/docker/build-base-image.sh | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/config/docker/Dockerfile.danbooru b/config/docker/Dockerfile.danbooru
index c347d7819..7aa2347b6 100644
--- a/config/docker/Dockerfile.danbooru
+++ b/config/docker/Dockerfile.danbooru
@@ -1,4 +1,4 @@
-FROM ubuntu:22.04 AS base
+FROM ubuntu:22.10 AS base
 
 WORKDIR /danbooru
 ENV PATH="/root/.asdf/bin:/root/.asdf/shims:$PATH:/usr/lib/postgresql/14/bin"
diff --git a/config/docker/build-base-image.sh b/config/docker/build-base-image.sh
index ff486b321..a14a09fbd 100755
--- a/config/docker/build-base-image.sh
+++ b/config/docker/build-base-image.sh
@@ -3,10 +3,10 @@
 set -xeuo pipefail
 
 RUBY_VERSION="${RUBY_VERSION:-3.1.2}"
-VIPS_VERSION="${VIPS_VERSION:-8.12.1}"
-FFMPEG_VERSION="${FFMPEG_VERSION:-4.4.1}"
-MOZJPEG_VERSION="${MOZJPEG_VERSION:-4.0.3}"
-EXIFTOOL_VERSION="${EXIFTOOL_VERSION:-12.30}"
+VIPS_VERSION="${VIPS_VERSION:-8.13.2}"
+FFMPEG_VERSION="${FFMPEG_VERSION:-5.1.2}"
+MOZJPEG_VERSION="${MOZJPEG_VERSION:-4.1.1}"
+EXIFTOOL_VERSION="${EXIFTOOL_VERSION:-12.42}"
 OPENRESTY_VERSION="${OPENRESTY_VERSION:-1.19.9.1}"
 POSTGRESQL_CLIENT_VERSION="${POSTGRESQL_CLIENT_VERSION:-14}"