From 139b9694db7b22941540fd9e10319878847ad7d8 Mon Sep 17 00:00:00 2001 From: Min Idzelis Date: Sat, 5 Jul 2025 15:26:09 +0000 Subject: [PATCH] chore: dockerfile layout changes --- .dockerignore | 32 +++++++------- .gitignore | 1 + cli/package-lock.json | 2 +- docker/docker-compose.dev.yml | 25 +++++------ e2e/package-lock.json | 2 +- server/Dockerfile | 80 +++++++++++++++++------------------ server/bin/immich-dev | 4 +- web/Dockerfile | 10 ++++- web/bin/immich-web | 4 +- 9 files changed, 85 insertions(+), 75 deletions(-) diff --git a/.dockerignore b/.dockerignore index d152800d1b..f7efb5c56e 100644 --- a/.dockerignore +++ b/.dockerignore @@ -1,41 +1,41 @@ .vscode/ .github/ .git/ +.env* +*.log +*.tmp +*.temp + +**/Dockerfile +**/node_modules/ +**/.pnpm-store/ +**/dist/ +**/coverage/ +**/build/ design/ docker/ -Dockerfile !docker/scripts + docs/ !docs/package.json !docs/package-lock.json + e2e/ !e2e/package.json !e2e/package-lock.json + fastlane/ machine-learning/ misc/ mobile/ -cli/coverage/ -cli/dist/ -cli/node_modules/ -cli/Dockerfile - open-api/typescript-sdk/build/ -open-api/typescript-sdk/node_modules/ +!open-api/typescript-sdk/package.json +!open-api/typescript-sdk/package-lock.json -server/coverage/ -server/node_modules/ server/upload/ server/src/queries -server/dist/ server/www/ -server/Dockerfile -web/node_modules/ -web/coverage/ web/.svelte-kit -web/build/ -web/.env -web/Dockerfile diff --git a/.gitignore b/.gitignore index b4ebd04841..af85d96c02 100644 --- a/.gitignore +++ b/.gitignore @@ -24,3 +24,4 @@ mobile/android/fastlane/report.xml mobile/ios/fastlane/report.xml vite.config.js.timestamp-* +.pnpm-store diff --git a/cli/package-lock.json b/cli/package-lock.json index b690003395..9332507a87 100644 --- a/cli/package-lock.json +++ b/cli/package-lock.json @@ -16,7 +16,7 @@ "micromatch": "^4.0.8" }, "bin": { - "immich": "dist/index.js" + "immich": "bin/immich" }, "devDependencies": { "@eslint/eslintrc": "^3.1.0", diff --git a/docker/docker-compose.dev.yml b/docker/docker-compose.dev.yml index 0694bf57f2..7f77b9ec9d 100644 --- a/docker/docker-compose.dev.yml +++ b/docker/docker-compose.dev.yml @@ -16,7 +16,7 @@ name: immich-dev services: immich-server: container_name: immich_server - command: ['/usr/src/app/bin/immich-dev'] + command: ['/usr/src/app/server/bin/immich-dev'] image: immich-server-dev:latest # extends: # file: hwaccel.transcoding.yml @@ -27,11 +27,11 @@ services: target: dev restart: unless-stopped volumes: - - ../server:/usr/src/app - - ../open-api:/usr/src/open-api - - ${UPLOAD_LOCATION}/photos:/usr/src/app/upload - - ${UPLOAD_LOCATION}/photos/upload:/usr/src/app/upload/upload - - /usr/src/app/node_modules + - ../server:/usr/src/app/server + - ../open-api:/usr/src/app/open-api + - ${UPLOAD_LOCATION}/photos:/usr/src/app/server/upload + - ${UPLOAD_LOCATION}/photos/upload:/usr/src/app/server/upload/upload + - /usr/src/app/server/node_modules - /etc/localtime:/etc/localtime:ro env_file: - .env @@ -69,19 +69,20 @@ services: # Needed for rootless docker setup, see https://github.com/moby/moby/issues/45919 # user: 0:0 build: - context: ../web - command: ['/usr/src/app/bin/immich-web'] + context: ../ + dockerfile: web/Dockerfile + command: ['/usr/src/app/web/bin/immich-web'] env_file: - .env ports: - 3000:3000 - 24678:24678 volumes: - - ../web:/usr/src/app - - ../i18n:/usr/src/i18n - - ../open-api/:/usr/src/open-api/ + - ../web:/usr/src/app/web + - ../i18n:/usr/src/app/i18n + - ../open-api/:/usr/src/app/open-api/ # - ../../ui:/usr/ui - - /usr/src/app/node_modules + - /usr/src/app/web/node_modules ulimits: nofile: soft: 1048576 diff --git a/e2e/package-lock.json b/e2e/package-lock.json index 162c863832..37ef2bd634 100644 --- a/e2e/package-lock.json +++ b/e2e/package-lock.json @@ -56,7 +56,7 @@ "micromatch": "^4.0.8" }, "bin": { - "immich": "dist/index.js" + "immich": "bin/immich" }, "devDependencies": { "@eslint/eslintrc": "^3.1.0", diff --git a/server/Dockerfile b/server/Dockerfile index 6003ea5d32..a11cfcbd54 100644 --- a/server/Dockerfile +++ b/server/Dockerfile @@ -4,25 +4,26 @@ FROM ghcr.io/immich-app/base-server-dev:commit-a050847fdf07f1e492919810121419f65 # This next line is temporary, until the docker images are tagged properly. Currently, the dev tag is the same as the prod tag. RUN apt-get update && apt-get install --no-install-recommends -yqq tini make WORKDIR /usr/src/app -COPY server/package.json server/package-lock.json ./ +COPY ./server/package* ./server/ +WORKDIR /usr/src/app/server RUN npm ci && \ - # exiftool-vendored.pl, sharp-linux-x64 and sharp-linux-arm64 are the only ones we need - # they're marked as optional dependencies, so we need to copy them manually after pruning - rm -rf node_modules/@img/sharp-libvips* && \ - rm -rf node_modules/@img/sharp-linuxmusl-x64 + # exiftool-vendored.pl, sharp-linux-x64 and sharp-linux-arm64 are the only ones we need + # they're marked as optional dependencies, so we need to copy them manually after pruning + rm -rf node_modules/@img/sharp-libvips* && \ + rm -rf node_modules/@img/sharp-linuxmusl-x64 ENV PATH="${PATH}:/usr/src/app/bin" \ - IMMICH_ENV=development \ - NVIDIA_DRIVER_CAPABILITIES=all \ - NVIDIA_VISIBLE_DEVICES=all + IMMICH_ENV=development \ + NVIDIA_DRIVER_CAPABILITIES=all \ + NVIDIA_VISIBLE_DEVICES=all ENTRYPOINT ["tini", "--", "/bin/sh"] FROM dev AS dev-container-server RUN rm -rf /usr/src/app RUN apt-get update && \ - apt-get install sudo inetutils-ping openjdk-11-jre-headless \ - vim nano \ - -y --no-install-recommends --fix-missing + apt-get install sudo inetutils-ping openjdk-11-jre-headless \ + vim nano \ + -y --no-install-recommends --fix-missing RUN usermod -aG sudo node RUN echo "node ALL=(ALL) NOPASSWD: ALL" >> /etc/sudoers @@ -40,14 +41,14 @@ FROM dev-container-server AS dev-container-mobile USER root # Enable multiarch for arm64 if necessary RUN if [ "$(dpkg --print-architecture)" = "arm64" ]; then \ - dpkg --add-architecture amd64 && \ - apt-get update && \ - apt-get install -y --no-install-recommends \ - qemu-user-static \ - libc6:amd64 \ - libstdc++6:amd64 \ - libgcc1:amd64; \ - fi + dpkg --add-architecture amd64 && \ + apt-get update && \ + apt-get install -y --no-install-recommends \ + qemu-user-static \ + libc6:amd64 \ + libstdc++6:amd64 \ + libgcc1:amd64; \ + fi # Flutter SDK # https://flutter.dev/docs/development/tools/sdk/releases?tab=linux @@ -79,40 +80,37 @@ FROM dev AS prod COPY server . RUN npm run build RUN npm prune --omit=dev --omit=optional -COPY --from=dev /usr/src/app/node_modules/@img ./node_modules/@img -COPY --from=dev /usr/src/app/node_modules/exiftool-vendored.pl ./node_modules/exiftool-vendored.pl +COPY --from=dev /usr/src/app/server/node_modules/@img ./node_modules/@img +COPY --from=dev /usr/src/app/server/node_modules/exiftool-vendored.pl ./node_modules/exiftool-vendored.pl # web build FROM node:22.16.0-alpine3.20@sha256:2289fb1fba0f4633b08ec47b94a89c7e20b829fc5679f9b7b298eaa2f1ed8b7e AS web -WORKDIR /usr/src/open-api/typescript-sdk -COPY open-api/typescript-sdk/package*.json open-api/typescript-sdk/tsconfig*.json ./ -RUN npm ci -COPY open-api/typescript-sdk/ ./ -RUN npm run build - WORKDIR /usr/src/app -COPY web/package*.json web/svelte.config.js ./ -RUN npm ci -COPY web ./ -COPY i18n ../i18n -RUN npm run build +COPY ./web ./web/ +COPY ./i18n ./i18n/ +COPY ./open-api/typescript-sdk ./open-api/typescript-sdk/ +WORKDIR /usr/src/app/open-api/typescript-sdk +RUN npm ci && npm run build + +WORKDIR /usr/src/app/web +RUN npm ci && npm run build # prod build FROM ghcr.io/immich-app/base-server-prod:commit-a050847fdf07f1e492919810121419f65ec9eb45 WORKDIR /usr/src/app ENV NODE_ENV=production \ - NVIDIA_DRIVER_CAPABILITIES=all \ - NVIDIA_VISIBLE_DEVICES=all -COPY --from=prod /usr/src/app/node_modules ./node_modules -COPY --from=prod /usr/src/app/dist ./dist -COPY --from=prod /usr/src/app/bin ./bin -COPY --from=web /usr/src/app/build /build/www -COPY server/resources resources -COPY server/package.json server/package-lock.json ./ -COPY server/start*.sh ./ + NVIDIA_DRIVER_CAPABILITIES=all \ + NVIDIA_VISIBLE_DEVICES=all +COPY --from=prod /usr/src/app/server/node_modules ./node_modules +COPY --from=prod /usr/src/app/server/dist ./dist +COPY --from=prod /usr/src/app/server/bin ./bin +COPY --from=web /usr/src/app/web/build /build/www +COPY ./server/resources resources +COPY ./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 --force COPY LICENSE /licenses/LICENSE.txt diff --git a/server/bin/immich-dev b/server/bin/immich-dev index 177455d037..35abef983e 100755 --- a/server/bin/immich-dev +++ b/server/bin/immich-dev @@ -1,3 +1,5 @@ #!/usr/bin/env bash -node /usr/src/app/node_modules/.bin/nest start --debug "0.0.0.0:9230" --watch -- "$@" +cd /usr/src/app/server || exit 1 +npm install +node ./node_modules/.bin/nest start --debug "0.0.0.0:9230" --watch -- "$@" diff --git a/web/Dockerfile b/web/Dockerfile index 1c6c4b46bf..1db76c7c7f 100644 --- a/web/Dockerfile +++ b/web/Dockerfile @@ -1,10 +1,16 @@ FROM node:22.16.0-alpine3.20@sha256:2289fb1fba0f4633b08ec47b94a89c7e20b829fc5679f9b7b298eaa2f1ed8b7e -RUN apk add --no-cache tini +RUN apk add --no-cache tini make + USER node WORKDIR /usr/src/app -COPY --chown=node:node package*.json ./ +COPY --chown=node:node ./web ./web/ +COPY --chown=node:node ./open-api ./open-api/ +COPY --chown=node:node Makefile ./ + +WORKDIR /usr/src/app/web RUN npm ci + ENV CHOKIDAR_USEPOLLING=true EXPOSE 24678 EXPOSE 3000 diff --git a/web/bin/immich-web b/web/bin/immich-web index ea748863db..0ebc2ed749 100755 --- a/web/bin/immich-web +++ b/web/bin/immich-web @@ -1,10 +1,12 @@ #!/usr/bin/env sh -TYPESCRIPT_SDK=/usr/src/open-api/typescript-sdk +TYPESCRIPT_SDK=/usr/src/app/open-api/typescript-sdk +cd /usr/src/app/web || exit 1 npm --prefix "$TYPESCRIPT_SDK" install npm --prefix "$TYPESCRIPT_SDK" run build +npm install COUNT=0 UPSTREAM="${IMMICH_SERVER_URL:-http://immich-server:2283/}"