mirror of
https://github.com/community-scripts/ProxmoxVE.git
synced 2026-07-04 21:22:14 +02:00
Compare commits
13 Commits
2026-07-02
...
main
| Author | SHA1 | Date | |
|---|---|---|---|
| 819ecc1105 | |||
| 7e15a4bf26 | |||
| 9406a1ca98 | |||
| d58123a518 | |||
| 704916d27d | |||
| 3c84f2d6c1 | |||
| 044bffcea4 | |||
| 84a1f13fa7 | |||
| c075708588 | |||
| 2b3e2346e1 | |||
| 6ad04d8b19 | |||
| 225329a62f | |||
| b8a1879b24 |
@@ -489,6 +489,38 @@ Exercise vigilance regarding copycat or coat-tailing sites that seek to exploit
|
|||||||
|
|
||||||
</details>
|
</details>
|
||||||
|
|
||||||
|
## 2026-07-04
|
||||||
|
|
||||||
|
### 🚀 Updated Scripts
|
||||||
|
|
||||||
|
- #### 🐞 Bug Fixes
|
||||||
|
|
||||||
|
- fix(endurain): update frontend dist path after upstream restructure [@joaovitoriasilva](https://github.com/joaovitoriasilva) ([#15590](https://github.com/community-scripts/ProxmoxVE/pull/15590))
|
||||||
|
|
||||||
|
## 2026-07-03
|
||||||
|
|
||||||
|
### 🚀 Updated Scripts
|
||||||
|
|
||||||
|
- #### 🐞 Bug Fixes
|
||||||
|
|
||||||
|
- Immich: handle mise monorepo_root rename correctly | bump to 3.0.1 [@MickLesk](https://github.com/MickLesk) ([#15557](https://github.com/community-scripts/ProxmoxVE/pull/15557))
|
||||||
|
|
||||||
|
- #### ✨ New Features
|
||||||
|
|
||||||
|
- Opencloud: bump to v7.2.0 [@vhsdream](https://github.com/vhsdream) ([#15575](https://github.com/community-scripts/ProxmoxVE/pull/15575))
|
||||||
|
|
||||||
|
### 💾 Core
|
||||||
|
|
||||||
|
- #### 🔧 Refactor
|
||||||
|
|
||||||
|
- tools.func: fix corepack/pnpm install flow in setup_nodejs [@MickLesk](https://github.com/MickLesk) ([#15579](https://github.com/community-scripts/ProxmoxVE/pull/15579))
|
||||||
|
|
||||||
|
### 🧰 Tools
|
||||||
|
|
||||||
|
- #### 🐞 Bug Fixes
|
||||||
|
|
||||||
|
- Removed deprecated parameter in Filebrowser Quantum configuration [@alpargatagazer](https://github.com/alpargatagazer) ([#15573](https://github.com/community-scripts/ProxmoxVE/pull/15573))
|
||||||
|
|
||||||
## 2026-07-02
|
## 2026-07-02
|
||||||
|
|
||||||
### 🆕 New Scripts
|
### 🆕 New Scripts
|
||||||
|
|||||||
+3
-3
@@ -36,7 +36,7 @@ function update_script() {
|
|||||||
|
|
||||||
msg_info "Creating Backup"
|
msg_info "Creating Backup"
|
||||||
cp /opt/endurain/.env /opt/endurain.env
|
cp /opt/endurain/.env /opt/endurain.env
|
||||||
cp /opt/endurain/frontend/app/dist/env.js /opt/endurain.env.js
|
cp /opt/endurain/frontend/dist/env.js /opt/endurain.env.js
|
||||||
msg_ok "Created Backup"
|
msg_ok "Created Backup"
|
||||||
|
|
||||||
CLEAN_INSTALL=1 fetch_and_deploy_codeberg_release "endurain" "endurain-project/endurain" "tarball" "latest" "/opt/endurain"
|
CLEAN_INSTALL=1 fetch_and_deploy_codeberg_release "endurain" "endurain-project/endurain" "tarball" "latest" "/opt/endurain"
|
||||||
@@ -52,10 +52,10 @@ function update_script() {
|
|||||||
msg_ok "Prepared Update"
|
msg_ok "Prepared Update"
|
||||||
|
|
||||||
msg_info "Updating Frontend"
|
msg_info "Updating Frontend"
|
||||||
cd /opt/endurain/frontend/app
|
cd /opt/endurain/frontend
|
||||||
$STD npm ci
|
$STD npm ci
|
||||||
$STD npm run build
|
$STD npm run build
|
||||||
cp /opt/endurain.env.js /opt/endurain/frontend/app/dist/env.js
|
cp /opt/endurain.env.js /opt/endurain/frontend/dist/env.js
|
||||||
rm /opt/endurain.env.js
|
rm /opt/endurain.env.js
|
||||||
msg_ok "Updated Frontend"
|
msg_ok "Updated Frontend"
|
||||||
|
|
||||||
|
|||||||
+65
-28
@@ -110,7 +110,7 @@ EOF
|
|||||||
msg_ok "Image-processing libraries up to date"
|
msg_ok "Image-processing libraries up to date"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
RELEASE="v2.7.5"
|
RELEASE="v3.0.1"
|
||||||
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
|
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
|
||||||
if [[ $(cat ~/.immich) > "2.5.1" ]]; then
|
if [[ $(cat ~/.immich) > "2.5.1" ]]; then
|
||||||
msg_info "Enabling Maintenance Mode"
|
msg_info "Enabling Maintenance Mode"
|
||||||
@@ -124,7 +124,7 @@ EOF
|
|||||||
systemctl stop immich-web
|
systemctl stop immich-web
|
||||||
systemctl stop immich-ml
|
systemctl stop immich-ml
|
||||||
msg_ok "Stopped Services"
|
msg_ok "Stopped Services"
|
||||||
VCHORD_RELEASE="0.5.3"
|
VCHORD_RELEASE="1.0.0"
|
||||||
[[ -f ~/.vchord_version ]] && mv ~/.vchord_version ~/.vectorchord
|
[[ -f ~/.vchord_version ]] && mv ~/.vchord_version ~/.vectorchord
|
||||||
if check_for_gh_release "VectorChord" "tensorchord/VectorChord" "${VCHORD_RELEASE}" "updated together with Immich after testing"; then
|
if check_for_gh_release "VectorChord" "tensorchord/VectorChord" "${VCHORD_RELEASE}" "updated together with Immich after testing"; then
|
||||||
fetch_and_deploy_gh_release "VectorChord" "tensorchord/VectorChord" "binary" "${VCHORD_RELEASE}" "/tmp" "postgresql-16-vchord_*_$(arch_resolve).deb"
|
fetch_and_deploy_gh_release "VectorChord" "tensorchord/VectorChord" "binary" "${VCHORD_RELEASE}" "/tmp" "postgresql-16-vchord_*_$(arch_resolve).deb"
|
||||||
@@ -140,7 +140,7 @@ EOF
|
|||||||
UPLOAD_DIR="$(sed -n '/^IMMICH_MEDIA_LOCATION/s/[^=]*=//p' /opt/immich/.env)"
|
UPLOAD_DIR="$(sed -n '/^IMMICH_MEDIA_LOCATION/s/[^=]*=//p' /opt/immich/.env)"
|
||||||
SRC_DIR="${INSTALL_DIR}/source"
|
SRC_DIR="${INSTALL_DIR}/source"
|
||||||
APP_DIR="${INSTALL_DIR}/app"
|
APP_DIR="${INSTALL_DIR}/app"
|
||||||
PLUGIN_DIR="${APP_DIR}/corePlugin"
|
PLUGIN_DIR="${APP_DIR}/plugins/immich-plugin-core"
|
||||||
ML_DIR="${APP_DIR}/machine-learning"
|
ML_DIR="${APP_DIR}/machine-learning"
|
||||||
GEO_DIR="${INSTALL_DIR}/geodata"
|
GEO_DIR="${INSTALL_DIR}/geodata"
|
||||||
|
|
||||||
@@ -168,19 +168,21 @@ EOF
|
|||||||
setup_uv
|
setup_uv
|
||||||
CLEAN_INSTALL=1 fetch_and_deploy_gh_release "Immich" "immich-app/immich" "tarball" "${RELEASE}" "$SRC_DIR"
|
CLEAN_INSTALL=1 fetch_and_deploy_gh_release "Immich" "immich-app/immich" "tarball" "${RELEASE}" "$SRC_DIR"
|
||||||
PNPM_VERSION="$(jq -r '.packageManager | split("@")[1] | split("+")[0]' ${SRC_DIR}/package.json)"
|
PNPM_VERSION="$(jq -r '.packageManager | split("@")[1] | split("+")[0]' ${SRC_DIR}/package.json)"
|
||||||
NODE_VERSION="24" NODE_MODULE="corepack,pnpm@${PNPM_VERSION}" setup_nodejs
|
export COREPACK_ENABLE_DOWNLOAD_PROMPT=0
|
||||||
|
export CI=1
|
||||||
|
NODE_VERSION="24" NODE_MODULE="corepack" setup_nodejs
|
||||||
|
$STD corepack prepare "pnpm@${PNPM_VERSION}" --activate
|
||||||
|
export PATH="/root/.local/share/pnpm/bin:$PATH"
|
||||||
|
$STD pnpm config set --global dangerouslyAllowAllBuilds true
|
||||||
|
|
||||||
msg_info "Updating Immich web and microservices"
|
msg_info "Updating Immich web and microservices"
|
||||||
cd "$SRC_DIR"/server
|
cd "$SRC_DIR"/server
|
||||||
export COREPACK_ENABLE_DOWNLOAD_PROMPT=0
|
|
||||||
export CI=1
|
|
||||||
|
|
||||||
# server build
|
# server build
|
||||||
export SHARP_IGNORE_GLOBAL_LIBVIPS=true
|
export SHARP_IGNORE_GLOBAL_LIBVIPS=true
|
||||||
$STD pnpm --filter immich --frozen-lockfile build
|
$STD pnpm --filter @immich/sdk --filter @immich/plugin-sdk --filter immich build
|
||||||
unset SHARP_IGNORE_GLOBAL_LIBVIPS
|
unset SHARP_IGNORE_GLOBAL_LIBVIPS
|
||||||
export SHARP_FORCE_GLOBAL_LIBVIPS=true
|
export SHARP_FORCE_GLOBAL_LIBVIPS=true
|
||||||
$STD pnpm --filter immich --frozen-lockfile --prod --no-optional deploy "$APP_DIR"
|
$STD pnpm --filter immich --prod --no-optional deploy "$APP_DIR"
|
||||||
|
|
||||||
# Patch helmet.json: disable upgrade-insecure-requests for HTTP access
|
# Patch helmet.json: disable upgrade-insecure-requests for HTTP access
|
||||||
if [[ -f "$APP_DIR/helmet.json" ]]; then
|
if [[ -f "$APP_DIR/helmet.json" ]]; then
|
||||||
@@ -190,32 +192,50 @@ EOF
|
|||||||
cp "$APP_DIR"/package.json "$APP_DIR"/bin
|
cp "$APP_DIR"/package.json "$APP_DIR"/bin
|
||||||
sed -i "s|^start|${APP_DIR}/bin/start|" "$APP_DIR"/bin/immich-admin
|
sed -i "s|^start|${APP_DIR}/bin/start|" "$APP_DIR"/bin/immich-admin
|
||||||
|
|
||||||
# openapi & web build
|
# sdk, cli & web build
|
||||||
cd "$SRC_DIR"
|
cd "$SRC_DIR"
|
||||||
echo "packageImportMethod: hardlink" >>./pnpm-workspace.yaml
|
echo "packageImportMethod: hardlink" >>./pnpm-workspace.yaml
|
||||||
$STD pnpm --filter @immich/sdk --filter immich-web --frozen-lockfile --force install
|
|
||||||
unset SHARP_FORCE_GLOBAL_LIBVIPS
|
unset SHARP_FORCE_GLOBAL_LIBVIPS
|
||||||
export SHARP_IGNORE_GLOBAL_LIBVIPS=true
|
export SHARP_IGNORE_GLOBAL_LIBVIPS=true
|
||||||
$STD pnpm --filter @immich/sdk --filter immich-web build
|
$STD pnpm --filter @immich/sdk --filter immich-web --filter @immich/cli build
|
||||||
|
$STD pnpm --filter @immich/cli --prod --no-optional deploy "$APP_DIR"/cli
|
||||||
cp -a web/build "$APP_DIR"/www
|
cp -a web/build "$APP_DIR"/www
|
||||||
cp LICENSE "$APP_DIR"
|
cp LICENSE "$APP_DIR"
|
||||||
|
|
||||||
# cli build
|
|
||||||
$STD pnpm --filter @immich/sdk --filter @immich/cli --frozen-lockfile install
|
|
||||||
$STD pnpm --filter @immich/sdk --filter @immich/cli build
|
|
||||||
$STD pnpm --filter @immich/cli --prod --no-optional deploy "$APP_DIR"/cli
|
|
||||||
[[ -f "$INSTALL_DIR"/start.sh ]] && mv "$INSTALL_DIR"/start.sh "$APP_DIR"/bin
|
[[ -f "$INSTALL_DIR"/start.sh ]] && mv "$INSTALL_DIR"/start.sh "$APP_DIR"/bin
|
||||||
|
|
||||||
# plugins
|
# plugins
|
||||||
cd "$SRC_DIR"
|
cd "$SRC_DIR"
|
||||||
$STD mise trust --ignore ./mise.toml
|
export MISE_TRUSTED_CONFIG_PATHS="$SRC_DIR"/mise.toml
|
||||||
$STD mise trust ./plugins/mise.toml
|
export MISE_DISABLE_TOOLS=github:jellyfin/jellyfin-ffmpeg
|
||||||
cd plugins
|
|
||||||
$STD mise install
|
$STD mise install
|
||||||
$STD mise run build
|
export PATH="$(mise bin-paths 2>/dev/null | tr '\n' ':')$PATH"
|
||||||
|
if ! command -v extism-js >/dev/null 2>&1; then
|
||||||
|
# extism-js ships as a bare gzip-compressed single binary (.gz) that
|
||||||
|
# fetch_and_deploy_gh_release cannot deploy; fetch + gunzip it directly.
|
||||||
|
EXTISM_ARCH="$(arch_resolve x86_64 aarch64)"
|
||||||
|
curl_download /tmp/extism-js.gz "https://github.com/extism/js-pdk/releases/download/v1.6.0/extism-js-${EXTISM_ARCH}-linux-v1.6.0.gz"
|
||||||
|
gunzip -f /tmp/extism-js.gz
|
||||||
|
install -m 0755 /tmp/extism-js /usr/local/bin/extism-js
|
||||||
|
rm -f /tmp/extism-js
|
||||||
|
fi
|
||||||
|
if ! command -v wasm-merge >/dev/null 2>&1; then
|
||||||
|
# extism-js needs binaryen's `wasm-merge` to build the plugin wasm. mise
|
||||||
|
# 2026.7.0's github backend no longer exposes `wasm-merge` on PATH (ubi only
|
||||||
|
# extracts a single binary), so install the pinned binaryen release from
|
||||||
|
# mise.toml directly. The extracted bin/ keeps libbinaryen.so alongside it.
|
||||||
|
BINARYEN_VERSION="$(grep -oiP 'binaryen"\s*=\s*"\Kversion_[0-9]+' "$SRC_DIR"/mise.toml | head -n1)"
|
||||||
|
[[ -z "$BINARYEN_VERSION" ]] && BINARYEN_VERSION="version_124"
|
||||||
|
BINARYEN_ARCH="$(arch_resolve x86_64 aarch64)"
|
||||||
|
curl_download /tmp/binaryen.tar.gz "https://github.com/WebAssembly/binaryen/releases/download/${BINARYEN_VERSION}/binaryen-${BINARYEN_VERSION}-${BINARYEN_ARCH}-linux.tar.gz"
|
||||||
|
tar -xzf /tmp/binaryen.tar.gz -C /opt
|
||||||
|
rm -f /tmp/binaryen.tar.gz
|
||||||
|
export PATH="/opt/binaryen-${BINARYEN_VERSION}/bin:$PATH"
|
||||||
|
fi
|
||||||
|
$STD mise exec -- pnpm --filter @immich/sdk --filter @immich/plugin-sdk --filter @immich/plugin-core install --frozen-lockfile
|
||||||
|
$STD mise exec -- pnpm --filter @immich/sdk --filter @immich/plugin-sdk --filter @immich/plugin-core build
|
||||||
mkdir -p "$PLUGIN_DIR"
|
mkdir -p "$PLUGIN_DIR"
|
||||||
cp -r ./dist "$PLUGIN_DIR"/dist
|
cp -r ./packages/plugin-core/dist "$PLUGIN_DIR"/dist
|
||||||
cp ./manifest.json "$PLUGIN_DIR"
|
cp ./packages/plugin-core/manifest.json "$PLUGIN_DIR"
|
||||||
msg_ok "Updated Immich server, web, cli and plugins"
|
msg_ok "Updated Immich server, web, cli and plugins"
|
||||||
|
|
||||||
cd "$SRC_DIR"/machine-learning
|
cd "$SRC_DIR"/machine-learning
|
||||||
@@ -231,13 +251,13 @@ EOF
|
|||||||
ML_PYTHON="python3.13"
|
ML_PYTHON="python3.13"
|
||||||
msg_info "Pre-installing Python ${ML_PYTHON} for machine-learning"
|
msg_info "Pre-installing Python ${ML_PYTHON} for machine-learning"
|
||||||
for attempt in $(seq 1 3); do
|
for attempt in $(seq 1 3); do
|
||||||
$STD sudo --preserve-env=VIRTUAL_ENV -nu immich uv python install "${ML_PYTHON}" && break
|
$STD sudo --preserve-env=VIRTUAL_ENV -Pnu immich uv python install "${ML_PYTHON}" && break
|
||||||
[[ $attempt -lt 3 ]] && msg_warn "Python download attempt $attempt failed, retrying..." && sleep 5
|
[[ $attempt -lt 3 ]] && msg_warn "Python download attempt $attempt failed, retrying..." && sleep 5
|
||||||
done
|
done
|
||||||
msg_ok "Pre-installed Python ${ML_PYTHON}"
|
msg_ok "Pre-installed Python ${ML_PYTHON}"
|
||||||
msg_info "Updating Intel OpenVINO machine-learning"
|
msg_info "Updating Intel OpenVINO machine-learning"
|
||||||
for attempt in $(seq 1 3); do
|
for attempt in $(seq 1 3); do
|
||||||
$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
|
$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
|
||||||
[[ $attempt -lt 3 ]] && msg_warn "uv sync attempt $attempt failed, retrying..." && sleep 10
|
[[ $attempt -lt 3 ]] && msg_warn "uv sync attempt $attempt failed, retrying..." && sleep 10
|
||||||
done
|
done
|
||||||
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"
|
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"
|
||||||
@@ -246,13 +266,13 @@ EOF
|
|||||||
ML_PYTHON="python3.11"
|
ML_PYTHON="python3.11"
|
||||||
msg_info "Pre-installing Python ${ML_PYTHON} for machine-learning"
|
msg_info "Pre-installing Python ${ML_PYTHON} for machine-learning"
|
||||||
for attempt in $(seq 1 3); do
|
for attempt in $(seq 1 3); do
|
||||||
$STD sudo --preserve-env=VIRTUAL_ENV -nu immich uv python install "${ML_PYTHON}" && break
|
$STD sudo --preserve-env=VIRTUAL_ENV -Pnu immich uv python install "${ML_PYTHON}" && break
|
||||||
[[ $attempt -lt 3 ]] && msg_warn "Python download attempt $attempt failed, retrying..." && sleep 5
|
[[ $attempt -lt 3 ]] && msg_warn "Python download attempt $attempt failed, retrying..." && sleep 5
|
||||||
done
|
done
|
||||||
msg_ok "Pre-installed Python ${ML_PYTHON}"
|
msg_ok "Pre-installed Python ${ML_PYTHON}"
|
||||||
msg_info "Updating machine-learning"
|
msg_info "Updating machine-learning"
|
||||||
for attempt in $(seq 1 3); do
|
for attempt in $(seq 1 3); do
|
||||||
$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
|
$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
|
||||||
[[ $attempt -lt 3 ]] && msg_warn "uv sync attempt $attempt failed, retrying..." && sleep 10
|
[[ $attempt -lt 3 ]] && msg_warn "uv sync attempt $attempt failed, retrying..." && sleep 10
|
||||||
done
|
done
|
||||||
msg_ok "Updated machine-learning"
|
msg_ok "Updated machine-learning"
|
||||||
@@ -260,6 +280,23 @@ EOF
|
|||||||
cd "$SRC_DIR"
|
cd "$SRC_DIR"
|
||||||
cp -a machine-learning/{ann,immich_ml} "$ML_DIR"
|
cp -a machine-learning/{ann,immich_ml} "$ML_DIR"
|
||||||
[[ -f "$INSTALL_DIR"/ml_start.sh ]] && mv "$INSTALL_DIR"/ml_start.sh "$ML_DIR"
|
[[ -f "$INSTALL_DIR"/ml_start.sh ]] && mv "$INSTALL_DIR"/ml_start.sh "$ML_DIR"
|
||||||
|
# Regenerate ml_start.sh if it is missing (e.g. lost by a previously interrupted update),
|
||||||
|
# otherwise immich-ml.service fails to start with status=203/EXEC
|
||||||
|
if [[ ! -f "$ML_DIR"/ml_start.sh ]]; then
|
||||||
|
cat <<EOF >"$ML_DIR"/ml_start.sh
|
||||||
|
#!/usr/bin/env bash
|
||||||
|
|
||||||
|
cd ${ML_DIR}
|
||||||
|
. ${VIRTUAL_ENV}/bin/activate
|
||||||
|
|
||||||
|
set -a
|
||||||
|
. ${INSTALL_DIR}/.env
|
||||||
|
set +a
|
||||||
|
|
||||||
|
python3 -m immich_ml
|
||||||
|
EOF
|
||||||
|
chmod +x "$ML_DIR"/ml_start.sh
|
||||||
|
fi
|
||||||
[[ -f ~/.openvino ]] && sed -i "/intra_op/s/int = 0/int = os.cpu_count() or 0/" "$ML_DIR"/immich_ml/config.py
|
[[ -f ~/.openvino ]] && sed -i "/intra_op/s/int = 0/int = os.cpu_count() or 0/" "$ML_DIR"/immich_ml/config.py
|
||||||
ln -sf "$APP_DIR"/resources "$INSTALL_DIR"
|
ln -sf "$APP_DIR"/resources "$INSTALL_DIR"
|
||||||
cd "$APP_DIR"
|
cd "$APP_DIR"
|
||||||
@@ -429,7 +466,7 @@ function compile_imagemagick() {
|
|||||||
|
|
||||||
function compile_libvips() {
|
function compile_libvips() {
|
||||||
SOURCE=$SOURCE_DIR/libvips
|
SOURCE=$SOURCE_DIR/libvips
|
||||||
LIBVIPS_REVISION="17ad2f62dda7e39985955da189183e594683d45e"
|
LIBVIPS_REVISION="3664cfc5dc2c5661288f5bf5a85ccc51c64c1626"
|
||||||
if [[ "$LIBVIPS_REVISION" != "$(grep 'libvips' ~/.immich_library_revisions | awk '{print $2}')" ]]; then
|
if [[ "$LIBVIPS_REVISION" != "$(grep 'libvips' ~/.immich_library_revisions | awk '{print $2}')" ]]; then
|
||||||
msg_info "Recompiling libvips"
|
msg_info "Recompiling libvips"
|
||||||
[[ -d "$SOURCE" ]] && rm -rf "$SOURCE"
|
[[ -d "$SOURCE" ]] && rm -rf "$SOURCE"
|
||||||
|
|||||||
+1
-1
@@ -30,7 +30,7 @@ function update_script() {
|
|||||||
exit
|
exit
|
||||||
fi
|
fi
|
||||||
|
|
||||||
RELEASE="v7.0.0"
|
RELEASE="v7.2.0"
|
||||||
if check_for_gh_release "OpenCloud" "opencloud-eu/opencloud" "${RELEASE}" "each release is tested individually before the version is updated. Please do not open issues for this"; then
|
if check_for_gh_release "OpenCloud" "opencloud-eu/opencloud" "${RELEASE}" "each release is tested individually before the version is updated. Please do not open issues for this"; then
|
||||||
msg_info "Stopping services"
|
msg_info "Stopping services"
|
||||||
systemctl stop opencloud opencloud-wopi
|
systemctl stop opencloud opencloud-wopi
|
||||||
|
|||||||
@@ -55,7 +55,7 @@ DB_HOST=localhost
|
|||||||
DATABASE_URL=postgresql+psycopg://${PG_DB_USER}:${PG_DB_PASS}@localhost:5432/${PG_DB_NAME}
|
DATABASE_URL=postgresql+psycopg://${PG_DB_USER}:${PG_DB_PASS}@localhost:5432/${PG_DB_NAME}
|
||||||
|
|
||||||
BACKEND_DIR="/opt/endurain/backend/app"
|
BACKEND_DIR="/opt/endurain/backend/app"
|
||||||
FRONTEND_DIR="/opt/endurain/frontend/app/dist"
|
FRONTEND_DIR="/opt/endurain/frontend/dist"
|
||||||
DATA_DIR="/opt/endurain_data/data"
|
DATA_DIR="/opt/endurain_data/data"
|
||||||
LOGS_DIR="/opt/endurain_data/logs"
|
LOGS_DIR="/opt/endurain_data/logs"
|
||||||
|
|
||||||
@@ -69,10 +69,10 @@ EOF
|
|||||||
msg_ok "Setup Endurain"
|
msg_ok "Setup Endurain"
|
||||||
|
|
||||||
msg_info "Building Frontend"
|
msg_info "Building Frontend"
|
||||||
cd /opt/endurain/frontend/app
|
cd /opt/endurain/frontend
|
||||||
$STD npm ci --prefer-offline
|
$STD npm ci --prefer-offline
|
||||||
$STD npm run build
|
$STD npm run build
|
||||||
cat <<EOF >/opt/endurain/frontend/app/dist/env.js
|
cat <<EOF >/opt/endurain/frontend/dist/env.js
|
||||||
window.env = {
|
window.env = {
|
||||||
ENDURAIN_HOST: "${ENDURAIN_HOST}"
|
ENDURAIN_HOST: "${ENDURAIN_HOST}"
|
||||||
}
|
}
|
||||||
|
|||||||
+37
-27
@@ -162,7 +162,7 @@ PG_VERSION="16" PG_MODULES="pgvector" setup_postgresql
|
|||||||
ACTUAL_PG_VERSION=$(ls /etc/postgresql/ 2>/dev/null | sort -V | tail -1)
|
ACTUAL_PG_VERSION=$(ls /etc/postgresql/ 2>/dev/null | sort -V | tail -1)
|
||||||
ACTUAL_PG_VERSION=${ACTUAL_PG_VERSION:-16}
|
ACTUAL_PG_VERSION=${ACTUAL_PG_VERSION:-16}
|
||||||
|
|
||||||
VCHORD_RELEASE="0.5.3"
|
VCHORD_RELEASE="1.0.0"
|
||||||
fetch_and_deploy_gh_release "VectorChord" "tensorchord/VectorChord" "binary" "${VCHORD_RELEASE}" "/tmp" "postgresql-${ACTUAL_PG_VERSION}-vchord_*_$(arch_resolve).deb"
|
fetch_and_deploy_gh_release "VectorChord" "tensorchord/VectorChord" "binary" "${VCHORD_RELEASE}" "/tmp" "postgresql-${ACTUAL_PG_VERSION}-vchord_*_$(arch_resolve).deb"
|
||||||
|
|
||||||
sed -i "s/^#shared_preload.*/shared_preload_libraries = 'vchord.so'/" /etc/postgresql/${ACTUAL_PG_VERSION}/main/postgresql.conf
|
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"
|
|||||||
|
|
||||||
msg_info "(5/5) Compiling libvips"
|
msg_info "(5/5) Compiling libvips"
|
||||||
SOURCE=$SOURCE_DIR/libvips
|
SOURCE=$SOURCE_DIR/libvips
|
||||||
LIBVIPS_REVISION="17ad2f62dda7e39985955da189183e594683d45e"
|
LIBVIPS_REVISION="3664cfc5dc2c5661288f5bf5a85ccc51c64c1626"
|
||||||
$STD git clone https://github.com/libvips/libvips.git "$SOURCE"
|
$STD git clone https://github.com/libvips/libvips.git "$SOURCE"
|
||||||
cd "$SOURCE"
|
cd "$SOURCE"
|
||||||
$STD git reset --hard "$LIBVIPS_REVISION"
|
$STD git reset --hard "$LIBVIPS_REVISION"
|
||||||
@@ -306,14 +306,20 @@ INSTALL_DIR="/opt/${APPLICATION}"
|
|||||||
UPLOAD_DIR="${INSTALL_DIR}/upload"
|
UPLOAD_DIR="${INSTALL_DIR}/upload"
|
||||||
SRC_DIR="${INSTALL_DIR}/source"
|
SRC_DIR="${INSTALL_DIR}/source"
|
||||||
APP_DIR="${INSTALL_DIR}/app"
|
APP_DIR="${INSTALL_DIR}/app"
|
||||||
PLUGIN_DIR="${APP_DIR}/corePlugin"
|
PLUGIN_DIR="${APP_DIR}/plugins/immich-plugin-core"
|
||||||
ML_DIR="${APP_DIR}/machine-learning"
|
ML_DIR="${APP_DIR}/machine-learning"
|
||||||
GEO_DIR="${INSTALL_DIR}/geodata"
|
GEO_DIR="${INSTALL_DIR}/geodata"
|
||||||
mkdir -p {"${APP_DIR}","${UPLOAD_DIR}","${GEO_DIR}","${INSTALL_DIR}"/cache}
|
mkdir -p {"${APP_DIR}","${UPLOAD_DIR}","${GEO_DIR}","${INSTALL_DIR}"/cache}
|
||||||
|
|
||||||
fetch_and_deploy_gh_release "Immich" "immich-app/immich" "tarball" "v2.7.5" "$SRC_DIR"
|
fetch_and_deploy_gh_release "Immich" "immich-app/immich" "tarball" "v3.0.1" "$SRC_DIR"
|
||||||
PNPM_VERSION="$(jq -r '.packageManager | split("@")[1] | split("+")[0]' ${SRC_DIR}/package.json)"
|
PNPM_VERSION="$(jq -r '.packageManager | split("@")[1] | split("+")[0]' ${SRC_DIR}/package.json)"
|
||||||
NODE_VERSION="24" NODE_MODULE="corepack,pnpm@${PNPM_VERSION}" setup_nodejs
|
export COREPACK_ENABLE_DOWNLOAD_PROMPT=0
|
||||||
|
NODE_VERSION="24" NODE_MODULE="corepack" setup_nodejs
|
||||||
|
# Provision the exact pnpm pinned in package.json's packageManager field via corepack instead
|
||||||
|
# of `npm i -g pnpm@X`, which collides (EEXIST) with the corepack pnpm shim shipped by the
|
||||||
|
$STD corepack prepare "pnpm@${PNPM_VERSION}" --activate
|
||||||
|
export PATH="/root/.local/share/pnpm/bin:$PATH"
|
||||||
|
$STD pnpm config set --global dangerouslyAllowAllBuilds true
|
||||||
|
|
||||||
msg_info "Installing Immich (patience)"
|
msg_info "Installing Immich (patience)"
|
||||||
|
|
||||||
@@ -323,10 +329,10 @@ export CI=1
|
|||||||
|
|
||||||
# server build
|
# server build
|
||||||
export SHARP_IGNORE_GLOBAL_LIBVIPS=true
|
export SHARP_IGNORE_GLOBAL_LIBVIPS=true
|
||||||
$STD pnpm --filter immich --frozen-lockfile build
|
$STD pnpm --filter @immich/sdk --filter @immich/plugin-sdk --filter immich build
|
||||||
unset SHARP_IGNORE_GLOBAL_LIBVIPS
|
unset SHARP_IGNORE_GLOBAL_LIBVIPS
|
||||||
export SHARP_FORCE_GLOBAL_LIBVIPS=true
|
export SHARP_FORCE_GLOBAL_LIBVIPS=true
|
||||||
$STD pnpm --filter immich --frozen-lockfile --prod --no-optional deploy "$APP_DIR"
|
$STD pnpm --filter immich --prod --no-optional deploy "$APP_DIR"
|
||||||
|
|
||||||
# Patch helmet.json: disable upgrade-insecure-requests for HTTP access
|
# Patch helmet.json: disable upgrade-insecure-requests for HTTP access
|
||||||
if [[ -f "$APP_DIR/helmet.json" ]]; then
|
if [[ -f "$APP_DIR/helmet.json" ]]; then
|
||||||
@@ -336,31 +342,35 @@ fi
|
|||||||
cp "$APP_DIR"/package.json "$APP_DIR"/bin
|
cp "$APP_DIR"/package.json "$APP_DIR"/bin
|
||||||
sed -i "s|^start|${APP_DIR}/bin/start|" "$APP_DIR"/bin/immich-admin
|
sed -i "s|^start|${APP_DIR}/bin/start|" "$APP_DIR"/bin/immich-admin
|
||||||
|
|
||||||
# openapi & web build
|
# sdk, cli & web build
|
||||||
cd "$SRC_DIR"
|
cd "$SRC_DIR"
|
||||||
echo "packageImportMethod: hardlink" >>./pnpm-workspace.yaml
|
echo "packageImportMethod: hardlink" >>./pnpm-workspace.yaml
|
||||||
$STD pnpm --filter @immich/sdk --filter immich-web --frozen-lockfile --force install
|
|
||||||
unset SHARP_FORCE_GLOBAL_LIBVIPS
|
unset SHARP_FORCE_GLOBAL_LIBVIPS
|
||||||
export SHARP_IGNORE_GLOBAL_LIBVIPS=true
|
export SHARP_IGNORE_GLOBAL_LIBVIPS=true
|
||||||
$STD pnpm --filter @immich/sdk --filter immich-web build
|
$STD pnpm --filter @immich/sdk --filter immich-web --filter @immich/cli build
|
||||||
|
$STD pnpm --filter @immich/cli --prod --no-optional deploy "$APP_DIR"/cli
|
||||||
cp -a web/build "$APP_DIR"/www
|
cp -a web/build "$APP_DIR"/www
|
||||||
cp LICENSE "$APP_DIR"
|
cp LICENSE "$APP_DIR"
|
||||||
|
|
||||||
# cli build
|
|
||||||
$STD pnpm --filter @immich/sdk --filter @immich/cli --frozen-lockfile install
|
|
||||||
$STD pnpm --filter @immich/sdk --filter @immich/cli build
|
|
||||||
$STD pnpm --filter @immich/cli --prod --no-optional deploy "$APP_DIR"/cli
|
|
||||||
|
|
||||||
# plugins
|
|
||||||
cd "$SRC_DIR"
|
cd "$SRC_DIR"
|
||||||
$STD mise trust --ignore ./mise.toml
|
export MISE_TRUSTED_CONFIG_PATHS="$SRC_DIR"/mise.toml
|
||||||
$STD mise trust ./plugins/mise.toml
|
export MISE_DISABLE_TOOLS=github:jellyfin/jellyfin-ffmpeg
|
||||||
cd plugins
|
|
||||||
$STD mise install
|
$STD mise install
|
||||||
$STD mise run build
|
export PATH="$(mise bin-paths 2>/dev/null | tr '\n' ':')$PATH"
|
||||||
|
if ! command -v extism-js >/dev/null 2>&1; then
|
||||||
|
# extism-js is published as a bare gzip-compressed single binary (.gz), which
|
||||||
|
# fetch_and_deploy_gh_release cannot deploy (singlefile leaves it compressed,
|
||||||
|
# prebuild only handles zip/tar). Fetch + gunzip it directly.
|
||||||
|
EXTISM_ARCH="$(arch_resolve x86_64 aarch64)"
|
||||||
|
curl_download /tmp/extism-js.gz "https://github.com/extism/js-pdk/releases/download/v1.6.0/extism-js-${EXTISM_ARCH}-linux-v1.6.0.gz"
|
||||||
|
gunzip -f /tmp/extism-js.gz
|
||||||
|
install -m 0755 /tmp/extism-js /usr/local/bin/extism-js
|
||||||
|
rm -f /tmp/extism-js
|
||||||
|
fi
|
||||||
|
$STD mise exec -- pnpm --filter @immich/sdk --filter @immich/plugin-sdk --filter @immich/plugin-core install --frozen-lockfile
|
||||||
|
$STD mise exec -- pnpm --filter @immich/sdk --filter @immich/plugin-sdk --filter @immich/plugin-core build
|
||||||
mkdir -p "$PLUGIN_DIR"
|
mkdir -p "$PLUGIN_DIR"
|
||||||
cp -r ./dist "$PLUGIN_DIR"/dist
|
cp -r ./packages/plugin-core/dist "$PLUGIN_DIR"/dist
|
||||||
cp ./manifest.json "$PLUGIN_DIR"
|
cp ./packages/plugin-core/manifest.json "$PLUGIN_DIR"
|
||||||
msg_ok "Installed Immich Server, Web and Plugin Components"
|
msg_ok "Installed Immich Server, Web and Plugin Components"
|
||||||
|
|
||||||
cd "$SRC_DIR"/machine-learning
|
cd "$SRC_DIR"/machine-learning
|
||||||
@@ -376,13 +386,13 @@ if [[ -f ~/.openvino ]]; then
|
|||||||
ML_PYTHON="python3.13"
|
ML_PYTHON="python3.13"
|
||||||
msg_info "Pre-installing Python ${ML_PYTHON} for machine-learning"
|
msg_info "Pre-installing Python ${ML_PYTHON} for machine-learning"
|
||||||
for attempt in $(seq 1 3); do
|
for attempt in $(seq 1 3); do
|
||||||
$STD sudo --preserve-env=VIRTUAL_ENV -nu immich uv python install "${ML_PYTHON}" && break
|
$STD sudo --preserve-env=VIRTUAL_ENV -Pnu immich uv python install "${ML_PYTHON}" && break
|
||||||
[[ $attempt -lt 3 ]] && msg_warn "Python download attempt $attempt failed, retrying..." && sleep 5
|
[[ $attempt -lt 3 ]] && msg_warn "Python download attempt $attempt failed, retrying..." && sleep 5
|
||||||
done
|
done
|
||||||
msg_ok "Pre-installed Python ${ML_PYTHON}"
|
msg_ok "Pre-installed Python ${ML_PYTHON}"
|
||||||
msg_info "Installing Intel OpenVINO machine-learning"
|
msg_info "Installing Intel OpenVINO machine-learning"
|
||||||
for attempt in $(seq 1 3); do
|
for attempt in $(seq 1 3); do
|
||||||
$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
|
$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
|
||||||
[[ $attempt -lt 3 ]] && msg_warn "uv sync attempt $attempt failed, retrying..." && sleep 10
|
[[ $attempt -lt 3 ]] && msg_warn "uv sync attempt $attempt failed, retrying..." && sleep 10
|
||||||
done
|
done
|
||||||
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"
|
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"
|
||||||
@@ -391,13 +401,13 @@ else
|
|||||||
ML_PYTHON="python3.11"
|
ML_PYTHON="python3.11"
|
||||||
msg_info "Pre-installing Python ${ML_PYTHON} for machine-learning"
|
msg_info "Pre-installing Python ${ML_PYTHON} for machine-learning"
|
||||||
for attempt in $(seq 1 3); do
|
for attempt in $(seq 1 3); do
|
||||||
$STD sudo --preserve-env=VIRTUAL_ENV -nu immich uv python install "${ML_PYTHON}" && break
|
$STD sudo --preserve-env=VIRTUAL_ENV -Pnu immich uv python install "${ML_PYTHON}" && break
|
||||||
[[ $attempt -lt 3 ]] && msg_warn "Python download attempt $attempt failed, retrying..." && sleep 5
|
[[ $attempt -lt 3 ]] && msg_warn "Python download attempt $attempt failed, retrying..." && sleep 5
|
||||||
done
|
done
|
||||||
msg_ok "Pre-installed Python ${ML_PYTHON}"
|
msg_ok "Pre-installed Python ${ML_PYTHON}"
|
||||||
msg_info "Installing machine-learning"
|
msg_info "Installing machine-learning"
|
||||||
for attempt in $(seq 1 3); do
|
for attempt in $(seq 1 3); do
|
||||||
$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
|
$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
|
||||||
[[ $attempt -lt 3 ]] && msg_warn "uv sync attempt $attempt failed, retrying..." && sleep 10
|
[[ $attempt -lt 3 ]] && msg_warn "uv sync attempt $attempt failed, retrying..." && sleep 10
|
||||||
done
|
done
|
||||||
msg_ok "Installed machine-learning"
|
msg_ok "Installed machine-learning"
|
||||||
|
|||||||
@@ -64,7 +64,7 @@ $STD sudo -u cool coolconfig set-admin-password --user=admin --password="$COOLPA
|
|||||||
echo "$COOLPASS" >~/.coolpass
|
echo "$COOLPASS" >~/.coolpass
|
||||||
msg_ok "Installed Collabora Online"
|
msg_ok "Installed Collabora Online"
|
||||||
|
|
||||||
fetch_and_deploy_gh_release "OpenCloud" "opencloud-eu/opencloud" "singlefile" "v7.0.0" "/usr/bin" "opencloud-*-linux-$(arch_resolve)"
|
fetch_and_deploy_gh_release "OpenCloud" "opencloud-eu/opencloud" "singlefile" "v7.2.0" "/usr/bin" "opencloud-*-linux-$(arch_resolve)"
|
||||||
mv /usr/bin/OpenCloud /usr/bin/opencloud
|
mv /usr/bin/OpenCloud /usr/bin/opencloud
|
||||||
|
|
||||||
msg_info "Configuring OpenCloud"
|
msg_info "Configuring OpenCloud"
|
||||||
|
|||||||
+77
-15
@@ -7442,6 +7442,13 @@ setup_nodejs() {
|
|||||||
local wants_corepack=0
|
local wants_corepack=0
|
||||||
local node_setup_ok_msg=""
|
local node_setup_ok_msg=""
|
||||||
|
|
||||||
|
# Corepack must run fully non-interactive. Without this it prints
|
||||||
|
# "Corepack is about to download X. Do you want to continue? [Y/n]" and blocks
|
||||||
|
# the whole install waiting for keyboard input - both here and in the calling
|
||||||
|
# script's later `corepack prepare` / `corepack <pm>` calls, which run in this
|
||||||
|
# same shell and inherit the export.
|
||||||
|
export COREPACK_ENABLE_DOWNLOAD_PROMPT=0
|
||||||
|
|
||||||
# ALWAYS clean up legacy installations first (nvm, etc.) to prevent conflicts
|
# ALWAYS clean up legacy installations first (nvm, etc.) to prevent conflicts
|
||||||
cleanup_legacy_install "nodejs"
|
cleanup_legacy_install "nodejs"
|
||||||
|
|
||||||
@@ -7596,17 +7603,48 @@ setup_nodejs() {
|
|||||||
|
|
||||||
IFS=',' read -ra MODULES <<<"$NODE_MODULE"
|
IFS=',' read -ra MODULES <<<"$NODE_MODULE"
|
||||||
|
|
||||||
|
local corepack_spec="corepack@latest"
|
||||||
for i in "${!MODULES[@]}"; do
|
for i in "${!MODULES[@]}"; do
|
||||||
if [[ "${MODULES[$i]}" == "corepack" || "${MODULES[$i]}" == corepack@* ]]; then
|
if [[ "${MODULES[$i]}" == "corepack" || "${MODULES[$i]}" == corepack@* ]]; then
|
||||||
wants_corepack=1
|
wants_corepack=1
|
||||||
|
[[ "${MODULES[$i]}" == corepack@* ]] && corepack_spec="${MODULES[$i]}"
|
||||||
fi
|
fi
|
||||||
if [[ "${MODULES[$i]}" == "pnpm" ]]; then
|
if [[ "${MODULES[$i]}" == "pnpm" ]]; then
|
||||||
MODULES[$i]="pnpm@^10"
|
MODULES[$i]="pnpm@^10"
|
||||||
fi
|
fi
|
||||||
done
|
done
|
||||||
|
|
||||||
|
# When corepack is requested, install and enable it FIRST. The corepack npm
|
||||||
|
# package owns the global yarn/pnpm/pnpx/yarnpkg bin shims, so a second
|
||||||
|
# `npm install -g yarn`/`pnpm` collides on /usr/bin/<tool> (EEXIST). With
|
||||||
|
# corepack ready we provision those package managers THROUGH corepack instead.
|
||||||
|
local corepack_ready=0
|
||||||
|
if ((wants_corepack)); then
|
||||||
|
msg_info "Installing corepack"
|
||||||
|
if $STD npm install -g "$corepack_spec" 2>/dev/null ||
|
||||||
|
$STD npm install -g --force "$corepack_spec" 2>/dev/null; then
|
||||||
|
msg_ok "Installed corepack"
|
||||||
|
else
|
||||||
|
msg_warn "Failed to install corepack"
|
||||||
|
fi
|
||||||
|
if [[ "$NODE_COREPACK_ENABLE" == "1" ]] && command -v corepack >/dev/null 2>&1; then
|
||||||
|
msg_info "Enabling corepack"
|
||||||
|
if $STD corepack enable 2>/dev/null; then
|
||||||
|
corepack_ready=1
|
||||||
|
msg_ok "Enabled corepack"
|
||||||
|
else
|
||||||
|
msg_warn "corepack enable failed"
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
|
||||||
local failed_modules=0
|
local failed_modules=0
|
||||||
for mod in "${MODULES[@]}"; do
|
for mod in "${MODULES[@]}"; do
|
||||||
|
# corepack itself is already handled above
|
||||||
|
if [[ "$mod" == "corepack" || "$mod" == corepack@* ]]; then
|
||||||
|
continue
|
||||||
|
fi
|
||||||
|
|
||||||
local MODULE_NAME MODULE_REQ_VERSION MODULE_INSTALLED_VERSION
|
local MODULE_NAME MODULE_REQ_VERSION MODULE_INSTALLED_VERSION
|
||||||
if [[ "$mod" == @*/*@* ]]; then
|
if [[ "$mod" == @*/*@* ]]; then
|
||||||
# Scoped package with version, e.g. @vue/cli-service@latest
|
# Scoped package with version, e.g. @vue/cli-service@latest
|
||||||
@@ -7622,12 +7660,36 @@ setup_nodejs() {
|
|||||||
MODULE_REQ_VERSION="latest"
|
MODULE_REQ_VERSION="latest"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
# Provision pnpm/yarn through corepack when it is active, so we never fight
|
||||||
|
# corepack over the /usr/bin/{yarn,pnpm} shim locations it owns.
|
||||||
|
if ((corepack_ready)) && [[ "$MODULE_NAME" == "pnpm" || "$MODULE_NAME" == "yarn" ]]; then
|
||||||
|
local corepack_pkg="$MODULE_NAME"
|
||||||
|
[[ "$MODULE_REQ_VERSION" != "latest" ]] && corepack_pkg="${MODULE_NAME}@${MODULE_REQ_VERSION}"
|
||||||
|
msg_info "Provisioning $MODULE_NAME via corepack"
|
||||||
|
if $STD corepack prepare "$corepack_pkg" --activate 2>/dev/null || command -v "$MODULE_NAME" >/dev/null 2>&1; then
|
||||||
|
msg_ok "Provisioned $MODULE_NAME via corepack"
|
||||||
|
else
|
||||||
|
msg_warn "Failed to provision $MODULE_NAME via corepack"
|
||||||
|
((failed_modules++)) || true
|
||||||
|
fi
|
||||||
|
continue
|
||||||
|
fi
|
||||||
|
|
||||||
|
# For the npm-global path, drop any corepack-provided shim first so the
|
||||||
|
# bin link can be created without an EEXIST collision.
|
||||||
|
if [[ "$MODULE_NAME" == "pnpm" || "$MODULE_NAME" == "yarn" || "$MODULE_NAME" == "yarnpkg" ]]; then
|
||||||
|
rm -f /usr/bin/"$MODULE_NAME" /usr/local/bin/"$MODULE_NAME" 2>/dev/null || true
|
||||||
|
fi
|
||||||
|
|
||||||
# Check if the module is already installed
|
# Check if the module is already installed
|
||||||
if $STD npm list -g --depth=0 "$MODULE_NAME" 2>&1 | grep -q "$MODULE_NAME@"; then
|
if $STD npm list -g --depth=0 "$MODULE_NAME" 2>&1 | grep -q "$MODULE_NAME@"; then
|
||||||
MODULE_INSTALLED_VERSION="$(npm list -g --depth=0 "$MODULE_NAME" 2>&1 | grep "$MODULE_NAME@" | awk -F@ '{print $2}' 2>/dev/null | tr -d '[:space:]' || echo '')"
|
MODULE_INSTALLED_VERSION="$(npm list -g --depth=0 "$MODULE_NAME" 2>&1 | grep "$MODULE_NAME@" | awk -F@ '{print $2}' 2>/dev/null | tr -d '[:space:]' || echo '')"
|
||||||
if [[ "$MODULE_REQ_VERSION" != "latest" && "$MODULE_REQ_VERSION" != "$MODULE_INSTALLED_VERSION" ]]; then
|
if [[ "$MODULE_REQ_VERSION" != "latest" && "$MODULE_REQ_VERSION" != "$MODULE_INSTALLED_VERSION" ]]; then
|
||||||
msg_info "Updating $MODULE_NAME to v$MODULE_REQ_VERSION"
|
msg_info "Updating $MODULE_NAME to v$MODULE_REQ_VERSION"
|
||||||
if $STD npm install -g "${MODULE_NAME}@${MODULE_REQ_VERSION}" 2>/dev/null; then
|
# Retry with --force to overwrite corepack-provided shims (pnpm/yarn), which now
|
||||||
|
# ship with recent corepack and cause EEXIST on /usr/bin/<tool>
|
||||||
|
if $STD npm install -g "${MODULE_NAME}@${MODULE_REQ_VERSION}" 2>/dev/null ||
|
||||||
|
$STD npm install -g --force "${MODULE_NAME}@${MODULE_REQ_VERSION}" 2>/dev/null; then
|
||||||
msg_ok "Updated $MODULE_NAME"
|
msg_ok "Updated $MODULE_NAME"
|
||||||
else
|
else
|
||||||
msg_warn "Failed to update $MODULE_NAME to version $MODULE_REQ_VERSION"
|
msg_warn "Failed to update $MODULE_NAME to version $MODULE_REQ_VERSION"
|
||||||
@@ -7635,7 +7697,8 @@ setup_nodejs() {
|
|||||||
fi
|
fi
|
||||||
elif [[ "$MODULE_REQ_VERSION" == "latest" ]]; then
|
elif [[ "$MODULE_REQ_VERSION" == "latest" ]]; then
|
||||||
msg_info "Updating $MODULE_NAME to latest version"
|
msg_info "Updating $MODULE_NAME to latest version"
|
||||||
if $STD npm install -g "${MODULE_NAME}@latest" 2>/dev/null; then
|
if $STD npm install -g "${MODULE_NAME}@latest" 2>/dev/null ||
|
||||||
|
$STD npm install -g --force "${MODULE_NAME}@latest" 2>/dev/null; then
|
||||||
msg_ok "Updated $MODULE_NAME"
|
msg_ok "Updated $MODULE_NAME"
|
||||||
else
|
else
|
||||||
msg_warn "Failed to update $MODULE_NAME to latest version"
|
msg_warn "Failed to update $MODULE_NAME to latest version"
|
||||||
@@ -7644,7 +7707,10 @@ setup_nodejs() {
|
|||||||
fi
|
fi
|
||||||
else
|
else
|
||||||
msg_info "Installing $MODULE_NAME@$MODULE_REQ_VERSION"
|
msg_info "Installing $MODULE_NAME@$MODULE_REQ_VERSION"
|
||||||
if $STD npm install -g "${MODULE_NAME}@${MODULE_REQ_VERSION}" 2>/dev/null; then
|
# Retry with --force to overwrite corepack-provided shims (pnpm/yarn), which now
|
||||||
|
# ship with recent corepack and cause EEXIST on /usr/bin/<tool>
|
||||||
|
if $STD npm install -g "${MODULE_NAME}@${MODULE_REQ_VERSION}" 2>/dev/null ||
|
||||||
|
$STD npm install -g --force "${MODULE_NAME}@${MODULE_REQ_VERSION}" 2>/dev/null; then
|
||||||
msg_ok "Installed $MODULE_NAME"
|
msg_ok "Installed $MODULE_NAME"
|
||||||
else
|
else
|
||||||
msg_warn "Failed to install $MODULE_NAME@$MODULE_REQ_VERSION"
|
msg_warn "Failed to install $MODULE_NAME@$MODULE_REQ_VERSION"
|
||||||
@@ -7657,19 +7723,15 @@ setup_nodejs() {
|
|||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# pnpm v10+ blocks dependency build scripts by default (ERR_PNPM_IGNORED_BUILDS).
|
# pnpm v10+ blocks dependency build scripts by default. Do NOT force
|
||||||
# In a container environment all installed packages are trusted, so we enable builds globally.
|
# `dangerouslyAllowAllBuilds` globally: pnpm implements that flag as an empty
|
||||||
|
# `neverBuiltDependencies`, which then clashes with any project that ships its
|
||||||
|
# own `onlyBuiltDependencies` (every create-t3-app based app, e.g. Split Pro)
|
||||||
|
# and aborts with ERR_PNPM_CONFIG_CONFLICT_BUILT_DEPENDENCIES. Instead relax the
|
||||||
|
# strict check so an unapproved build is a warning, not a fatal error; scripts
|
||||||
|
# that truly need every build script executed enable that themselves.
|
||||||
if command -v pnpm >/dev/null 2>&1; then
|
if command -v pnpm >/dev/null 2>&1; then
|
||||||
pnpm config set --global dangerouslyAllowAllBuilds true >/dev/null 2>&1 || true
|
pnpm config set --global strictDepBuilds false >/dev/null 2>&1 || true
|
||||||
fi
|
|
||||||
|
|
||||||
if [[ "$NODE_COREPACK_ENABLE" == "1" ]] && ((wants_corepack)) && command -v corepack >/dev/null 2>&1; then
|
|
||||||
msg_info "Enabling corepack"
|
|
||||||
if $STD corepack enable 2>/dev/null; then
|
|
||||||
msg_ok "Enabled corepack"
|
|
||||||
else
|
|
||||||
msg_warn "corepack enable failed"
|
|
||||||
fi
|
|
||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -176,11 +176,10 @@ if [[ "${noauth_prompt,,}" =~ ^(y|yes)$ ]]; then
|
|||||||
server:
|
server:
|
||||||
port: $PORT
|
port: $PORT
|
||||||
sources:
|
sources:
|
||||||
- path: "$SRC_DIR"
|
- path: "$SRC_DIR"
|
||||||
name: "RootFS"
|
name: "RootFS"
|
||||||
config:
|
config:
|
||||||
denyByDefault: false
|
denyByDefault: false
|
||||||
disableIndexing: false
|
|
||||||
indexingIntervalMinutes: 240
|
indexingIntervalMinutes: 240
|
||||||
conditionals:
|
conditionals:
|
||||||
rules:
|
rules:
|
||||||
@@ -204,7 +203,6 @@ server:
|
|||||||
name: "RootFS"
|
name: "RootFS"
|
||||||
config:
|
config:
|
||||||
denyByDefault: false
|
denyByDefault: false
|
||||||
disableIndexing: false
|
|
||||||
indexingIntervalMinutes: 240
|
indexingIntervalMinutes: 240
|
||||||
conditionals:
|
conditionals:
|
||||||
rules:
|
rules:
|
||||||
|
|||||||
Reference in New Issue
Block a user