Cutlery/immich
1
0
Fork 1
mirror of https://github.com/immich-app/immich.git synced 2025-08-30 23:02:39 -04:00
Code Issues Packages Projects Releases Wiki Activity

chore: remove web/Dockerfile (#21096)

Browse Source
This commit is contained in:
Jason Rasmussen 2025-08-21 12:55:23 -04:00 committed by GitHub
parent c245208106
commit 66c657ca8a
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 10 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
.pnpmfile.cjs
View File

@ -18,10 +18,10 @@ module.exports = {
(dep) => dep.startsWith("@img") (dep) => dep.startsWith("@img")
); );
for (const dep of optionalDeps) { for (const dep of optionalDeps) {
// remove all optionalDepdencies from sharp (they will be compiled from source), except: // remove all optionalDependencies from sharp (they will be compiled from source), except:
// include the precompiled musl version of sharp, for web/Dockerfile // include the precompiled musl version of sharp, for web
// include precompiled linux-x64 version of sharp, for server/Dockerfile, stage: web-prod // include precompiled linux-x64 version of sharp, for server (stage: web-prod)
// include precompiled linux-arm64 version of sharp, for server/Dockerfile, stage: web-prod // include precompiled linux-arm64 version of sharp, for server (stage: web-prod)
if ( if (
dep.includes("musl") || dep.includes("musl") ||
dep.includes("linux-x64") || dep.includes("linux-x64") ||

7
docker/docker-compose.dev.yml
View File

@ -21,7 +21,7 @@ services:
# extends: # extends:
# file: hwaccel.transcoding.yml # file: hwaccel.transcoding.yml
# service: cpu # set to one of [nvenc, quicksync, rkmpp, vaapi, vaapi-wsl] for accelerated transcoding # 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: build:
context: ../ context: ../
dockerfile: server/Dockerfile dockerfile: server/Dockerfile
@ -71,10 +71,11 @@ services:
image: immich-web-dev:latest image: immich-web-dev:latest
# Needed for rootless docker setup, see https://github.com/moby/moby/issues/45919 # Needed for rootless docker setup, see https://github.com/moby/moby/issues/45919
# user: 0:0 # user: 0:0
user: "${UID:-1000}:${GID:-1000}" user: '${UID:-1000}:${GID:-1000}'
build: build:
context: ../ context: ../
dockerfile: web/Dockerfile dockerfile: server/Dockerfile
target: dev
command: ['immich-web'] command: ['immich-web']
env_file: env_file:
- .env - .env

2
pnpm-lock.yaml generated
View File

@ -11,7 +11,7 @@ overrides:
packageExtensionsChecksum: sha256-DAYr0FTkvKYnvBH4muAER9UE1FVGKhqfRU4/QwA2xPQ= packageExtensionsChecksum: sha256-DAYr0FTkvKYnvBH4muAER9UE1FVGKhqfRU4/QwA2xPQ=
pnpmfileChecksum: sha256-DckzDbpcgpDw/iRFcD5RWuuYjmFiIKMI3NLoa3HZjSk= pnpmfileChecksum: sha256-7GOLcTtuczNumtarIG1mbRinBOSpiOOVzgbeV3Xp4X4=
importers: importers:

2
server/Dockerfile
View File

@ -18,7 +18,7 @@ WORKDIR /tmp/create-dep-cache
RUN pnpm fetch && rm -rf /tmp/create-dep-cache && chmod -R o+rw /buildcache RUN pnpm fetch && rm -rf /tmp/create-dep-cache && chmod -R o+rw /buildcache
WORKDIR /usr/src/app WORKDIR /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 \ IMMICH_ENV=development \
NVIDIA_DRIVER_CAPABILITIES=all \ NVIDIA_DRIVER_CAPABILITIES=all \
NVIDIA_VISIBLE_DEVICES=all NVIDIA_VISIBLE_DEVICES=all

17
web/Dockerfile
View File

@ -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"]