From 99aee03f15f4c3682811f07ebc13349ea9ac213f Mon Sep 17 00:00:00 2001 From: Jason Rasmussen Date: Wed, 27 May 2026 11:23:02 -0400 Subject: [PATCH] chore: install mise in Dockerfile.dev --- docker/docker-compose.dev.yml | 13 ++++--------- e2e/docker-compose.dev.yml | 4 +--- server/Dockerfile.dev | 23 ++++++++++++----------- 3 files changed, 17 insertions(+), 23 deletions(-) diff --git a/docker/docker-compose.dev.yml b/docker/docker-compose.dev.yml index 350e82e767..adcb6b628f 100644 --- a/docker/docker-compose.dev.yml +++ b/docker/docker-compose.dev.yml @@ -21,7 +21,7 @@ services: volumes: - ..:/usr/src/app # - ../../ui:/usr/src/ui - - pnpm_cache:/buildcache/pnpm_cache + - build_cache:/buildcache - server_node_modules:/usr/src/app/server/node_modules - web_node_modules:/usr/src/app/web/node_modules - github_node_modules:/usr/src/app/.github/node_modules @@ -45,11 +45,11 @@ services: target: dev command: - | - pnpm install + mise install touch /tmp/init-complete exec tail -f /dev/null volumes: - - pnpm_store_server:/buildcache/pnpm-store + - build_cache:/buildcache restart: 'no' healthcheck: test: ['CMD', 'test', '-f', '/tmp/init-complete'] @@ -73,7 +73,6 @@ services: volumes: - ${UPLOAD_LOCATION}/photos:/data - /etc/localtime:/etc/localtime:ro - - pnpm_store_server:/buildcache/pnpm-store - ../packages/plugin-core:/build/plugins/immich-plugin-core env_file: - .env @@ -122,8 +121,6 @@ services: ports: - 3000:3000 - 24678:24678 - volumes: - - pnpm_store_web:/buildcache/pnpm-store restart: unless-stopped depends_on: immich-init: @@ -203,9 +200,7 @@ volumes: model_cache: prometheus_data: grafana_data: - pnpm_cache: - pnpm_store_server: - pnpm_store_web: + build_cache: server_node_modules: web_node_modules: github_node_modules: diff --git a/e2e/docker-compose.dev.yml b/e2e/docker-compose.dev.yml index b301ef8441..ac6973a0d6 100644 --- a/e2e/docker-compose.dev.yml +++ b/e2e/docker-compose.dev.yml @@ -83,9 +83,7 @@ volumes: model_cache: prometheus_data: grafana_data: - pnpm_cache: - pnpm_store_server: - pnpm_store_web: + build_cache: server_node_modules: web_node_modules: github_node_modules: diff --git a/server/Dockerfile.dev b/server/Dockerfile.dev index 0b2cc0beec..7979e88dd3 100644 --- a/server/Dockerfile.dev +++ b/server/Dockerfile.dev @@ -1,14 +1,10 @@ # dev build FROM ghcr.io/immich-app/base-server-dev:202605051129@sha256:d07d8fcdb7e9f3ac22a811e87761ebf341ed0bb91956b89097540c2ed3fb9ca3 AS dev -ENV COREPACK_ENABLE_DOWNLOAD_PROMPT=0 \ - CI=1 \ - COREPACK_HOME=/tmp \ - PNPM_HOME=/buildcache/pnpm-store -RUN npm install --global corepack@latest && \ - corepack enable pnpm && \ - echo "devdir=/buildcache/node-gyp" >> /usr/local/etc/npmrc && \ +COPY --from=ghcr.io/jdx/mise:2026.5.11@sha256:2ba959e4827f845fe0c4cfb4814089e790dc513040ef74f9e14925f446412a51 /usr/local/bin/mise /usr/local/bin/mise + +RUN echo "devdir=/buildcache/node-gyp" >> /usr/local/etc/npmrc && \ echo "store-dir=/buildcache/pnpm-store" >> /usr/local/etc/npmrc && \ echo "cache-dir=/buildcache/pnpm-cache" >> /usr/local/etc/npmrc && \ echo "# Retry configuration - default is 2" >> /usr/local/etc/npmrc && \ @@ -16,12 +12,17 @@ RUN npm install --global corepack@latest && \ mkdir -p /buildcache/pnpm-store /buildcache/pnpm-cache /buildcache/node-gyp && \ chmod -R o+rw /buildcache +ENV CI=1 +ENV PNPM_HOME=/buildcache/pnpm-store +ENV MISE_DATA_DIR=/buildcache/mise +ENV MISE_TRUSTED_CONFIG_PATHS=/usr/src/app/mise.toml +ENV PATH="${MISE_DATA_DIR}/shims:${PATH}:/usr/src/app/server/bin:/usr/src/app/web/bin" +ENV IMMICH_ENV=development +ENV NVIDIA_DRIVER_CAPABILITIES=all +ENV NVIDIA_VISIBLE_DEVICES=all + WORKDIR /usr/src/app -ENV PATH="${PATH}:/usr/src/app/server/bin:/usr/src/app/web/bin" \ - IMMICH_ENV=development \ - NVIDIA_DRIVER_CAPABILITIES=all \ - NVIDIA_VISIBLE_DEVICES=all ENTRYPOINT ["tini", "--", "/bin/bash", "-c"] FROM dev AS dev-container-server