chore: dockerfile layout changes

2025-07-09 03:04:16 -04:00 · 2025-07-01 22:19:28 +00:00 · 2025-07-01 22:19:28 +00:00 · fed02c7f83
commit fed02c7f83
parent 25efba8fe6
9 changed files with 130 additions and 103 deletions
--- a/.dockerignore
+++ b/.dockerignore
@ -2,6 +2,9 @@
 .github/
 .git/

+node_modules
+.pnpm-store
+
 design/
 docker/
 Dockerfile
@ -24,6 +27,8 @@ 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/
--- a/.gitignore
+++ b/.gitignore
@ -24,3 +24,4 @@ mobile/android/fastlane/report.xml
 mobile/ios/fastlane/report.xml

 vite.config.js.timestamp-*
+.pnpm-store
--- a/5
+++ b/5
@ -89,7 +89,7 @@ test-medium-dev:
 	docker exec -it immich_server /bin/sh -c "npm run test:medium"

 build-all: $(foreach M,$(filter-out e2e .github,$(MODULES)),build-$M) ;
-install-all: $(foreach M,$(MODULES),install-$M) ;  
+install-all: $(foreach M,$(MODULES),install-$M) ;
 ci-all: $(foreach M,$(filter-out .github,$(MODULES)),ci-$M) ;
 check-all: $(foreach M,$(filter-out sdk cli docs .github,$(MODULES)),check-$M) ;
 lint-all: $(foreach M,$(filter-out sdk docs .github,$(MODULES)),lint-$M) ;
@ -106,4 +106,5 @@ clean:
 	command -v docker >/dev/null 2>&1 && docker compose -f ./docker/docker-compose.dev.yml rm -v -f || true
 	command -v docker >/dev/null 2>&1 && docker compose -f ./e2e/docker-compose.yml rm -v -f || true

-setup-dev: install-server install-sdk build-sdk install-web
+setup-dev: install-server setup-dev
+setup-web: install-sdk build-sdk install-web
--- a/cli/Dockerfile
+++ b/cli/Dockerfile
@ -1,19 +1,19 @@
 FROM node:22.16.0-alpine3.20@sha256:2289fb1fba0f4633b08ec47b94a89c7e20b829fc5679f9b7b298eaa2f1ed8b7e AS core

-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 cli/package.json cli/package-lock.json ./
-RUN npm ci
+COPY --chown=node:node open-api ./open-api
+COPY --chown=node:node cli ./cli

-COPY cli .
-RUN npm run build
+RUN cd /usr/src/app/open-api/typescript-sdk && \
+  npm ci && \
+  npm run build && \
+  cd /usr/src/app/cli && \
+  npm ci && \
+  npm run build && \
+  npm prune --omit dev --omit optional && \
+  rm -rf src eslint* package-lock* tsconfig* vite*

 WORKDIR /import

