Update versions.json

Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>

CHANGELOG.md

@@ -12,6 +12,20 @@ Exercise vigilance regarding copycat or coat-tailing sites that seek to exploit
 
 ## 2025-07-11
 
+### 🚀 Updated Scripts
+
+  - #### 🐞 Bug Fixes
+
+    - Quickfix: Immich: revert install sequence [@vhsdream](https://github.com/vhsdream) ([#5932](https://github.com/community-scripts/ProxmoxVE/pull/5932))
+
+  - #### ✨ New Features
+
+    - Refactor & Function Bump: Docker [@MickLesk](https://github.com/MickLesk) ([#5889](https://github.com/community-scripts/ProxmoxVE/pull/5889))
+
+  - #### 🔧 Refactor
+
+    - Immich: handle custom library dependency updates; other fixes [@vhsdream](https://github.com/vhsdream) ([#5896](https://github.com/community-scripts/ProxmoxVE/pull/5896))
+
 ## 2025-07-10
 
 ### 🚀 Updated Scripts

ct/docker.sh

@@ -20,18 +20,68 @@ color
 catch_errors
 
 function update_script() {
-    header_info
-    check_container_storage
-    check_container_resources
-    if [[ ! -d /var ]]; then
-        msg_error "No ${APP} Installation Found!"
-        exit
-    fi
-    msg_info "Updating ${APP} LXC"
-    $STD apt-get update
-    $STD apt-get -y upgrade
-    msg_ok "Updated ${APP} LXC"
-    exit
+  header_info
+  check_container_storage
+  check_container_resources
+
+  get_latest_release() {
+    curl -fsSL https://api.github.com/repos/"$1"/releases/latest | grep '"tag_name":' | cut -d'"' -f4
+  }
+
+  msg_info "Updating base system"
+  $STD apt-get update
+  $STD apt-get -y upgrade
+  msg_ok "Base system updated"
+
+  msg_info "Updating Docker Engine"
+  $STD apt-get install --only-upgrade -y docker-ce docker-ce-cli containerd.io
+  msg_ok "Docker Engine updated"
+
+  if [[ -f /usr/local/lib/docker/cli-plugins/docker-compose ]]; then
+    COMPOSE_BIN="/usr/local/lib/docker/cli-plugins/docker-compose"
+    COMPOSE_NEW_VERSION=$(get_latest_release "docker/compose")
+    msg_info "Updating Docker Compose to $COMPOSE_NEW_VERSION"
+    curl -fsSL "https://github.com/docker/compose/releases/download/${COMPOSE_NEW_VERSION}/docker-compose-$(uname -s)-$(uname -m)" \
+      -o "$COMPOSE_BIN"
+    chmod +x "$COMPOSE_BIN"
+    msg_ok "Docker Compose updated"
+  fi
+
+  if docker ps -a --format '{{.Names}}' | grep -q '^portainer$'; then
+    msg_info "Updating Portainer"
+    $STD docker pull portainer/portainer-ce:latest
+    $STD docker stop portainer && docker rm portainer
+    $STD docker volume create portainer_data >/dev/null 2>&1
+    $STD docker run -d \
+      -p 8000:8000 \
+      -p 9443:9443 \
+      --name=portainer \
+      --restart=always \
+      -v /var/run/docker.sock:/var/run/docker.sock \
+      -v portainer_data:/data \
+      portainer/portainer-ce:latest
+    msg_ok "Updated Portainer"
+  fi
+
+  if docker ps -a --format '{{.Names}}' | grep -q '^portainer_agent$'; then
+    msg_info "Updating Portainer Agent"
+    $STD docker pull portainer/agent:latest
+    $STD docker stop portainer_agent && docker rm portainer_agent
+    $STD docker run -d \
+      -p 9001:9001 \
+      --name=portainer_agent \
+      --restart=always \
+      -v /var/run/docker.sock:/var/run/docker.sock \
+      -v /var/lib/docker/volumes:/var/lib/docker/volumes \
+      portainer/agent
+    msg_ok "Updated Portainer Agent"
+  fi
+
+  msg_info "Cleaning up"
+  $STD apt-get -y autoremove
+  $STD apt-get -y autoclean
+  msg_ok "Cleanup complete"
+  exit
 }
 
 start
@@ -39,4 +89,4 @@ build_container
 description
 
 msg_ok "Completed Successfully!\n"
-echo -e "${CREATING}${GN}${APP} setup has been successfully initialized!${CL}"
+echo -e "${CREATING}${GN}${APP} setup has been successfully initialized!${CL}"

ct/immich.sh

@@ -51,134 +51,12 @@ function update_script() {
   fi
   if [[ -f ~/.immich_library_revisions ]]; then
     libraries=("libjxl" "libheif" "libraw" "imagemagick" "libvips")
-    readarray -d '' NEW_REVISIONS < <(for library in "${libraries[@]}"; do
-      echo "$library: $(curl -fsSL https://raw.githubusercontent.com/immich-app/base-images/refs/heads/main/server/sources/"$library".json | jq -cr '.revision' -)"
-    done)
-    UPDATED_REVISIONS="$(comm -13 <(sort ~/.immich_library_revisions) <(echo -n "${NEW_REVISIONS[@]}" | sort))"
-    if [[ "$UPDATED_REVISIONS" ]]; then
-      readarray -t NAMES < <(echo "$UPDATED_REVISIONS" | awk -F ':' '{print $1}')
-      rm -rf "$SOURCE_DIR"
-      mkdir -p "$SOURCE_DIR"
-      cd "$BASE_DIR"
-      $STD git pull
-      cd "$STAGING_DIR"
-      for name in "${NAMES[@]}"; do
-        if [[ "$name" == "libjxl" ]]; then
-          msg_info "Recompiling libjxl"
-          SOURCE=${SOURCE_DIR}/libjxl
-          JPEGLI_LIBJPEG_LIBRARY_SOVERSION="62"
-          JPEGLI_LIBJPEG_LIBRARY_VERSION="62.3.0"
-          : "${LIBJXL_REVISION:=$(jq -cr '.revision' $BASE_DIR/server/sources/libjxl.json)}"
-          $STD git clone https://github.com/libjxl/libjxl.git "$SOURCE"
-          cd "$SOURCE"
-          $STD git reset --hard "$LIBJXL_REVISION"
-          $STD git submodule update --init --recursive --depth 1 --recommend-shallow
-          $STD git apply "$BASE_DIR"/server/sources/libjxl-patches/jpegli-empty-dht-marker.patch
-          $STD git apply "$BASE_DIR"/server/sources/libjxl-patches/jpegli-icc-warning.patch
-          mkdir build
-          cd build
-          $STD cmake \
-            -DCMAKE_BUILD_TYPE=Release \
-            -DBUILD_TESTING=OFF \
-            -DJPEGXL_ENABLE_DOXYGEN=OFF \
-            -DJPEGXL_ENABLE_MANPAGES=OFF \
-            -DJPEGXL_ENABLE_PLUGIN_GIMP210=OFF \
-            -DJPEGXL_ENABLE_BENCHMARK=OFF \
-            -DJPEGXL_ENABLE_EXAMPLES=OFF \
-            -DJPEGXL_FORCE_SYSTEM_BROTLI=ON \
-            -DJPEGXL_FORCE_SYSTEM_HWY=ON \
-            -DJPEGXL_ENABLE_JPEGLI=ON \
-            -DJPEGXL_ENABLE_JPEGLI_LIBJPEG=ON \
-            -DJPEGXL_INSTALL_JPEGLI_LIBJPEG=ON \
-            -DJPEGXL_ENABLE_PLUGINS=ON \
-            -DJPEGLI_LIBJPEG_LIBRARY_SOVERSION="$JPEGLI_LIBJPEG_LIBRARY_SOVERSION" \
-            -DJPEGLI_LIBJPEG_LIBRARY_VERSION="$JPEGLI_LIBJPEG_LIBRARY_VERSION" \
-            -DLIBJPEG_TURBO_VERSION_NUMBER=2001005 \
-            ..
-          $STD cmake --build . -- -j"$(nproc)"
-          $STD cmake --install .
-          ldconfig /usr/local/lib
-          $STD make clean
-          cd "$STAGING_DIR"
-          rm -rf "$SOURCE"/{build,third_party}
-          msg_ok "Recompiled libjxl"
-        fi
-        if [[ "$name" == "libheif" ]]; then
-          msg_info "Recompiling libheif"
-          SOURCE=${SOURCE_DIR}/libheif
-          : "${LIBHEIF_REVISION:=$(jq -cr '.revision' $BASE_DIR/server/sources/libheif.json)}"
-          $STD git clone https://github.com/strukturag/libheif.git "$SOURCE"
-          cd "$SOURCE"
-          $STD git reset --hard "$LIBHEIF_REVISION"
-          mkdir build
-          cd build
-          $STD cmake --preset=release-noplugins \
-            -DWITH_DAV1D=ON \
-            -DENABLE_PARALLEL_TILE_DECODING=ON \
-            -DWITH_LIBSHARPYUV=ON \
-            -DWITH_LIBDE265=ON \
-            -DWITH_AOM_DECODER=OFF \
-            -DWITH_AOM_ENCODER=OFF \
-            -DWITH_X265=OFF \
-            -DWITH_EXAMPLES=OFF \
-            ..
-          $STD make install -j "$(nproc)"
-          ldconfig /usr/local/lib
-          $STD make clean
-          cd "$STAGING_DIR"
-          rm -rf "$SOURCE"/build
-          msg_ok "Recompiled libheif"
-        fi
-        if [[ "$name" == "libraw" ]]; then
-          msg_info "Recompiling libraw"
-          SOURCE=${SOURCE_DIR}/libraw
-          : "${LIBRAW_REVISION:=$(jq -cr '.revision' $BASE_DIR/server/sources/libraw.json)}"
-          $STD git clone https://github.com/libraw/libraw.git "$SOURCE"
-          cd "$SOURCE"
-          $STD git reset --hard "$LIBRAW_REVISION"
-          $STD autoreconf --install
-          $STD ./configure
-          $STD make -j"$(nproc)"
-          $STD make install
-          ldconfig /usr/local/lib
-          $STD make clean
-          cd "$STAGING_DIR"
-          msg_ok "Recompiled libraw"
-        fi
-        if [[ "$name" == "imagemagick" ]]; then
-          msg_info "Recompiling ImageMagick"
-          SOURCE=$SOURCE_DIR/imagemagick
-          : "${IMAGEMAGICK_REVISION:=$(jq -cr '.revision' $BASE_DIR/server/sources/imagemagick.json)}"
-          $STD git clone https://github.com/ImageMagick/ImageMagick.git "$SOURCE"
-          cd "$SOURCE"
-          $STD git reset --hard "$IMAGEMAGICK_REVISION"
-          $STD ./configure --with-modules
-          $STD make -j"$(nproc)"
-          $STD make install
-          ldconfig /usr/local/lib
-          $STD make clean
-          cd "$STAGING_DIR"
-          msg_ok "Recompiled ImageMagick"
-        fi
-        if [[ "$name" == "libvips" ]]; then
-          msg_info "Recompiling libvips"
-          SOURCE=$SOURCE_DIR/libvips
-          : "${LIBVIPS_REVISION:=$(jq -cr '.revision' $BASE_DIR/server/sources/libvips.json)}"
-          $STD git clone https://github.com/libvips/libvips.git "$SOURCE"
-          cd "$SOURCE"
-          $STD git reset --hard "$LIBVIPS_REVISION"
-          $STD meson setup build --buildtype=release --libdir=lib -Dintrospection=disabled -Dtiff=disabled
-          cd build
-          $STD ninja install
-          ldconfig /usr/local/lib
-          cd "$STAGING_DIR"
-          rm -rf "$SOURCE"/build
-          msg_ok "Recompiled libvips"
-        fi
-      done
-      echo -n "${NEW_REVISIONS[@]}" >~/.immich_library_revisions
-      msg_ok "Image-processing libraries compiled"
-    fi
+    cd "$BASE_DIR"
+    $STD git pull
+    for library in "${libraries[@]}"; do
+      compile_"$library"
+    done
+    msg_ok "Image-processing libraries updated"
   fi
   RELEASE=$(curl -fsSL https://api.github.com/repos/immich-app/immich/releases?per_page=1 | grep "tag_name" | awk '{print substr($2, 3, length($2)-4) }')
   if [[ -f ~/.immich && "$RELEASE" == "$(cat ~/.immich)" ]]; then
@@ -293,6 +171,143 @@ function update_script() {
   exit
 }
 
+function compile_libjxl() {
+  SOURCE=${SOURCE_DIR}/libjxl
+  JPEGLI_LIBJPEG_LIBRARY_SOVERSION="62"
+  JPEGLI_LIBJPEG_LIBRARY_VERSION="62.3.0"
+  : "${LIBJXL_REVISION:=$(jq -cr '.revision' "$BASE_DIR"/server/sources/libjxl.json)}"
+  if [[ "${update:-}" ]] || [[ "$LIBJXL_REVISION" != "$(grep 'libjxl' ~/.immich_library_revisions | awk '{print $2}')" ]]; then
+    msg_info "Recompiling libjxl"
+    if [[ -d "$SOURCE" ]]; then rm -rf "$SOURCE"; fi
+    $STD git clone https://github.com/libjxl/libjxl.git "$SOURCE"
+    cd "$SOURCE"
+    $STD git reset --hard "$LIBJXL_REVISION"
+    $STD git submodule update --init --recursive --depth 1 --recommend-shallow
+    $STD git apply "$BASE_DIR"/server/sources/libjxl-patches/jpegli-empty-dht-marker.patch
+    $STD git apply "$BASE_DIR"/server/sources/libjxl-patches/jpegli-icc-warning.patch
+    mkdir build
+    cd build
+    $STD cmake \
+      -DCMAKE_BUILD_TYPE=Release \
+      -DBUILD_TESTING=OFF \
+      -DJPEGXL_ENABLE_DOXYGEN=OFF \
+      -DJPEGXL_ENABLE_MANPAGES=OFF \
+      -DJPEGXL_ENABLE_PLUGIN_GIMP210=OFF \
+      -DJPEGXL_ENABLE_BENCHMARK=OFF \
+      -DJPEGXL_ENABLE_EXAMPLES=OFF \
+      -DJPEGXL_FORCE_SYSTEM_BROTLI=ON \
+      -DJPEGXL_FORCE_SYSTEM_HWY=ON \
+      -DJPEGXL_ENABLE_JPEGLI=ON \
+      -DJPEGXL_ENABLE_JPEGLI_LIBJPEG=ON \
+      -DJPEGXL_INSTALL_JPEGLI_LIBJPEG=ON \
+      -DJPEGXL_ENABLE_PLUGINS=ON \
+      -DJPEGLI_LIBJPEG_LIBRARY_SOVERSION="$JPEGLI_LIBJPEG_LIBRARY_SOVERSION" \
+      -DJPEGLI_LIBJPEG_LIBRARY_VERSION="$JPEGLI_LIBJPEG_LIBRARY_VERSION" \
+      -DLIBJPEG_TURBO_VERSION_NUMBER=2001005 \
+      ..
+    $STD cmake --build . -- -j"$(nproc)"
+    $STD cmake --install .
+    ldconfig /usr/local/lib
+    $STD make clean
+    cd "$STAGING_DIR"
+    rm -rf "$SOURCE"/{build,third_party}
+    msg_ok "Recompiled libjxl"
+  fi
+}
+
+function compile_libheif() {
+  SOURCE=${SOURCE_DIR}/libheif
+  if ! dpkg -l | grep -q libaom; then
+    $STD apt-get install -y libaom-dev
+    local update="required"
+  fi
+  : "${LIBHEIF_REVISION:=$(jq -cr '.revision' "$BASE_DIR"/server/sources/libheif.json)}"
+  if [[ "${update:-}" ]] || [[ "$LIBHEIF_REVISION" != "$(grep 'libheif' ~/.immich_library_revisions | awk '{print $2}')" ]]; then
+    msg_info "Recompiling libheif"
+    if [[ -d "$SOURCE" ]]; then rm -rf "$SOURCE"; fi
+    $STD git clone https://github.com/strukturag/libheif.git "$SOURCE"
+    cd "$SOURCE"
+    $STD git reset --hard "$LIBHEIF_REVISION"
+    mkdir build
+    cd build
+    $STD cmake --preset=release-noplugins \
+      -DWITH_DAV1D=ON \
+      -DENABLE_PARALLEL_TILE_DECODING=ON \
+      -DWITH_LIBSHARPYUV=ON \
+      -DWITH_LIBDE265=ON \
+      -DWITH_AOM_DECODER=OFF \
+      -DWITH_AOM_ENCODER=ON \
+      -DWITH_X265=OFF \
+      -DWITH_EXAMPLES=OFF \
+      ..
+    $STD make install -j "$(nproc)"
+    ldconfig /usr/local/lib
+    $STD make clean
+    cd "$STAGING_DIR"
+    rm -rf "$SOURCE"/build
+    msg_ok "Recompiled libheif"
+  fi
+}
+
+function compile_libraw() {
+  SOURCE=${SOURCE_DIR}/libraw
+  local update
+  : "${LIBRAW_REVISION:=$(jq -cr '.revision' "$BASE_DIR"/server/sources/libraw.json)}"
+  if [[ "${update:-}" ]] || [[ "$LIBRAW_REVISION" != "$(grep 'libraw' ~/.immich_library_revisions | awk '{print $2}')" ]]; then
+    msg_info "Recompiling libraw"
+    if [[ -d "$SOURCE" ]]; then rm -rf "$SOURCE"; fi
+    $STD git clone https://github.com/libraw/libraw.git "$SOURCE"
+    cd "$SOURCE"
+    $STD git reset --hard "$LIBRAW_REVISION"
+    $STD autoreconf --install
+    $STD ./configure
+    $STD make -j"$(nproc)"
+    $STD make install
+    ldconfig /usr/local/lib
+    $STD make clean
+    cd "$STAGING_DIR"
+    msg_ok "Recompiled libraw"
+  fi
+}
+
+function compile_imagemagick() {
+  SOURCE=$SOURCE_DIR/imagemagick
+  : "${IMAGEMAGICK_REVISION:=$(jq -cr '.revision' "$BASE_DIR"/server/sources/imagemagick.json)}"
+  if [[ "${update:-}" ]] || [[ "$IMAGEMAGICK_REVISION" != "$(grep 'imagemagick' ~/.immich_library_revisions | awk '{print $2}')" ]]; then
+    msg_info "Recompiling ImageMagick"
+    if [[ -d "$SOURCE" ]]; then rm -rf "$SOURCE"; fi
+    $STD git clone https://github.com/ImageMagick/ImageMagick.git "$SOURCE"
+    cd "$SOURCE"
+    $STD git reset --hard "$IMAGEMAGICK_REVISION"
+    $STD ./configure --with-modules
+    $STD make -j"$(nproc)"
+    $STD make install
+    ldconfig /usr/local/lib
+    $STD make clean
+    cd "$STAGING_DIR"
+    msg_ok "Recompiled ImageMagick"
+  fi
+}
+
+function compile_libvips() {
+  SOURCE=$SOURCE_DIR/libvips
+  : "${LIBVIPS_REVISION:=$(jq -cr '.revision' "$BASE_DIR"/server/sources/libvips.json)}"
+  if [[ "${update:-}" ]] || [[ "$LIBVIPS_REVISION" != "$(grep 'libvips' ~/.immich_library_revisions | awk '{print $2}')" ]]; then
+    msg_info "Recompiling libvips"
+    if [[ -d "$SOURCE" ]]; then rm -rf "$SOURCE"; fi
+    $STD git clone https://github.com/libvips/libvips.git "$SOURCE"
+    cd "$SOURCE"
+    $STD git reset --hard "$LIBVIPS_REVISION"
+    $STD meson setup build --buildtype=release --libdir=lib -Dintrospection=disabled -Dtiff=disabled
+    cd build
+    $STD ninja install
+    ldconfig /usr/local/lib
+    cd "$STAGING_DIR"
+    rm -rf "$SOURCE"/build
+    msg_ok "Recompiled libvips"
+  fi
+}
+
 start
 build_container
 description

frontend/public/json/versions.json

@@ -1,4 +1,44 @@
 [
+  {
+    "name": "prometheus/prometheus",
+    "version": "v2.53.5",
+    "date": "2025-06-30T11:01:12Z"
+  },
+  {
+    "name": "Paymenter/Paymenter",
+    "version": "v1.2.2",
+    "date": "2025-07-11T10:09:47Z"
+  },
+  {
+    "name": "traefik/traefik",
+    "version": "v3.4.4",
+    "date": "2025-07-11T08:41:34Z"
+  },
+  {
+    "name": "mattermost/mattermost",
+    "version": "preview-v0.1",
+    "date": "2025-06-27T14:35:47Z"
+  },
+  {
+    "name": "Jackett/Jackett",
+    "version": "v0.22.2145",
+    "date": "2025-07-11T05:49:32Z"
+  },
+  {
+    "name": "documenso/documenso",
+    "version": "v1.12.2-rc.1",
+    "date": "2025-07-11T02:55:56Z"
+  },
+  {
+    "name": "outline/outline",
+    "version": "v0.85.1",
+    "date": "2025-07-11T01:17:53Z"
+  },
+  {
+    "name": "steveiliop56/tinyauth",
+    "version": "v3.6.0",
+    "date": "2025-07-09T23:15:25Z"
+  },
   {
     "name": "jenkinsci/jenkins",
     "version": "jenkins-2.518",
@@ -24,6 +64,11 @@
     "version": "v0.9.6",
     "date": "2025-07-08T01:26:29Z"
   },
+  {
+    "name": "keycloak/keycloak",
+    "version": "26.3.1",
+    "date": "2025-07-09T15:41:43Z"
+  },
   {
     "name": "msgbyte/tianji",
     "version": "v1.23.4",
@@ -54,26 +99,11 @@
     "version": "prototype-incremental-vector-store-3",
     "date": "2025-07-07T10:27:19Z"
   },
-  {
-    "name": "mattermost/mattermost",
-    "version": "preview-v0.1",
-    "date": "2025-06-27T14:35:47Z"
-  },
-  {
-    "name": "Jackett/Jackett",
-    "version": "v0.22.2140",
-    "date": "2025-07-10T05:54:59Z"
-  },
   {
     "name": "firefly-iii/firefly-iii",
     "version": "v6.2.20",
     "date": "2025-07-02T04:03:37Z"
   },
-  {
-    "name": "steveiliop56/tinyauth",
-    "version": "v3.6.0",
-    "date": "2025-07-09T23:15:25Z"
-  },
   {
     "name": "pocket-id/pocket-id",
     "version": "v1.6.2",
@@ -109,11 +139,6 @@
     "version": "v2.1.0.123-2.1.0.123_canary_2025-07-09",
     "date": "2025-07-09T16:08:36Z"
   },
-  {
-    "name": "keycloak/keycloak",
-    "version": "26.3.1",
-    "date": "2025-07-09T15:41:43Z"
-  },
   {
     "name": "nicolargo/glances",
     "version": "v4.3.3",
@@ -244,11 +269,6 @@
     "version": "v25.05.2",
     "date": "2025-07-07T14:08:25Z"
   },
-  {
-    "name": "Paymenter/Paymenter",
-    "version": "v1.2.1",
-    "date": "2025-07-07T10:11:26Z"
-  },
   {
     "name": "nzbgetcom/nzbget",
     "version": "v25.2",
@@ -369,11 +389,6 @@
     "version": "6.3.1",
     "date": "2025-07-04T11:20:48Z"
   },
-  {
-    "name": "outline/outline",
-    "version": "v0.85.0",
-    "date": "2025-07-04T00:06:47Z"
-  },
   {
     "name": "cloudflare/cloudflared",
     "version": "2025.7.0",
@@ -399,11 +414,6 @@
     "version": "v25.7.1",
     "date": "2025-07-03T01:03:18Z"
   },
-  {
-    "name": "documenso/documenso",
-    "version": "v1.12.2-rc.0",
-    "date": "2025-07-03T00:31:22Z"
-  },
   {
     "name": "Koenkk/zigbee2mqtt",
     "version": "2.5.1",
@@ -474,11 +484,6 @@
     "version": "v0.9.81",
     "date": "2025-06-30T16:40:33Z"
   },
-  {
-    "name": "prometheus/prometheus",
-    "version": "v2.53.5",
-    "date": "2025-06-30T11:01:12Z"
-  },
   {
     "name": "jupyter/notebook",
     "version": "v7.4.4",
@@ -529,11 +534,6 @@
     "version": "v1.84.3",
     "date": "2025-06-26T16:31:57Z"
   },
-  {
-    "name": "traefik/traefik",
-    "version": "v3.5.0-rc1",
-    "date": "2025-06-26T15:08:43Z"
-  },
   {
     "name": "node-red/node-red",
     "version": "4.1.0-beta.2",

install/docker-install.sh

@@ -29,7 +29,17 @@ echo -e '{\n  "log-driver": "journald"\n}' >/etc/docker/daemon.json
 $STD sh <(curl -fsSL https://get.docker.com)
 msg_ok "Installed Docker $DOCKER_LATEST_VERSION"
 
-read -r -p "${TAB3}Would you like to add Portainer? <y/N> " prompt
+read -r -p "${TAB3}Install Docker Compose v2 plugin? <y/N> " prompt_compose
+if [[ ${prompt_compose,,} =~ ^(y|yes)$ ]]; then
+  msg_info "Installing Docker Compose $DOCKER_COMPOSE_LATEST_VERSION"
+  mkdir -p /usr/local/lib/docker/cli-plugins
+  curl -fsSL "https://github.com/docker/compose/releases/download/${DOCKER_COMPOSE_LATEST_VERSION}/docker-compose-$(uname -s)-$(uname -m)" \
+    -o /usr/local/lib/docker/cli-plugins/docker-compose
+  chmod +x /usr/local/lib/docker/cli-plugins/docker-compose
+  msg_ok "Installed Docker Compose $DOCKER_COMPOSE_LATEST_VERSION"
+fi
+
+read -r -p "${TAB3}Would you like to add Portainer (UI)? <y/N> " prompt
 if [[ ${prompt,,} =~ ^(y|yes)$ ]]; then
   msg_info "Installing Portainer $PORTAINER_LATEST_VERSION"
   docker volume create portainer_data >/dev/null
@@ -43,9 +53,9 @@ if [[ ${prompt,,} =~ ^(y|yes)$ ]]; then
     portainer/portainer-ce:latest
   msg_ok "Installed Portainer $PORTAINER_LATEST_VERSION"
 else
-  read -r -p "${TAB3}Would you like to add the Portainer Agent? <y/N> " prompt
-  if [[ ${prompt,,} =~ ^(y|yes)$ ]]; then
-    msg_info "Installing Portainer agent $PORTAINER_AGENT_LATEST_VERSION"
+  read -r -p "${TAB3}Would you like to install the Portainer Agent (for remote management)? <y/N> " prompt_agent
+  if [[ ${prompt_agent,,} =~ ^(y|yes)$ ]]; then
+    msg_info "Installing Portainer Agent $PORTAINER_AGENT_LATEST_VERSION"
     $STD docker run -d \
       -p 9001:9001 \
       --name portainer_agent \
@@ -57,12 +67,25 @@ else
   fi
 fi
 
-read -r -p "${TAB3}Expose Docker TCP socket (⚠️ insecure)? <y/N> " prompt
-if [[ "${prompt,,}" =~ ^(y|yes)$ ]]; then
-  msg_info "Enabling Docker TCP socket on port 2375 (insecure)"
-  
-  mkdir -p /etc/docker
-  echo '{ "hosts": ["unix:///var/run/docker.sock", "tcp://0.0.0.0:2375"] }' > /etc/docker/daemon.json
+read -r -p "${TAB3}Expose Docker TCP socket (insecure) ? [n = No, l = Local only (127.0.0.1), a = All interfaces (0.0.0.0)] <n/l/a>: " socket_choice
+case "${socket_choice,,}" in
+  l)
+    socket="tcp://127.0.0.1:2375"
+    ;;
+  a)
+    socket="tcp://0.0.0.0:2375"
+    ;;
+  *)
+    socket=""
+    ;;
+esac
+
+if [[ -n "$socket" ]]; then
+  msg_info "Enabling Docker TCP socket on $socket"
+  $STD apt-get install -y jq
+
+  tmpfile=$(mktemp)
+  jq --arg sock "$socket" '. + { "hosts": ["unix:///var/run/docker.sock", $sock] }' /etc/docker/daemon.json > "$tmpfile" && mv "$tmpfile" /etc/docker/daemon.json
 
   mkdir -p /etc/systemd/system/docker.service.d
   cat <<EOF > /etc/systemd/system/docker.service.d/override.conf
@@ -75,14 +98,13 @@ EOF
   $STD systemctl daemon-reload
 
   if systemctl restart docker; then
-    msg_ok "Docker TCP socket now available on tcp://0.0.0.0:2375"
+    msg_ok "Docker TCP socket available on $socket"
   else
     msg_error "Docker failed to restart. Check journalctl -xeu docker.service"
     exit 1
   fi
 fi
 
-
 motd_ssh
 customize
 

install/immich-install.sh

@@ -66,6 +66,7 @@ $STD apt-get install --no-install-recommends -y \
   mesa-vulkan-drivers \
   ocl-icd-libopencl1 \
   tini \
+  libaom-dev \
   zlib1g
 $STD apt-get install -y \
   libgdk-pixbuf-2.0-dev librsvg2-dev libtool
@@ -153,7 +154,6 @@ if [[ -f ~/.openvino ]]; then
 fi
 msg_ok "Packages from Testing Repo Installed"
 
-# Fix default DB collation issue after libc update
 $STD sudo -u postgres psql -c "ALTER DATABASE postgres REFRESH COLLATION VERSION;"
 $STD sudo -u postgres psql -c "ALTER DATABASE $DB_NAME REFRESH COLLATION VERSION;"
 
@@ -218,7 +218,7 @@ $STD cmake --preset=release-noplugins \
   -DWITH_LIBSHARPYUV=ON \
   -DWITH_LIBDE265=ON \
   -DWITH_AOM_DECODER=OFF \
-  -DWITH_AOM_ENCODER=OFF \
+  -DWITH_AOM_ENCODER=ON \
   -DWITH_X265=OFF \
   -DWITH_EXAMPLES=OFF \
   ..