Skip to content

Commit 8b87272

Browse files
authored
Immich: bump to v1.142.0 (#7594)
* Immich: cleanup - removing some redundant/unused stuff - restoring proper output suppression for machine-learning build - add more messages during custom library build * Immich: bump to v1.142.0
1 parent ceccf08 commit 8b87272

File tree

2 files changed

+22
-15
lines changed

2 files changed

+22
-15
lines changed

ct/immich.sh

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ function update_script() {
6161
done
6262
msg_ok "Image-processing libraries up to date"
6363
fi
64-
RELEASE="1.141.1"
64+
RELEASE="1.142.0"
6565
if check_for_gh_release "immich" "immich-app/immich" "${RELEASE}"; then
6666
msg_info "Stopping Services"
6767
systemctl stop immich-web
@@ -160,15 +160,14 @@ EOF
160160
cd "$SRC_DIR"/machine-learning
161161
mkdir -p "$ML_DIR"
162162
export VIRTUAL_ENV="${ML_DIR}"/ml-venv
163-
$STD /usr/local/bin/uv venv "$VIRTUAL_ENV"
164163
if [[ -f ~/.openvino ]]; then
165164
msg_info "Updating HW-accelerated machine-learning"
166-
/usr/local/bin/uv -q sync --extra openvino --no-cache --active
165+
$STD /usr/local/bin/uv sync --extra openvino --no-cache --active
167166
patchelf --clear-execstack "${VIRTUAL_ENV}/lib/python3.11/site-packages/onnxruntime/capi/onnxruntime_pybind11_state.cpython-311-x86_64-linux-gnu.so"
168167
msg_ok "Updated HW-accelerated machine-learning"
169168
else
170169
msg_info "Updating machine-learning"
171-
/usr/local/bin/uv -q sync --extra cpu --no-cache --active
170+
$STD /usr/local/bin/uv sync --extra cpu --no-cache --active
172171
msg_ok "Updated machine-learning"
173172
fi
174173
cd "$SRC_DIR"
@@ -208,7 +207,7 @@ function compile_libjxl() {
208207
JPEGLI_LIBJPEG_LIBRARY_VERSION="62.3.0"
209208
# : "${LIBJXL_REVISION:=$(jq -cr '.revision' "$BASE_DIR"/server/sources/libjxl.json)}"
210209
: "${LIBJXL_REVISION:=794a5dcf0d54f9f0b20d288a12e87afb91d20dfc}"
211-
if [[ "${update:-}" ]] || [[ "$LIBJXL_REVISION" != "$(grep 'libjxl' ~/.immich_library_revisions | awk '{print $2}')" ]]; then
210+
if [[ "$LIBJXL_REVISION" != "$(grep 'libjxl' ~/.immich_library_revisions | awk '{print $2}')" ]]; then
212211
msg_info "Recompiling libjxl"
213212
if [[ -d "$SOURCE" ]]; then rm -rf "$SOURCE"; fi
214213
$STD git clone https://github.com/libjxl/libjxl.git "$SOURCE"
@@ -289,7 +288,7 @@ function compile_libraw() {
289288
local update
290289
# : "${LIBRAW_REVISION:=$(jq -cr '.revision' "$BASE_DIR"/server/sources/libraw.json)}"
291290
: "${LIBRAW_REVISION:=09bea31181b43e97959ee5452d91e5bc66365f1f}"
292-
if [[ "${update:-}" ]] || [[ "$LIBRAW_REVISION" != "$(grep 'libraw' ~/.immich_library_revisions | awk '{print $2}')" ]]; then
291+
if [[ "$LIBRAW_REVISION" != "$(grep 'libraw' ~/.immich_library_revisions | awk '{print $2}')" ]]; then
293292
msg_info "Recompiling libraw"
294293
if [[ -d "$SOURCE" ]]; then rm -rf "$SOURCE"; fi
295294
$STD git clone https://github.com/libraw/libraw.git "$SOURCE"
@@ -311,7 +310,7 @@ function compile_imagemagick() {
311310
SOURCE=$SOURCE_DIR/imagemagick
312311
# : "${IMAGEMAGICK_REVISION:=$(jq -cr '.revision' "$BASE_DIR"/server/sources/imagemagick.json)}"
313312
: "${IMAGEMAGICK_REVISION:=8289a3388a085ad5ae81aa6812f21554bdfd54f2}"
314-
if [[ "${update:-}" ]] || [[ "$IMAGEMAGICK_REVISION" != "$(grep 'imagemagick' ~/.immich_library_revisions | awk '{print $2}')" ]]; then
313+
if [[ "$IMAGEMAGICK_REVISION" != "$(grep 'imagemagick' ~/.immich_library_revisions | awk '{print $2}')" ]]; then
315314
msg_info "Recompiling ImageMagick"
316315
if [[ -d "$SOURCE" ]]; then rm -rf "$SOURCE"; fi
317316
$STD git clone https://github.com/ImageMagick/ImageMagick.git "$SOURCE"
@@ -332,7 +331,7 @@ function compile_libvips() {
332331
SOURCE=$SOURCE_DIR/libvips
333332
# : "${LIBVIPS_REVISION:=$(jq -cr '.revision' "$BASE_DIR"/server/sources/libvips.json)}"
334333
: "${LIBVIPS_REVISION:=8fa37a64547e392d3808eed8d72adab7e02b3d00}"
335-
if [[ "${update:-}" ]] || [[ "$LIBVIPS_REVISION" != "$(grep 'libvips' ~/.immich_library_revisions | awk '{print $2}')" ]]; then
334+
if [[ "$LIBVIPS_REVISION" != "$(grep 'libvips' ~/.immich_library_revisions | awk '{print $2}')" ]]; then
336335
msg_info "Recompiling libvips"
337336
if [[ -d "$SOURCE" ]]; then rm -rf "$SOURCE"; fi
338337
$STD git clone https://github.com/libvips/libvips.git "$SOURCE"

install/immich-install.sh

Lines changed: 15 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,6 @@ msg_ok "Packages from Testing Repo Installed"
155155
$STD sudo -u postgres psql -c "ALTER DATABASE postgres REFRESH COLLATION VERSION;"
156156
$STD sudo -u postgres psql -c "ALTER DATABASE $DB_NAME REFRESH COLLATION VERSION;"
157157

158-
msg_info "Compiling Custom Photo-processing Library (extreme patience)"
159158
LD_LIBRARY_PATH=/usr/local/lib
160159
export LD_RUN_PATH=/usr/local/lib
161160
STAGING_DIR=/opt/staging
@@ -165,6 +164,7 @@ SOURCE_DIR=${STAGING_DIR}/image-source
165164
$STD git clone -b main "$BASE_REPO" "$BASE_DIR"
166165
mkdir -p "$SOURCE_DIR"
167166

167+
msg_info "(1/5) Compiling libjxl"
168168
cd "$STAGING_DIR"
169169
SOURCE=${SOURCE_DIR}/libjxl
170170
JPEGLI_LIBJPEG_LIBRARY_SOVERSION="62"
@@ -203,7 +203,9 @@ ldconfig /usr/local/lib
203203
$STD make clean
204204
cd "$STAGING_DIR"
205205
rm -rf "$SOURCE"/{build,third_party}
206+
msg_ok "(1/5) Compiled libjxl"
206207

208+
msg_info "(2/5) Compiling libheif"
207209
SOURCE=${SOURCE_DIR}/libheif
208210
# : "${LIBHEIF_REVISION:=$(jq -cr '.revision' $BASE_DIR/server/sources/libheif.json)}"
209211
: "${LIBHEIF_REVISION:=35dad50a9145332a7bfdf1ff6aef6801fb613d68}"
@@ -227,7 +229,9 @@ ldconfig /usr/local/lib
227229
$STD make clean
228230
cd "$STAGING_DIR"
229231
rm -rf "$SOURCE"/build
232+
msg_ok "(2/5) Compiled libheif"
230233

234+
msg_info "(3/5) Compiling libraw"
231235
SOURCE=${SOURCE_DIR}/libraw
232236
# : "${LIBRAW_REVISION:=$(jq -cr '.revision' $BASE_DIR/server/sources/libraw.json)}"
233237
: "${LIBRAW_REVISION:=09bea31181b43e97959ee5452d91e5bc66365f1f}"
@@ -241,7 +245,9 @@ $STD make install
241245
ldconfig /usr/local/lib
242246
$STD make clean
243247
cd "$STAGING_DIR"
248+
msg_ok "(3/5) Compiled libraw"
244249

250+
msg_info "(4/5) Compiling imagemagick"
245251
SOURCE=$SOURCE_DIR/imagemagick
246252
# : "${IMAGEMAGICK_REVISION:=$(jq -cr '.revision' $BASE_DIR/server/sources/imagemagick.json)}"
247253
: "${IMAGEMAGICK_REVISION:=8289a3388a085ad5ae81aa6812f21554bdfd54f2}"
@@ -254,7 +260,9 @@ $STD make install
254260
ldconfig /usr/local/lib
255261
$STD make clean
256262
cd "$STAGING_DIR"
263+
msg_ok "(4/5) Compiled imagemagick"
257264

265+
msg_info "(5/5) Compiling libvips"
258266
SOURCE=$SOURCE_DIR/libvips
259267
# : "${LIBVIPS_REVISION:=$(jq -cr '.revision' $BASE_DIR/server/sources/libvips.json)}"
260268
: "${LIBVIPS_REVISION:=8fa37a64547e392d3808eed8d72adab7e02b3d00}"
@@ -267,14 +275,15 @@ $STD ninja install
267275
ldconfig /usr/local/lib
268276
cd "$STAGING_DIR"
269277
rm -rf "$SOURCE"/build
278+
msg_ok "(5/5) Compiled libvips"
270279
{
271280
echo "imagemagick: $IMAGEMAGICK_REVISION"
272281
echo "libheif: $LIBHEIF_REVISION"
273282
echo "libjxl: $LIBJXL_REVISION"
274283
echo "libraw: $LIBRAW_REVISION"
275284
echo "libvips: $LIBVIPS_REVISION"
276285
} >~/.immich_library_revisions
277-
msg_ok "Custom Photo-processing Library Compiled"
286+
msg_ok "Custom Photo-processing Libraries Compiled Successfully"
278287

279288
INSTALL_DIR="/opt/${APPLICATION}"
280289
UPLOAD_DIR="${INSTALL_DIR}/upload"
@@ -285,9 +294,9 @@ GEO_DIR="${INSTALL_DIR}/geodata"
285294
mkdir -p "$INSTALL_DIR"
286295
mkdir -p {"${APP_DIR}","${UPLOAD_DIR}","${GEO_DIR}","${INSTALL_DIR}"/cache}
287296

288-
fetch_and_deploy_gh_release "immich" "immich-app/immich" "tarball" "v1.141.1" "$SRC_DIR"
297+
fetch_and_deploy_gh_release "immich" "immich-app/immich" "tarball" "v1.142.0" "$SRC_DIR"
289298

290-
msg_info "Installing ${APPLICATION} (more patience please)"
299+
msg_info "Installing ${APPLICATION} (patience)"
291300

292301
cd "$SRC_DIR"/server
293302
export COREPACK_ENABLE_DOWNLOAD_PROMPT=0
@@ -319,15 +328,14 @@ msg_ok "Installed Immich Server and Web Components"
319328
cd "$SRC_DIR"/machine-learning
320329
mkdir -p "$ML_DIR"
321330
export VIRTUAL_ENV="${ML_DIR}/ml-venv"
322-
$STD uv venv "$VIRTUAL_ENV"
323331
if [[ -f ~/.openvino ]]; then
324332
msg_info "Installing HW-accelerated machine-learning"
325-
uv -q sync --extra openvino --no-cache --active
333+
$STD uv sync --extra openvino --no-cache --active
326334
patchelf --clear-execstack "${VIRTUAL_ENV}/lib/python3.11/site-packages/onnxruntime/capi/onnxruntime_pybind11_state.cpython-311-x86_64-linux-gnu.so"
327335
msg_ok "Installed HW-accelerated machine-learning"
328336
else
329337
msg_info "Installing machine-learning"
330-
uv -q sync --extra cpu --no-cache --active
338+
$STD uv sync --extra cpu --no-cache --active
331339
msg_ok "Installed machine-learning"
332340
fi
333341
cd "$SRC_DIR"

0 commit comments

Comments
 (0)