High performance self-hosted photo and video management solution.
TypeScript backup-toolfluttergoogle-photosgoogle-photos-alternativejavascriptmobile-appnestjsnodejsphoto-galleryphotosphotos-managementself-hostedsveltesveltekittypescriptvideos
chore: remove web/Dockerfile (#21096)
Jason Rasmussen66c657ca8aa5
diff --git a/.pnpmfile.cjs b/.pnpmfile.cjsindex ee4cf1e5e2..feda217821 100644--- a/.pnpmfile.cjs+++ b/.pnpmfile.cjs@@ -18,10 +18,10 @@ module.exports = {(dep) => dep.startsWith("@img"));for (const dep of optionalDeps) {- // remove all optionalDepdencies from sharp (they will be compiled from source), except:- // include the precompiled musl version of sharp, for web/Dockerfile- // include precompiled linux-x64 version of sharp, for server/Dockerfile, stage: web-prod- // include precompiled linux-arm64 version of sharp, for server/Dockerfile, stage: web-prod+ // remove all optionalDependencies from sharp (they will be compiled from source), except:+ // include the precompiled musl version of sharp, for web+ // include precompiled linux-x64 version of sharp, for server (stage: web-prod)+ // include precompiled linux-arm64 version of sharp, for server (stage: web-prod)if (dep.includes("musl") ||dep.includes("linux-x64") ||diff --git a/docker/docker-compose.dev.yml b/docker/docker-compose.dev.ymlindex 2ff3664228..c6393fd132 100644--- a/docker/docker-compose.dev.yml+++ b/docker/docker-compose.dev.yml@@ -21,7 +21,7 @@ services:# extends:# file: hwaccel.transcoding.yml# service: cpu # set to one of [nvenc, quicksync, rkmpp, vaapi, vaapi-wsl] for accelerated transcoding- user: "${UID:-1000}:${GID:-1000}"+ user: '${UID:-1000}:${GID:-1000}'build:context: ../dockerfile: server/Dockerfile@@ -71,10 +71,11 @@ services:image: immich-web-dev:latest# Needed for rootless docker setup, see https://github.com/moby/moby/issues/45919# user: 0:0- user: "${UID:-1000}:${GID:-1000}"+ user: '${UID:-1000}:${GID:-1000}'build:context: ../- dockerfile: web/Dockerfile+ dockerfile: server/Dockerfile+ target: devcommand: ['immich-web']env_file:- .envdiff --git a/pnpm-lock.yaml b/pnpm-lock.yamlindex 3ad08ab2cc..ce91b69119 100644--- a/pnpm-lock.yaml+++ b/pnpm-lock.yaml@@ -11,7 +11,7 @@ overrides:packageExtensionsChecksum: sha256-DAYr0FTkvKYnvBH4muAER9UE1FVGKhqfRU4/QwA2xPQ=-pnpmfileChecksum: sha256-DckzDbpcgpDw/iRFcD5RWuuYjmFiIKMI3NLoa3HZjSk=+pnpmfileChecksum: sha256-7GOLcTtuczNumtarIG1mbRinBOSpiOOVzgbeV3Xp4X4=importers:diff --git a/server/Dockerfile b/server/Dockerfileindex 390dd99a4e..ae3198c5d3 100644--- a/server/Dockerfile+++ b/server/Dockerfile@@ -18,7 +18,7 @@ WORKDIR /tmp/create-dep-cacheRUN pnpm fetch && rm -rf /tmp/create-dep-cache && chmod -R o+rw /buildcacheWORKDIR /usr/src/app-ENV PATH="${PATH}:/usr/src/app/server/bin" \+ENV PATH="${PATH}:/usr/src/app/server/bin:/usr/src/app/web/bin" \IMMICH_ENV=development \NVIDIA_DRIVER_CAPABILITIES=all \NVIDIA_VISIBLE_DEVICES=alldiff --git a/web/Dockerfile b/web/Dockerfiledeleted file mode 100644index 3f9ab0c5b6..0000000000--- a/web/Dockerfile+++ /dev/null@@ -1,17 +0,0 @@-FROM node:22.16.0-alpine3.20@sha256:2289fb1fba0f4633b08ec47b94a89c7e20b829fc5679f9b7b298eaa2f1ed8b7e--ENV CHOKIDAR_USEPOLLING=true \- PATH="${PATH}:/usr/src/app/web/bin" \- COREPACK_HOME=/tmp--RUN npm install --global corepack@latest && \- corepack enable && corepack install -g pnpm && \- apk add --no-cache tini make bash && \- mkdir -p /buildcache/pnpm-store && \- pnpm config set store-dir /buildcache/pnpm-store--WORKDIR /usr/src/app/web--EXPOSE 24678-EXPOSE 3000-ENTRYPOINT ["tini", "--", "/bin/bash", "-c"]