Cutlery/immich
1
0
Fork 1
mirror of https://github.com/immich-app/immich.git synced 2025-07-09 03:04:16 -04:00
Code Issues Packages Projects Releases Wiki Activity

Be more basic

Browse Source
This commit is contained in:
Min Idzelis 2025-07-03 00:46:03 +00:00
parent d1b73b4223
commit 45ace91abd
8 changed files with 88 additions and 98 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Makefile
View File

@ -89,7 +89,7 @@ test-medium-dev:
docker exec -it immich_server /bin/sh -c "npm run test:medium" docker exec -it immich_server /bin/sh -c "npm run test:medium"
build-all: $(foreach M,$(filter-out e2e .github,$(MODULES)),build-$M) ; build-all: $(foreach M,$(filter-out e2e .github,$(MODULES)),build-$M) ;
install-all: $(foreach M,$(MODULES),install-$M) ; install-all: $(foreach M,$(MODULES),install-$M) ;
ci-all: $(foreach M,$(filter-out .github,$(MODULES)),ci-$M) ; ci-all: $(foreach M,$(filter-out .github,$(MODULES)),ci-$M) ;
check-all: $(foreach M,$(filter-out sdk cli docs .github,$(MODULES)),check-$M) ; check-all: $(foreach M,$(filter-out sdk cli docs .github,$(MODULES)),check-$M) ;
lint-all: $(foreach M,$(filter-out sdk docs .github,$(MODULES)),lint-$M) ; lint-all: $(foreach M,$(filter-out sdk docs .github,$(MODULES)),lint-$M) ;
@ -106,5 +106,4 @@ clean:
command -v docker >/dev/null 2>&1 && docker compose -f ./docker/docker-compose.dev.yml rm -v -f || true command -v docker >/dev/null 2>&1 && docker compose -f ./docker/docker-compose.dev.yml rm -v -f || true
command -v docker >/dev/null 2>&1 && docker compose -f ./e2e/docker-compose.yml rm -v -f || true command -v docker >/dev/null 2>&1 && docker compose -f ./e2e/docker-compose.yml rm -v -f || true
setup-dev: install-server setup-dev setup-dev: install-server install-sdk build-sdk install-web
setup-web: install-sdk build-sdk install-web

22
cli/Dockerfile
View File

@ -1,19 +1,19 @@
FROM node:22.16.0-alpine3.20@sha256:2289fb1fba0f4633b08ec47b94a89c7e20b829fc5679f9b7b298eaa2f1ed8b7e AS core FROM node:22.16.0-alpine3.20@sha256:2289fb1fba0f4633b08ec47b94a89c7e20b829fc5679f9b7b298eaa2f1ed8b7e AS core
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 WORKDIR /usr/src/app
COPY --chown=node:node open-api ./open-api COPY cli/package.json cli/package-lock.json ./
COPY --chown=node:node cli ./cli RUN npm ci
RUN cd /usr/src/app/open-api/typescript-sdk && \ COPY cli .
npm ci && \ RUN npm run build
npm run build && \
cd /usr/src/app/cli && \
npm ci && \
npm run build && \
npm prune --omit dev --omit optional && \
rm -rf src eslint* package-lock* tsconfig* vite*
WORKDIR /import WORKDIR /import
ENTRYPOINT ["node", "/usr/src/app/cli/dist"] ENTRYPOINT ["node", "/usr/src/app/dist"]

2
cli/package-lock.json generated
View File

