tbelway/immich
1
0
Fork 0
mirror of https://github.com/immich-app/immich.git synced 2025-05-31 12:16:20 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge 2d6d0433362706914e737cf458198bb7ed535699 into 4d20b11f256c40e3894c229ed638d7ea04ebdc44

Browse Source
This commit is contained in:
Yonathan Randolph 2024-10-01 20:23:24 +02:00 committed by GitHub
commit e1e0ba9680
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -59,6 +59,7 @@ services:
image: immich-web-dev:latest image: immich-web-dev:latest
build: build:
context: ../web context: ../web
target: dev
command: ['/usr/src/app/bin/immich-web'] command: ['/usr/src/app/bin/immich-web']
env_file: env_file:
- .env - .env

2
server/Dockerfile
View File

@ -9,7 +9,6 @@ RUN npm ci && \
# they're marked as optional dependencies, so we need to copy them manually after pruning # 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-libvips* && \
rm -rf node_modules/@img/sharp-linuxmusl-x64 rm -rf node_modules/@img/sharp-linuxmusl-x64
COPY server .
ENV PATH="${PATH}:/usr/src/app/bin" \ ENV PATH="${PATH}:/usr/src/app/bin" \
IMMICH_ENV=development \ IMMICH_ENV=development \
NVIDIA_DRIVER_CAPABILITIES=all \ NVIDIA_DRIVER_CAPABILITIES=all \
@ -19,6 +18,7 @@ ENTRYPOINT ["tini", "--", "/bin/sh"]
FROM dev AS prod FROM dev AS prod
COPY server .
RUN npm run build RUN npm run build
RUN npm prune --omit=dev --omit=optional 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/@img ./node_modules/@img

6
web/Dockerfile
View File

@ -1,12 +1,14 @@
FROM node:20.17.0-alpine3.20@sha256:2d07db07a2df6830718ae2a47db6fedce6745f5bcd174c398f2acdda90a11c03 FROM node:20.17.0-alpine3.20@sha256:2d07db07a2df6830718ae2a47db6fedce6745f5bcd174c398f2acdda90a11c03 AS dev
RUN apk add --no-cache tini RUN apk add --no-cache tini
USER node USER node
WORKDIR /usr/src/app WORKDIR /usr/src/app
COPY --chown=node:node package*.json ./ COPY --chown=node:node package*.json ./
RUN npm ci RUN npm ci
COPY --chown=node:node . .
ENV CHOKIDAR_USEPOLLING=true ENV CHOKIDAR_USEPOLLING=true
EXPOSE 24678 EXPOSE 24678
EXPOSE 3000 EXPOSE 3000
ENTRYPOINT ["/sbin/tini", "--", "/bin/sh"] ENTRYPOINT ["/sbin/tini", "--", "/bin/sh"]
FROM dev
COPY --chown=node:node . .