Skip to content

Commit ea7249c

Browse files
MickLeskMickLesk
authored
Revert "Immich v3.0.0 (#15153)" (#15558)
This reverts commit a76225a.
1 parent d610a35 commit ea7249c

2 files changed

Lines changed: 50 additions & 36 deletions

File tree

‎ct/immich.sh‎

Lines changed: 25 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ EOF
110110
msg_ok "Image-processing libraries up to date"
111111
fi
112112

113-
RELEASE="v3.0.0"
113+
RELEASE="v2.7.5"
114114
if check_for_gh_release "Immich" "immich-app/immich" "${RELEASE}" "each release is tested individually before the version is updated. Please do not open issues for this"; then
115115
if [[ $(cat ~/.immich) > "2.5.1" ]]; then
116116
msg_info "Enabling Maintenance Mode"
@@ -124,7 +124,7 @@ EOF
124124
systemctl stop immich-web
125125
systemctl stop immich-ml
126126
msg_ok "Stopped Services"
127-
VCHORD_RELEASE="1.0.0"
127+
VCHORD_RELEASE="0.5.3"
128128
[[ -f ~/.vchord_version ]] && mv ~/.vchord_version ~/.vectorchord
129129
if check_for_gh_release "VectorChord" "tensorchord/VectorChord" "${VCHORD_RELEASE}" "updated together with Immich after testing"; then
130130
fetch_and_deploy_gh_release "VectorChord" "tensorchord/VectorChord" "binary" "${VCHORD_RELEASE}" "/tmp" "postgresql-16-vchord_*_$(arch_resolve).deb"
@@ -140,7 +140,7 @@ EOF
140140
UPLOAD_DIR="$(sed -n '/^IMMICH_MEDIA_LOCATION/s/[^=]*=//p' /opt/immich/.env)"
141141
SRC_DIR="${INSTALL_DIR}/source"
142142
APP_DIR="${INSTALL_DIR}/app"
143-
PLUGIN_DIR="${APP_DIR}/plugins/immich-plugin-core"
143+
PLUGIN_DIR="${APP_DIR}/corePlugin"
144144
ML_DIR="${APP_DIR}/machine-learning"
145145
GEO_DIR="${INSTALL_DIR}/geodata"
146146

@@ -177,10 +177,10 @@ EOF
177177

178178
# server build
179179
export SHARP_IGNORE_GLOBAL_LIBVIPS=true
180-
$STD pnpm --filter @immich/sdk --filter @immich/plugin-sdk --filter immich build
180+
$STD pnpm --filter immich --frozen-lockfile build
181181
unset SHARP_IGNORE_GLOBAL_LIBVIPS
182182
export SHARP_FORCE_GLOBAL_LIBVIPS=true
183-
$STD pnpm --filter immich --prod --no-optional deploy "$APP_DIR"
183+
$STD pnpm --filter immich --frozen-lockfile --prod --no-optional deploy "$APP_DIR"
184184

185185
# Patch helmet.json: disable upgrade-insecure-requests for HTTP access
186186
if [[ -f "$APP_DIR/helmet.json" ]]; then
@@ -190,25 +190,32 @@ EOF
190190
cp "$APP_DIR"/package.json "$APP_DIR"/bin
191191
sed -i "s|^start|${APP_DIR}/bin/start|" "$APP_DIR"/bin/immich-admin
192192

193-
# sdk, cli & web build
193+
# openapi & web build
194194
cd "$SRC_DIR"
195195
echo "packageImportMethod: hardlink" >>./pnpm-workspace.yaml
196+
$STD pnpm --filter @immich/sdk --filter immich-web --frozen-lockfile --force install
196197
unset SHARP_FORCE_GLOBAL_LIBVIPS
197198
export SHARP_IGNORE_GLOBAL_LIBVIPS=true
198-
$STD pnpm --filter @immich/sdk --filter immich-web --filter @immich/cli build
199-
$STD pnpm --filter @immich/cli --prod --no-optional deploy "$APP_DIR"/cli
199+
$STD pnpm --filter @immich/sdk --filter immich-web build
200200
cp -a web/build "$APP_DIR"/www
201201
cp LICENSE "$APP_DIR"
202+
203+
# cli build
204+
$STD pnpm --filter @immich/sdk --filter @immich/cli --frozen-lockfile install
205+
$STD pnpm --filter @immich/sdk --filter @immich/cli build
206+
$STD pnpm --filter @immich/cli --prod --no-optional deploy "$APP_DIR"/cli
202207
[[ -f "$INSTALL_DIR"/start.sh ]] && mv "$INSTALL_DIR"/start.sh "$APP_DIR"/bin
203208

204209
# plugins
205210
cd "$SRC_DIR"
206-
export MISE_TRUSTED_CONFIG_PATHS="$SRC_DIR"/mise.toml
207-
export MISE_DISABLE_TOOLS=github:jellyfin/jellyfin-ffmpeg
208-
$STD mise //:plugins
211+
$STD mise trust --ignore ./mise.toml
212+
$STD mise trust ./plugins/mise.toml
213+
cd plugins
214+
$STD mise install
215+
$STD mise run build
209216
mkdir -p "$PLUGIN_DIR"
210-
cp -r ./packages/plugin-core/dist "$PLUGIN_DIR"/dist
211-
cp ./packages/plugin-core/manifest.json "$PLUGIN_DIR"
217+
cp -r ./dist "$PLUGIN_DIR"/dist
218+
cp ./manifest.json "$PLUGIN_DIR"
212219
msg_ok "Updated Immich server, web, cli and plugins"
213220

214221
cd "$SRC_DIR"/machine-learning
@@ -224,13 +231,13 @@ EOF
224231
ML_PYTHON="python3.13"
225232
msg_info "Pre-installing Python ${ML_PYTHON} for machine-learning"
226233
for attempt in $(seq 1 3); do
227-
$STD sudo --preserve-env=VIRTUAL_ENV -Pnu immich uv python install "${ML_PYTHON}" && break
234+
$STD sudo --preserve-env=VIRTUAL_ENV -nu immich uv python install "${ML_PYTHON}" && break
228235
[[ $attempt -lt 3 ]] && msg_warn "Python download attempt $attempt failed, retrying..." && sleep 5
229236
done
230237
msg_ok "Pre-installed Python ${ML_PYTHON}"
231238
msg_info "Updating Intel OpenVINO machine-learning"
232239
for attempt in $(seq 1 3); do
233-
$STD sudo --preserve-env=VIRTUAL_ENV,UV_HTTP_TIMEOUT -Pnu immich uv sync --extra openvino --no-dev --active --link-mode copy -n -p "${ML_PYTHON}" --managed-python && break
240+
$STD sudo --preserve-env=VIRTUAL_ENV,UV_HTTP_TIMEOUT -nu immich uv sync --extra openvino --no-dev --active --link-mode copy -n -p "${ML_PYTHON}" --managed-python && break
234241
[[ $attempt -lt 3 ]] && msg_warn "uv sync attempt $attempt failed, retrying..." && sleep 10
235242
done
236243
patchelf --clear-execstack "${VIRTUAL_ENV}/lib/python3.13/site-packages/onnxruntime/capi/onnxruntime_pybind11_state.cpython-313-$(arch_resolve "x86_64" "aarch64")-linux-gnu.so"
@@ -239,13 +246,13 @@ EOF
239246
ML_PYTHON="python3.11"
240247
msg_info "Pre-installing Python ${ML_PYTHON} for machine-learning"
241248
for attempt in $(seq 1 3); do
242-
$STD sudo --preserve-env=VIRTUAL_ENV -Pnu immich uv python install "${ML_PYTHON}" && break
249+
$STD sudo --preserve-env=VIRTUAL_ENV -nu immich uv python install "${ML_PYTHON}" && break
243250
[[ $attempt -lt 3 ]] && msg_warn "Python download attempt $attempt failed, retrying..." && sleep 5
244251
done
245252
msg_ok "Pre-installed Python ${ML_PYTHON}"
246253
msg_info "Updating machine-learning"
247254
for attempt in $(seq 1 3); do
248-
$STD sudo --preserve-env=VIRTUAL_ENV,UV_HTTP_TIMEOUT -Pnu immich uv sync --extra cpu --no-dev --active --link-mode copy -n -p "${ML_PYTHON}" --managed-python && break
255+
$STD sudo --preserve-env=VIRTUAL_ENV,UV_HTTP_TIMEOUT -nu immich uv sync --extra cpu --no-dev --active --link-mode copy -n -p "${ML_PYTHON}" --managed-python && break
249256
[[ $attempt -lt 3 ]] && msg_warn "uv sync attempt $attempt failed, retrying..." && sleep 10
250257
done
251258
msg_ok "Updated machine-learning"
@@ -422,7 +429,7 @@ function compile_imagemagick() {
422429

423430
function compile_libvips() {
424431
SOURCE=$SOURCE_DIR/libvips
425-
LIBVIPS_REVISION="3664cfc5dc2c5661288f5bf5a85ccc51c64c1626"
432+
LIBVIPS_REVISION="17ad2f62dda7e39985955da189183e594683d45e"
426433
if [[ "$LIBVIPS_REVISION" != "$(grep 'libvips' ~/.immich_library_revisions | awk '{print $2}')" ]]; then
427434
msg_info "Recompiling libvips"
428435
[[ -d "$SOURCE" ]] && rm -rf "$SOURCE"

‎install/immich-install.sh‎

Lines changed: 25 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -162,7 +162,7 @@ PG_VERSION="16" PG_MODULES="pgvector" setup_postgresql
162162
ACTUAL_PG_VERSION=$(ls /etc/postgresql/ 2>/dev/null | sort -V | tail -1)
163163
ACTUAL_PG_VERSION=${ACTUAL_PG_VERSION:-16}
164164

165-
VCHORD_RELEASE="1.0.0"
165+
VCHORD_RELEASE="0.5.3"
166166
fetch_and_deploy_gh_release "VectorChord" "tensorchord/VectorChord" "binary" "${VCHORD_RELEASE}" "/tmp" "postgresql-${ACTUAL_PG_VERSION}-vchord_*_$(arch_resolve).deb"
167167

168168
sed -i "s/^#shared_preload.*/shared_preload_libraries = 'vchord.so'/" /etc/postgresql/${ACTUAL_PG_VERSION}/main/postgresql.conf
@@ -282,7 +282,7 @@ msg_ok "(4/5) Compiled imagemagick"
282282

283283
msg_info "(5/5) Compiling libvips"
284284
SOURCE=$SOURCE_DIR/libvips
285-
LIBVIPS_REVISION="3664cfc5dc2c5661288f5bf5a85ccc51c64c1626"
285+
LIBVIPS_REVISION="17ad2f62dda7e39985955da189183e594683d45e"
286286
$STD git clone https://github.com/libvips/libvips.git "$SOURCE"
287287
cd "$SOURCE"
288288
$STD git reset --hard "$LIBVIPS_REVISION"
@@ -306,12 +306,12 @@ INSTALL_DIR="/opt/${APPLICATION}"
306306
UPLOAD_DIR="${INSTALL_DIR}/upload"
307307
SRC_DIR="${INSTALL_DIR}/source"
308308
APP_DIR="${INSTALL_DIR}/app"
309-
PLUGIN_DIR="${APP_DIR}/plugins/immich-plugin-core"
309+
PLUGIN_DIR="${APP_DIR}/corePlugin"
310310
ML_DIR="${APP_DIR}/machine-learning"
311311
GEO_DIR="${INSTALL_DIR}/geodata"
312312
mkdir -p {"${APP_DIR}","${UPLOAD_DIR}","${GEO_DIR}","${INSTALL_DIR}"/cache}
313313

314-
fetch_and_deploy_gh_release "Immich" "immich-app/immich" "tarball" "v3.0.0" "$SRC_DIR"
314+
fetch_and_deploy_gh_release "Immich" "immich-app/immich" "tarball" "v2.7.5" "$SRC_DIR"
315315
PNPM_VERSION="$(jq -r '.packageManager | split("@")[1] | split("+")[0]' ${SRC_DIR}/package.json)"
316316
NODE_VERSION="24" NODE_MODULE="corepack,pnpm@${PNPM_VERSION}" setup_nodejs
317317

@@ -323,10 +323,10 @@ export CI=1
323323

324324
# server build
325325
export SHARP_IGNORE_GLOBAL_LIBVIPS=true
326-
$STD pnpm --filter @immich/sdk --filter @immich/plugin-sdk --filter immich build
326+
$STD pnpm --filter immich --frozen-lockfile build
327327
unset SHARP_IGNORE_GLOBAL_LIBVIPS
328328
export SHARP_FORCE_GLOBAL_LIBVIPS=true
329-
$STD pnpm --filter immich --prod --no-optional deploy "$APP_DIR"
329+
$STD pnpm --filter immich --frozen-lockfile --prod --no-optional deploy "$APP_DIR"
330330

331331
# Patch helmet.json: disable upgrade-insecure-requests for HTTP access
332332
if [[ -f "$APP_DIR/helmet.json" ]]; then
@@ -336,24 +336,31 @@ fi
336336
cp "$APP_DIR"/package.json "$APP_DIR"/bin
337337
sed -i "s|^start|${APP_DIR}/bin/start|" "$APP_DIR"/bin/immich-admin
338338

339-
# sdk, cli & web build
339+
# openapi & web build
340340
cd "$SRC_DIR"
341341
echo "packageImportMethod: hardlink" >>./pnpm-workspace.yaml
342+
$STD pnpm --filter @immich/sdk --filter immich-web --frozen-lockfile --force install
342343
unset SHARP_FORCE_GLOBAL_LIBVIPS
343344
export SHARP_IGNORE_GLOBAL_LIBVIPS=true
344-
$STD pnpm --filter @immich/sdk --filter immich-web --filter @immich/cli build
345-
$STD pnpm --filter @immich/cli --prod --no-optional deploy "$APP_DIR"/cli
345+
$STD pnpm --filter @immich/sdk --filter immich-web build
346346
cp -a web/build "$APP_DIR"/www
347347
cp LICENSE "$APP_DIR"
348348

349+
# cli build
350+
$STD pnpm --filter @immich/sdk --filter @immich/cli --frozen-lockfile install
351+
$STD pnpm --filter @immich/sdk --filter @immich/cli build
352+
$STD pnpm --filter @immich/cli --prod --no-optional deploy "$APP_DIR"/cli
353+
349354
# plugins
350355
cd "$SRC_DIR"
351-
export MISE_TRUSTED_CONFIG_PATHS="$SRC_DIR"/mise.toml
352-
export MISE_DISABLE_TOOLS=github:jellyfin/jellyfin-ffmpeg
353-
$STD mise //:plugins
356+
$STD mise trust --ignore ./mise.toml
357+
$STD mise trust ./plugins/mise.toml
358+
cd plugins
359+
$STD mise install
360+
$STD mise run build
354361
mkdir -p "$PLUGIN_DIR"
355-
cp -r ./packages/plugin-core/dist "$PLUGIN_DIR"/dist
356-
cp ./packages/plugin-core/manifest.json "$PLUGIN_DIR"
362+
cp -r ./dist "$PLUGIN_DIR"/dist
363+
cp ./manifest.json "$PLUGIN_DIR"
357364
msg_ok "Installed Immich Server, Web and Plugin Components"
358365

359366
cd "$SRC_DIR"/machine-learning
@@ -369,13 +376,13 @@ if [[ -f ~/.openvino ]]; then
369376
ML_PYTHON="python3.13"
370377
msg_info "Pre-installing Python ${ML_PYTHON} for machine-learning"
371378
for attempt in $(seq 1 3); do
372-
$STD sudo --preserve-env=VIRTUAL_ENV -Pnu immich uv python install "${ML_PYTHON}" && break
379+
$STD sudo --preserve-env=VIRTUAL_ENV -nu immich uv python install "${ML_PYTHON}" && break
373380
[[ $attempt -lt 3 ]] && msg_warn "Python download attempt $attempt failed, retrying..." && sleep 5
374381
done
375382
msg_ok "Pre-installed Python ${ML_PYTHON}"
376383
msg_info "Installing Intel OpenVINO machine-learning"
377384
for attempt in $(seq 1 3); do
378-
$STD sudo --preserve-env=VIRTUAL_ENV,UV_HTTP_TIMEOUT -Pnu immich uv sync --extra openvino --no-dev --active --link-mode copy -n -p "${ML_PYTHON}" --managed-python && break
385+
$STD sudo --preserve-env=VIRTUAL_ENV,UV_HTTP_TIMEOUT -nu immich uv sync --extra openvino --no-dev --active --link-mode copy -n -p "${ML_PYTHON}" --managed-python && break
379386
[[ $attempt -lt 3 ]] && msg_warn "uv sync attempt $attempt failed, retrying..." && sleep 10
380387
done
381388
patchelf --clear-execstack "${VIRTUAL_ENV}/lib/python3.13/site-packages/onnxruntime/capi/onnxruntime_pybind11_state.cpython-313-$(arch_resolve "x86_64" "aarch64")-linux-gnu.so"
@@ -384,13 +391,13 @@ else
384391
ML_PYTHON="python3.11"
385392
msg_info "Pre-installing Python ${ML_PYTHON} for machine-learning"
386393
for attempt in $(seq 1 3); do
387-
$STD sudo --preserve-env=VIRTUAL_ENV -Pnu immich uv python install "${ML_PYTHON}" && break
394+
$STD sudo --preserve-env=VIRTUAL_ENV -nu immich uv python install "${ML_PYTHON}" && break
388395
[[ $attempt -lt 3 ]] && msg_warn "Python download attempt $attempt failed, retrying..." && sleep 5
389396
done
390397
msg_ok "Pre-installed Python ${ML_PYTHON}"
391398
msg_info "Installing machine-learning"
392399
for attempt in $(seq 1 3); do
393-
$STD sudo --preserve-env=VIRTUAL_ENV,UV_HTTP_TIMEOUT -Pnu immich uv sync --extra cpu --no-dev --active --link-mode copy -n -p "${ML_PYTHON}" --managed-python && break
400+
$STD sudo --preserve-env=VIRTUAL_ENV,UV_HTTP_TIMEOUT -nu immich uv sync --extra cpu --no-dev --active --link-mode copy -n -p "${ML_PYTHON}" --managed-python && break
394401
[[ $attempt -lt 3 ]] && msg_warn "uv sync attempt $attempt failed, retrying..." && sleep 10
395402
done
396403
msg_ok "Installed machine-learning"

0 commit comments

Comments
 (0)