@ -16,7 +16,7 @@
"micromatch": "^4.0.8" "micromatch": "^4.0.8"
}, },
"bin": { "bin": {
"immich": "dist/index.js" "immich": "bin/immich"
}, },
"devDependencies": { "devDependencies": {
"@eslint/eslintrc": "^3.1.0", "@eslint/eslintrc": "^3.1.0",

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

@ -27,7 +27,8 @@ services:
target: dev target: dev
restart: unless-stopped restart: unless-stopped
volumes: volumes:
- ..:/usr/src/app - ../server:/usr/src/app/server
- ../open-api:/usr/src/app/open-api
- ${UPLOAD_LOCATION}/photos:/usr/src/app/server/upload - ${UPLOAD_LOCATION}/photos:/usr/src/app/server/upload
- ${UPLOAD_LOCATION}/photos/upload:/usr/src/app/server/upload/upload - ${UPLOAD_LOCATION}/photos/upload:/usr/src/app/server/upload/upload
- /usr/src/app/server/node_modules - /usr/src/app/server/node_modules
@ -77,9 +78,11 @@ services:
- 3000:3000 - 3000:3000
- 24678:24678 - 24678:24678
volumes: volumes:
- ..:/usr/src/app - ../web:/usr/src/app/web
- ../i18n:/usr/src/app/i18n
- ../open-api/:/usr/src/app/open-api/
# - ../../ui:/usr/ui # - ../../ui:/usr/ui
- /usr/src/app/node_modules - /usr/src/app/web/node_modules
ulimits: ulimits:
nofile: nofile:
soft: 1048576 soft: 1048576

2
e2e/package-lock.json generated
View File

@ -56,7 +56,7 @@
"micromatch": "^4.0.8" "micromatch": "^4.0.8"
}, },
"bin": { "bin": {
"immich": "dist/index.js" "immich": "bin/immich"
}, },
"devDependencies": { "devDependencies": {
"@eslint/eslintrc": "^3.1.0", "@eslint/eslintrc": "^3.1.0",

135
server/Dockerfile
View File

@ -1,55 +1,50 @@
# dev build # dev build
FROM ghcr.io/immich-app/base-server-dev:202505131114@sha256:cf4507bbbf307e9b6d8ee9418993321f2b85867da8ce14d0a20ccaf9574cb995 AS dev FROM ghcr.io/immich-app/base-server-dev:202505131114@sha256:cf4507bbbf307e9b6d8ee9418993321f2b85867da8ce14d0a20ccaf9574cb995 AS dev
RUN apt-get install --no-install-recommends -yqq tini && \
rm -rf /usr/src/app && \
mkdir -p /usr/src/app
WORKDIR /usr/src/app
COPY ./server/package* ./server/
WORKDIR /usr/src/app/server
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
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 \
NVIDIA_VISIBLE_DEVICES=all \ NVIDIA_VISIBLE_DEVICES=all
npm_config_devdir=/buildcache/node_gyp
RUN apt-get install --no-install-recommends -yqq tini && \
mkdir -p /buildcache/pnpm_store && \
chown -R node:node /buildcache && \
rm -rf /usr/src/app && \
mkdir -p /usr/src/app && \
chown node:node /usr/src/app
WORKDIR /usr/src/app
ENTRYPOINT ["tini", "--", "/bin/sh"] ENTRYPOINT ["tini", "--", "/bin/sh"]
FROM dev AS dev-container-server FROM dev AS dev-container-server
RUN rm -rf /usr/src/app && \ RUN rm -rf /usr/src/app
apt-get update && \ RUN apt-get update && \
apt-get install sudo inetutils-ping openjdk-11-jre-headless \ apt-get install sudo inetutils-ping openjdk-11-jre-headless \
vim nano -y --no-install-recommends --fix-missing && \ vim nano \
rm -rf /var/lib/apt/lists/* && \ -y --no-install-recommends --fix-missing
usermod -aG sudo node && \
echo "node ALL=(ALL) NOPASSWD: ALL" >> /etc/sudoers 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/
USER node USER node
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/
COPY --chown=node:node .. /tmp/create-dep-cache/ COPY --chown=node:node .. /tmp/create-dep-cache/
WORKDIR /tmp/create-dep-cache WORKDIR /tmp/create-dep-cache
RUN make ci-all && rm -rf /tmp/create-dep-cache RUN make ci-all && rm -rf /tmp/create-dep-cache
WORKDIR /workspaces/immich
FROM dev-container-server AS dev-container-mobile FROM dev-container-server AS dev-container-mobile
USER root
# Enable multiarch for arm64 if necessary # Enable multiarch for arm64 if necessary
RUN if [ "$(dpkg --print-architecture)" = "arm64" ]; then \ RUN if [ "$(dpkg --print-architecture)" = "arm64" ]; then \
sudo dpkg --add-architecture amd64 && \ dpkg --add-architecture amd64 && \
sudo apt-get install -y --no-install-recommends \ apt-get update && \
apt-get install -y --no-install-recommends \
qemu-user-static \ qemu-user-static \
libc6:amd64 \ libc6:amd64 \
libstdc++6:amd64 \ libstdc++6:amd64 \
@ -64,42 +59,44 @@ ENV FLUTTER_HOME=/flutter
ENV PATH=${PATH}:${FLUTTER_HOME}/bin ENV PATH=${PATH}:${FLUTTER_HOME}/bin
# Flutter SDK # Flutter SDK
RUN mkdir -p ${FLUTTER_HOME} && \ 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 \ && 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} && \ && tar -xf flutter.tar.xz --strip-components=1 -C ${FLUTTER_HOME} \
rm flutter.tar.xz && \ && rm flutter.tar.xz \
chown -R node ${FLUTTER_HOME} && chown -R node ${FLUTTER_HOME}
RUN wget -qO- https://dcm.dev/pgp-key.public | sudo gpg --dearmor -o /usr/share/keyrings/dcm.gpg && \ USER node
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 && \ RUN sudo apt-get update \
apt-get update && \ && wget -qO- https://dcm.dev/pgp-key.public | sudo gpg --dearmor -o /usr/share/keyrings/dcm.gpg \
apt-get install dcm -y && 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
COPY --chmod=777 ../.devcontainer/mobile/container-mobile-post-create.sh /immich-devcontainer/container-mobile-post-create.sh COPY --chmod=777 ../.devcontainer/mobile/container-mobile-post-create.sh /immich-devcontainer/container-mobile-post-create.sh
RUN dart --disable-analytics RUN dart --disable-analytics
# server production build
FROM dev AS prod FROM dev AS prod
COPY --chown=node:node i18n ./i18n COPY server .
COPY --chown=node:node server ./server RUN npm run build
COPY --chown=node:node open-api ./open-api RUN npm prune --omit=dev --omit=optional
COPY --chown=node:node cli ./cli COPY --from=dev /usr/src/app/server/node_modules/@img ./node_modules/@img
COPY --chown=node:node web ./web COPY --from=dev /usr/src/app/server/node_modules/exiftool-vendored.pl ./node_modules/exiftool-vendored.pl
RUN cd /usr/src/app/open-api/typescript-sdk && \ # web build
npm ci && \ FROM node:22.16.0-alpine3.20@sha256:2289fb1fba0f4633b08ec47b94a89c7e20b829fc5679f9b7b298eaa2f1ed8b7e AS web
npm run build && \
cd /usr/src/app/cli && \ WORKDIR /usr/src/app
npm ci && \ COPY ./web ./web/
npm run build && \ COPY ./i18n ./i18n/
cd /usr/src/app/web && \ COPY ./open-api/typescript-sdk ./open-api/typescript-sdk/
npm ci && \
npm run build && \ WORKDIR /usr/src/app/open-api/typescript-sdk
cd /usr/src/app/server && \ RUN npm ci && npm run build
npm ci && \
npm run build WORKDIR /usr/src/app/web
RUN npm ci && npm run build
# prod build # prod build
FROM ghcr.io/immich-app/base-server-prod:202505061115@sha256:9971d3a089787f0bd01f4682141d3665bcf5efb3e101a88e394ffd25bee4eedb FROM ghcr.io/immich-app/base-server-prod:202505061115@sha256:9971d3a089787f0bd01f4682141d3665bcf5efb3e101a88e394ffd25bee4eedb
@ -108,27 +105,17 @@ WORKDIR /usr/src/app
ENV NODE_ENV=production \ ENV NODE_ENV=production \
NVIDIA_DRIVER_CAPABILITIES=all \ NVIDIA_DRIVER_CAPABILITIES=all \
NVIDIA_VISIBLE_DEVICES=all NVIDIA_VISIBLE_DEVICES=all
RUN mkdir -p /usr/src/app/upload && \
chown -R node:node /usr/src/app && \
chmod 755 /usr/src/app
COPY --from=prod /usr/src/app/server/node_modules ./node_modules COPY --from=prod /usr/src/app/server/node_modules ./node_modules
COPY --from=prod /usr/src/app/server/dist ./dist COPY --from=prod /usr/src/app/server/dist ./dist
COPY --from=prod /usr/src/app/server/bin ./bin COPY --from=prod /usr/src/app/server/bin ./bin
COPY --from=prod /usr/src/app/cli/dist ./cli COPY --from=web /usr/src/app/web/build /build/www
COPY --from=prod /usr/src/app/web/build /build/www COPY ./server/resources resources
COPY docker/scripts/get-cpus.sh \ COPY ./server/package.json server/package-lock.json ./
./server/start.sh \ COPY ./server/start*.sh ./
./server/package.json \ COPY "docker/scripts/get-cpus.sh" ./
./ RUN npm install -g @immich/cli && npm cache clean --force
COPY LICENSE /licenses/LICENSE.txt COPY LICENSE /licenses/LICENSE.txt
COPY LICENSE /LICENSE COPY LICENSE /LICENSE
RUN 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" ENV PATH="${PATH}:/usr/src/app/bin"
ARG BUILD_ID ARG BUILD_ID

9
web/Dockerfile
View File

@ -4,13 +4,14 @@ RUN apk add --no-cache tini make
USER node USER node
WORKDIR /usr/src/app WORKDIR /usr/src/app
COPY --chown=node:node web ./web/ COPY --chown=node:node ./web ./web/
COPY --chown=node:node open-api ./open-api/ COPY --chown=node:node ./open-api ./open-api/
COPY --chown=node:node Makefile ./ COPY --chown=node:node Makefile ./
ENV CHOKIDAR_USEPOLLING=true WORKDIR /usr/src/app/web
RUN npm ci
ENV CHOKIDAR_USEPOLLING=true
EXPOSE 24678 EXPOSE 24678
EXPOSE 3000 EXPOSE 3000
ENTRYPOINT ["/sbin/tini", "--", "/bin/sh"] ENTRYPOINT ["/sbin/tini", "--", "/bin/sh"]

2
web/package-lock.json generated
View File

@ -94,7 +94,7 @@
"@oazapfts/runtime": "^1.0.2" "@oazapfts/runtime": "^1.0.2"
}, },
"devDependencies": { "devDependencies": {
"@types/node": "^22.15.32", "@types/node": "^22.15.33",
"typescript": "^5.3.3" "typescript": "^5.3.3"
} }
}, },