-ENTRYPOINT ["node", "/usr/src/app/dist"]
+ENTRYPOINT ["node", "/usr/src/app/cli/dist"]
--- 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,10 @@ 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
+      - ..:/usr/src/app
+      - ${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,17 +68,16 @@ 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/
+      - ..:/usr/src/app
      # - ../../ui:/usr/ui
      - /usr/src/app/node_modules
    ulimits:
--- a/server/Dockerfile
+++ b/server/Dockerfile
@ -1,52 +1,60 @@
 # dev build
 FROM ghcr.io/immich-app/base-server-dev:202505131114@sha256:cf4507bbbf307e9b6d8ee9418993321f2b85867da8ce14d0a20ccaf9574cb995 AS dev

-RUN apt-get install --no-install-recommends -yqq tini
-WORKDIR /usr/src/app
-COPY server/package.json server/package-lock.json ./
-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
 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 \
+  npm_config_devdir=/buildcache/node_gyp
+
+RUN apt-get install --no-install-recommends -yqq tini && \
+  mkdir -p /buildcache/pnpm_store && \
+  chown -R node:node /buildcache && \
+  rm -rf /usr/src/app && \
+  mkdir -p /usr/src/app && \
+  chown node:node /usr/src/app
+
+WORKDIR /usr/src/app
+
 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
-
-RUN usermod -aG sudo node
-RUN echo "node ALL=(ALL) NOPASSWD: ALL" >> /etc/sudoers
-RUN mkdir -p /workspaces/immich
-RUN chown node -R /workspaces
-COPY --chown=node:node --chmod=777 ../.devcontainer/server/*.sh /immich-devcontainer/
+RUN rm -rf /usr/src/app && \
+  apt-get update && \
+  apt-get install sudo inetutils-ping openjdk-11-jre-headless \
+  vim nano -y --no-install-recommends --fix-missing && \
+  rm -rf /var/lib/apt/lists/* && \
+  usermod -aG sudo node && \
+  echo "node ALL=(ALL) NOPASSWD: ALL" >> /etc/sudoers

 USER node
+
+RUN sudo mkdir -p /workspaces/immich && \
+  sudo chown node -R /workspaces && \
+  sudo mkdir /immich-devcontainer && \
+  sudo chown node -R /immich-devcontainer
+
+COPY --chmod=777 \
+  ../.devcontainer/server/*.sh \
+  /immich-devcontainer/
+
 COPY --chown=node:node .. /tmp/create-dep-cache/
 WORKDIR /tmp/create-dep-cache
 RUN make ci-all && rm -rf /tmp/create-dep-cache

+WORKDIR /workspaces/immich

 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
+  sudo dpkg --add-architecture amd64 && \
+  sudo 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
@ -56,66 +64,71 @@ ENV FLUTTER_HOME=/flutter
 ENV PATH=${PATH}:${FLUTTER_HOME}/bin

 # Flutter SDK
-RUN mkdir -p ${FLUTTER_HOME} \
-  && curl -C - --output flutter.tar.xz https://storage.googleapis.com/flutter_infra_release/releases/${FLUTTER_CHANNEL}/linux/flutter_linux_${FLUTTER_VERSION}-${FLUTTER_CHANNEL}.tar.xz \
-  && tar -xf flutter.tar.xz --strip-components=1 -C ${FLUTTER_HOME} \
-  && rm flutter.tar.xz \
-  && chown -R node ${FLUTTER_HOME}
+RUN mkdir -p ${FLUTTER_HOME} && \
+  curl -C - --output flutter.tar.xz https://storage.googleapis.com/flutter_infra_release/releases/${FLUTTER_CHANNEL}/linux/flutter_linux_${FLUTTER_VERSION}-${FLUTTER_CHANNEL}.tar.xz \
+  tar -xf flutter.tar.xz --strip-components=1 -C ${FLUTTER_HOME} && \
+  rm flutter.tar.xz && \
+  chown -R node ${FLUTTER_HOME}

-USER node
-RUN sudo apt-get update \
-  && wget -qO- https://dcm.dev/pgp-key.public | sudo gpg --dearmor -o /usr/share/keyrings/dcm.gpg \
-  && echo 'deb [signed-by=/usr/share/keyrings/dcm.gpg arch=amd64] https://dcm.dev/debian stable main' | sudo tee /etc/apt/sources.list.d/dart_stable.list \
-  && sudo apt-get update \
-  && sudo apt-get install dcm -y
+RUN wget -qO- https://dcm.dev/pgp-key.public | sudo gpg --dearmor -o /usr/share/keyrings/dcm.gpg && \
+  echo 'deb [signed-by=/usr/share/keyrings/dcm.gpg arch=amd64] https://dcm.dev/debian stable main' | sudo tee /etc/apt/sources.list.d/dart_stable.list && \
+  apt-get update && \
+  apt-get install dcm -y

 COPY --chmod=777 ../.devcontainer/mobile/container-mobile-post-create.sh /immich-devcontainer/container-mobile-post-create.sh

 RUN dart --disable-analytics

+# server production build
 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
-
-# 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 --chown=node:node i18n ./i18n
+COPY --chown=node:node server ./server
+COPY --chown=node:node open-api ./open-api
+COPY --chown=node:node cli ./cli
+COPY --chown=node:node web ./web

+RUN cd /usr/src/app/open-api/typescript-sdk && \
+  npm ci && \
+  npm run build && \
+  cd /usr/src/app/cli && \
+  npm ci && \
+  npm run build && \
+  cd /usr/src/app/web && \
+  npm ci && \
+  npm run build && \
+  cd /usr/src/app/server && \
+  npm ci && \
+  npm run build

 # prod build
 FROM ghcr.io/immich-app/base-server-prod:202505061115@sha256:9971d3a089787f0bd01f4682141d3665bcf5efb3e101a88e394ffd25bee4eedb

 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 ./
-COPY "docker/scripts/get-cpus.sh" ./
-RUN npm install -g @immich/cli && npm cache clean --force
+  NVIDIA_DRIVER_CAPABILITIES=all \
+  NVIDIA_VISIBLE_DEVICES=all
+
+RUN mkdir -p /usr/src/app/upload && \
+  chown -R node:node /usr/src/app && \
+  chmod 755 /usr/src/app
+
+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=prod /usr/src/app/cli/dist ./cli
+COPY --from=prod /usr/src/app/web/build /build/www
+COPY docker/scripts/get-cpus.sh \
+  ./server/start.sh \
+  ./server/package.json \
+  ./
 COPY LICENSE /licenses/LICENSE.txt
 COPY LICENSE /LICENSE
+
+RUN echo '#!/usr/bin/env node' > /usr/src/app/bin/immich && \
+  echo 'require("../cli/index.js");' >> /usr/src/app/bin/immich && \
+  chmod +x /usr/src/app/bin/immich
+
 ENV PATH="${PATH}:/usr/src/app/bin"

 ARG BUILD_ID
--- 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 -- "$@"
--- a/web/Dockerfile
+++ b/web/Dockerfile
@ -1,11 +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 ./
-RUN npm ci
+COPY --chown=node:node web ./web/
+COPY --chown=node:node open-api ./open-api/
+COPY --chown=node:node Makefile ./
+
 ENV CHOKIDAR_USEPOLLING=true
+
 EXPOSE 24678
 EXPOSE 3000
+
 ENTRYPOINT ["/sbin/tini", "--", "/bin/sh"]
--- 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/}"