High performance self-hosted photo and video management solution.
TypeScript backup-toolfluttergoogle-photosgoogle-photos-alternativejavascriptmobile-appnestjsnodejsphoto-galleryphotosphotos-managementself-hostedsveltesveltekittypescriptvideos
feat: relocate scripts, PATH update (#20002)
Min Idzelisf33e1ad94c4f
diff --git a/docker/docker-compose.dev.yml b/docker/docker-compose.dev.ymlindex 56d1817317..f3d1e83fb2 100644--- a/docker/docker-compose.dev.yml+++ b/docker/docker-compose.dev.yml@@ -16,7 +16,7 @@ name: immich-devservices:immich-server:container_name: immich_server- command: ['/usr/src/app/bin/immich-dev']+ command: ['immich-dev']image: immich-server-dev:latest# extends:# file: hwaccel.transcoding.yml@@ -70,7 +70,7 @@ services:# user: 0:0build:context: ../web- command: ['/usr/src/app/bin/immich-web']+ command: ['immich-web']env_file:- .envports:diff --git a/e2e/docker-compose.yml b/e2e/docker-compose.ymlindex 6ec5402360..26c3951278 100644--- a/e2e/docker-compose.yml+++ b/e2e/docker-compose.yml@@ -3,7 +3,6 @@ name: immich-e2eservices:immich-server:container_name: immich-e2e-server- command: ['./start.sh']image: immich-server:latestbuild:context: ../diff --git a/server/Dockerfile b/server/Dockerfileindex 0b3b864c95..b95887f18b 100644--- a/server/Dockerfile+++ b/server/Dockerfile@@ -12,7 +12,7 @@ ENV PATH="${PATH}:/usr/src/app/bin" \IMMICH_ENV=development \NVIDIA_DRIVER_CAPABILITIES=all \NVIDIA_VISIBLE_DEVICES=all-ENTRYPOINT ["tini", "--", "/bin/sh"]+ENTRYPOINT ["tini", "--", "/bin/sh", "-c"]FROM dev AS dev-container-server@@ -110,8 +110,6 @@ COPY --from=prod /usr/src/app/bin ./binCOPY --from=web /usr/src/app/build /build/wwwCOPY server/resources resourcesCOPY server/package.json server/package-lock.json ./-COPY server/start*.sh ./-COPY "docker/scripts/get-cpus.sh" ./RUN npm install -g @immich/cli && npm cache clean --forceCOPY LICENSE /licenses/LICENSE.txtCOPY LICENSE /LICENSE@@ -134,7 +132,7 @@ ENV IMMICH_SOURCE_URL=https://github.com/immich-app/immich/commit/${BUILD_SOURCEVOLUME /usr/src/app/uploadEXPOSE 2283-ENTRYPOINT ["tini", "--", "/bin/bash"]+ENTRYPOINT ["tini", "--", "/bin/bash", "-c"]CMD ["start.sh"]HEALTHCHECK CMD immich-healthcheckdiff --git a/docker/scripts/get-cpus.sh b/server/bin/get-cpus.shsimilarity index 100%rename from docker/scripts/get-cpus.shrename to server/bin/get-cpus.shdiff --git a/server/bin/immich-admin b/server/bin/immich-adminindex 30fd33a20a..0465a362b8 100755--- a/server/bin/immich-admin+++ b/server/bin/immich-admin@@ -1,3 +1,3 @@#!/usr/bin/env sh-/usr/src/app/start.sh immich-admin "$@"+start.sh immich-admin "$@"diff --git a/server/bin/immich-dev b/server/bin/immich-devindex 177455d037..85d75b8b0c 100755--- a/server/bin/immich-dev+++ b/server/bin/immich-dev@@ -1,3 +1,9 @@#!/usr/bin/env bash-node /usr/src/app/node_modules/.bin/nest start --debug "0.0.0.0:9230" --watch -- "$@"+if [ "$IMMICH_ENV" != "development" ]; then+ echo "This command can only be run in development environments"+ exit 1+fi++cd /usr/src/app || exit 1+node ./node_modules/.bin/nest start --debug "0.0.0.0:9230" --watch -- "$@"diff --git a/server/bin/start.sh b/server/bin/start.shnew file mode 100755index 0000000000..7c6069570d--- /dev/null+++ b/server/bin/start.sh@@ -0,0 +1,44 @@+#!/usr/bin/env bash+echo "Initializing Immich $IMMICH_SOURCE_REF"++lib_path="/usr/lib/$(arch)-linux-gnu/libmimalloc.so.2"+if [ -f "$lib_path" ]; then+ export LD_PRELOAD="$lib_path"+else+ echo "skipping libmimalloc - path not found $lib_path"+fi+export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:/usr/lib/jellyfin-ffmpeg/lib"+SERVER_HOME=/usr/src/app++read_file_and_export() {+ if [ -n "${!1}" ]; then+ content="$(cat "${!1}")"+ export "$2"="${content}"+ unset "$1"+ fi+}+read_file_and_export "DB_URL_FILE" "DB_URL"+read_file_and_export "DB_HOSTNAME_FILE" "DB_HOSTNAME"+read_file_and_export "DB_DATABASE_NAME_FILE" "DB_DATABASE_NAME"+read_file_and_export "DB_USERNAME_FILE" "DB_USERNAME"+read_file_and_export "DB_PASSWORD_FILE" "DB_PASSWORD"+read_file_and_export "REDIS_PASSWORD_FILE" "REDIS_PASSWORD"++if CPU_CORES="${CPU_CORES:=$(get-cpus.sh 2>/dev/null)}"; then+ echo "Detected CPU Cores: $CPU_CORES"+ if [ "$CPU_CORES" -gt 4 ]; then+ export UV_THREADPOOL_SIZE=$CPU_CORES+ fi+else+ echo "skipping get-cpus.sh - not found in PATH or failed: using default UV_THREADPOOL_SIZE"+fi++if [ -f "${SERVER_HOME}/dist/main.js" ]; then+ exec node "${SERVER_HOME}/dist/main.js" "$@"+else+ echo "Error: ${SERVER_HOME}/dist/main.js not found"+ if [ "$IMMICH_ENV" = "development" ]; then+ echo "You may need to build the server first."+ fi+ exit 1+fidiff --git a/server/start.sh b/server/start.shdeleted file mode 100755index 1a08d01a75..0000000000--- a/server/start.sh+++ /dev/null@@ -1,29 +0,0 @@-#!/usr/bin/env bash--echo "Initializing Immich $IMMICH_SOURCE_REF"--lib_path="/usr/lib/$(arch)-linux-gnu/libmimalloc.so.2"-export LD_PRELOAD="$lib_path"-export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:/usr/lib/jellyfin-ffmpeg/lib"--read_file_and_export() {- if [ -n "${!1}" ]; then- content="$(cat "${!1}")"- export "$2"="${content}"- unset "$1"- fi-}-read_file_and_export "DB_URL_FILE" "DB_URL"-read_file_and_export "DB_HOSTNAME_FILE" "DB_HOSTNAME"-read_file_and_export "DB_DATABASE_NAME_FILE" "DB_DATABASE_NAME"-read_file_and_export "DB_USERNAME_FILE" "DB_USERNAME"-read_file_and_export "DB_PASSWORD_FILE" "DB_PASSWORD"-read_file_and_export "REDIS_PASSWORD_FILE" "REDIS_PASSWORD"--export CPU_CORES="${CPU_CORES:=$(./get-cpus.sh)}"-echo "Detected CPU Cores: $CPU_CORES"-if [ "$CPU_CORES" -gt 4 ]; then- export UV_THREADPOOL_SIZE=$CPU_CORES-fi--exec node /usr/src/app/dist/main "$@"diff --git a/web/Dockerfile b/web/Dockerfileindex 1c6c4b46bf..c83f783391 100644--- a/web/Dockerfile+++ b/web/Dockerfile@@ -5,7 +5,8 @@ USER nodeWORKDIR /usr/src/appCOPY --chown=node:node package*.json ./RUN npm ci-ENV CHOKIDAR_USEPOLLING=true+ENV CHOKIDAR_USEPOLLING=true \+ PATH="${PATH}:/usr/src/app/bin"EXPOSE 24678EXPOSE 3000-ENTRYPOINT ["/sbin/tini", "--", "/bin/sh"]+ENTRYPOINT ["/sbin/tini", "--", "/bin/sh", "-c"]diff --git a/web/bin/immich-web b/web/bin/immich-webindex ea748863db..8868945ee1 100755--- a/web/bin/immich-web+++ b/web/bin/immich-web@@ -5,6 +5,7 @@ TYPESCRIPT_SDK=/usr/src/open-api/typescript-sdknpm --prefix "$TYPESCRIPT_SDK" installnpm --prefix "$TYPESCRIPT_SDK" run build+cd /usr/src/app || exit 1COUNT=0UPSTREAM="${IMMICH_SERVER_URL:-http://immich-server:2283/}"