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

Signed-off-by: Michael Mayer <michael@photoprism.app>

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
     ;;

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

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
     ;;
 

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"

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\"..."

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