Remaining

2025-07-02 01:58:36 +00:00
parent 83afd49f5c
commit 6fffe41f0b
40 changed files with 26718 additions and 62417 deletions
--- a/server/Dockerfile
+++ b/server/Dockerfile
@@ -4,30 +4,75 @@ FROM ghcr.io/immich-app/base-server-dev:202505131114@sha256:cf4507bbbf307e9b6d8e
 RUN apt-get install --no-install-recommends -yqq tini
 WORKDIR /usr/src/app
 COPY server/package.json server/package-lock.json ./
+COPY server/patches ./patches
 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 \
+  COREPACK_ENABLE_AUTO_PIN=0 \
+  COREPACK_ENABLE_DOWNLOAD_PROMPT=0 \
+  npm_config_devdir=/buildcache/node_gyp
+
+RUN corepack enable && \
+  corepack install -g pnpm && \
+  apt-get install --no-install-recommends -yqq tini
+
+RUN mkdir -p /buildcache/pnpm_store && \
+  chown -R node:node /buildcache && \
+  mkdir -p /usr/local/etc && \
+  echo "store-dir=/buildcache/pnpm_store" >> /usr/local/etc/npmrc
+
+RUN rm -rf /usr/src/app && \
+  mkdir -p /usr/src/app && \
+  chown node:node /usr/src/app
+
+USER node
+
+WORKDIR /usr/src/app
+COPY --chown=node:node . .
+RUN --mount=type=cache,id=pnpm,target=/buildcache,uid=1000,gid=1000 \
+  pnpm fetch
+
 ENTRYPOINT ["tini", "--", "/bin/sh"]

+FROM dev AS dev-docker
+
+WORKDIR /usr/src/app
+VOLUME /usr/src/app/node_modules
+
+RUN pnpm fetch && make setup-dev
+
+
 FROM dev AS dev-container-server

+USER root
+RUN pnpm fetch
+# Remove app dir from dev container
 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 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 && \
+  echo "node ALL=(ALL) NOPASSWD: ALL" >> /etc/sudoers
+
+
+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/
+
+WORKDIR /workspaces/immich

 USER node
 COPY --chown=node:node .. /tmp/create-dep-cache/
@@ -36,17 +81,16 @@ RUN make ci-all && rm -rf /tmp/create-dep-cache


 FROM dev-container-server AS dev-container-mobile
-USER root
+# 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,15 +100,13 @@ 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 sudo mkdir -p ${FLUTTER_HOME} \
+  && sudo 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 \
+  && sudo tar -xf flutter.tar.xz --strip-components=1 -C ${FLUTTER_HOME} \
+  && sudo rm flutter.tar.xz \
+  && sudo 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 \
+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 \
  && sudo apt-get update \
  && sudo apt-get install dcm -y
@@ -73,49 +115,89 @@ COPY --chmod=777 ../.devcontainer/mobile/container-mobile-post-create.sh /immich

 RUN dart --disable-analytics

-FROM dev AS prod
+# server production build
+FROM dev AS server-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
+WORKDIR /usr/src/app/server
+RUN --mount=type=cache,id=pnpm,target=/buildcache,uid=1000,gid=1000 \
+  pnpm install --frozen-lockfile && \
+  pnpm build

-# web build
-FROM node:22.16.0-alpine3.20@sha256:2289fb1fba0f4633b08ec47b94a89c7e20b829fc5679f9b7b298eaa2f1ed8b7e AS web
+FROM dev AS sdk-prod

-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/open-api/typescript-sdk
+RUN --mount=type=cache,id=pnpm,target=/buildcache,uid=1000,gid=1000 \
+  pnpm install --frozen-lockfile && \
+  pnpm 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
+# web production build
+FROM dev AS web-prod

+COPY --from=sdk-prod /usr/src/app/open-api/typescript-sdk /usr/src/app/open-api/typescript-sdk
+RUN rm -rf /usr/src/app/open-api/typescript-sdk/node_modules
+WORKDIR /usr/src/app/web
+# USER root
+RUN --mount=type=cache,id=pnpm,target=/buildcache,uid=1000,gid=1000 \
+  pnpm install --frozen-lockfile && \
+  pnpm rebuild && pnpm build
+
+FROM dev AS cli-prod
+
+WORKDIR /usr/src/app/web
+RUN --mount=type=cache,id=pnpm,target=/buildcache,uid=1000,gid=1000 \
+  pnpm install --frozen-lockfile && \
+  pnpm exec svelte-kit sync
+WORKDIR /usr/src/app/open-api/typescript-sdk
+RUN --mount=type=cache,id=pnpm,target=/buildcache,uid=1000,gid=1000 \
+  pnpm install --frozen-lockfile && \
+  pnpm build
+WORKDIR /usr/src/app/cli
+RUN --mount=type=cache,id=pnpm,target=/buildcache,uid=1000,gid=1000 \
+  pnpm install --frozen-lockfile && \
+  pnpm build

 # prod build
-FROM ghcr.io/immich-app/base-server-prod:202505061115@sha256:9971d3a089787f0bd01f4682141d3665bcf5efb3e101a88e394ffd25bee4eedb
+FROM ghcr.io/midzelis/base-images/base-server-prod:latest
+
+RUN corepack enable && \
+  corepack install -g pnpm

 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 \
+  npm_config_devdir=/buildcache/node_gyp \
+  COREPACK_ENABLE_DOWNLOAD_PROMPT=0
+
+RUN mkdir -p /buildcache/pnpm_store && \
+  chown -R node:node /buildcache && \
+  mkdir -p /usr/local/etc && \
+  echo "store-dir=/buildcache/pnpm_store" >> /usr/local/etc/npmrc && \
+  mkdir -p /usr/src/app/upload && \
+  chown -R node:node /usr/src/app && \
+  chmod 755 /usr/src/app
+
+COPY --chown=node:node --from=server-prod /usr/src/app/server/dist ./dist
+COPY --chown=node:node --from=server-prod /usr/src/app/server/bin ./bin
+COPY --chown=node:node --from=server-prod /usr/src/app/server/package.json ./
+COPY --chown=node:node --from=web-prod /usr/src/app/node_modules/ ./node_modules
+COPY --chown=node:node --from=web-prod /usr/src/app/web/build /build/www
+COPY --chown=node:node --from=cli-prod /usr/src/app/cli/dist ./cli
+COPY --chown=node:node server/resources ./resources/
+COPY --chown=node:node server/start*.sh \
+  docker/scripts/get-cpus.sh \
+  pnpm-workspace.yaml \
+  pnpm-lock.yaml ./
 COPY LICENSE /licenses/LICENSE.txt
 COPY LICENSE /LICENSE
+
+USER node
+RUN --mount=type=cache,id=pnpm,target=/buildcache,uid=1000,gid=1000 \
+  pnpm install --prod --no-optional && \
+  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
@@ -133,6 +215,8 @@ ENV IMMICH_SOURCE_REF=${BUILD_SOURCE_REF}
 ENV IMMICH_SOURCE_COMMIT=${BUILD_SOURCE_COMMIT}
 ENV IMMICH_SOURCE_URL=https://github.com/immich-app/immich/commit/${BUILD_SOURCE_COMMIT}

+USER root
+
 VOLUME /usr/src/app/upload
 EXPOSE 2283
 ENTRYPOINT ["tini", "--", "/bin/bash"]