High performance self-hosted photo and video management solution.
TypeScript backup-toolfluttergoogle-photosgoogle-photos-alternativejavascriptmobile-appnestjsnodejsphoto-galleryphotosphotos-managementself-hostedsveltesveltekittypescriptvideos
fix: fix docker perms for dev (#21359)
Min Idzelis147accd9579b
diff --git a/.devcontainer/server/container-compose-overrides.yml b/.devcontainer/server/container-compose-overrides.ymlindex 539caa0dd1..abf34ad68c 100644--- a/.devcontainer/server/container-compose-overrides.yml+++ b/.devcontainer/server/container-compose-overrides.yml@@ -26,7 +26,7 @@ services:env_file: !reset []init:env_file: !reset []- command: sh -c 'for path in /data /data/upload /usr/src/app/.pnpm-store /usr/src/app/server/node_modules /usr/src/app/server/dist /usr/src/app/.github/node_modules /usr/src/app/cli/node_modules /usr/src/app/docs/node_modules /usr/src/app/e2e/node_modules /usr/src/app/open-api/typescript-sdk/node_modules /usr/src/app/web/.svelte-kit /usr/src/app/web/coverage /usr/src/app/node_modules /usr/src/app/web/node_modules; do [ -e "$$path" ] && chown -R ${UID:-1000}:${GID:-1000} "$$path" || true; done'+ command: sh -c 'find /data -maxdepth 1 ! -path "/data/postgres" -type d -exec chown ${UID:-1000}:${GID:-1000} {} + 2>/dev/null || true; for path in /usr/src/app/.pnpm-store /usr/src/app/server/node_modules /usr/src/app/server/dist /usr/src/app/.github/node_modules /usr/src/app/cli/node_modules /usr/src/app/docs/node_modules /usr/src/app/e2e/node_modules /usr/src/app/open-api/typescript-sdk/node_modules /usr/src/app/web/.svelte-kit /usr/src/app/web/coverage /usr/src/app/node_modules /usr/src/app/web/node_modules; do [ -e "$$path" ] && chown -R ${UID:-1000}:${GID:-1000} "$$path" || true; done'immich-machine-learning:env_file: !reset []database:diff --git a/.github/workflows/test.yml b/.github/workflows/test.ymlindex 39b4b12b1a..e3d2c9b0dc 100644--- a/.github/workflows/test.yml+++ b/.github/workflows/test.yml@@ -569,7 +569,8 @@ jobs:- name: Build the apprun: pnpm --filter immich build- name: Run API generation- run: make open-api+ run: ./bin/generate-open-api.sh+ working-directory: open-api- name: Find file changesuses: tj-actions/verify-changed-files@a1c6acee9df209257a246f2cc6ae8cb6581c1edf # v20.0.4id: verify-changed-filesdiff --git a/Makefile b/Makefileindex 31a00ee6be..13da918683 100644--- a/Makefile+++ b/Makefile@@ -60,20 +60,37 @@ VOLUME_DIRS = \./e2e/node_modules \./docs/node_modules \./server/node_modules \- ./server/dist \./open-api/typescript-sdk/node_modules \./.github/node_modules \./node_modules \./cli/node_modules-# create empty directories and chown to current user+# Include .env file if it exists+-include docker/.env++# Helper function to chown, on error suggest remediation and exit+define safe_chown+ if chown $(2) $(or $(UID),1000):$(or $(GID),1000) "$(1)" 2>/dev/null; then \+ true; \+ else \+ echo "Permission denied when changing owner of volumes and upload location. Try running 'sudo make prepare-volumes' first."; \+ exit 1; \+ fi;+endef+# create empty directories and chownprepare-volumes:- @for dir in $(VOLUME_DIRS); do \- mkdir -p $$dir; \- done- @if [ -n "$(VOLUME_DIRS)" ]; then \- chown -R $$(id -u):$$(id -g) $(VOLUME_DIRS); \- fi+ @$(foreach dir,$(VOLUME_DIRS),mkdir -p $(dir);)+ @$(foreach dir,$(VOLUME_DIRS),$(call safe_chown,$(dir),-R))+ifneq ($(UPLOAD_LOCATION),)+ifeq ($(filter /%,$(UPLOAD_LOCATION)),)+ @mkdir -p "docker/$(UPLOAD_LOCATION)"+ @$(call safe_chown,docker/$(UPLOAD_LOCATION),)+else+ @mkdir -p "$(UPLOAD_LOCATION)"+ @$(call safe_chown,$(UPLOAD_LOCATION),)+endif+endif+MODULES = e2e server web cli sdk docs .github@@ -150,8 +167,9 @@ clean:find . -name ".svelte-kit" -type d -prune -exec rm -rf '{}' +find . -name "coverage" -type d -prune -exec rm -rf '{}' +find . -name ".pnpm-store" -type d -prune -exec rm -rf '{}' +- 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 ./docker/docker-compose.dev.yml down -v --remove-orphans || true+ command -v docker >/dev/null 2>&1 && docker compose -f ./e2e/docker-compose.yml down -v --remove-orphans || true+setup-server-dev: install-serversetup-web-dev: install-sdk build-sdk install-webdiff --git a/docker/docker-compose.dev.yml b/docker/docker-compose.dev.ymlindex 2c003270e4..372352d12a 100644--- a/docker/docker-compose.dev.yml+++ b/docker/docker-compose.dev.yml@@ -189,7 +189,7 @@ services:env_file:- .envuser: 0:0- command: sh -c 'for path in /usr/src/app/.pnpm-store /usr/src/app/server/node_modules /usr/src/app/server/dist /usr/src/app/.github/node_modules /usr/src/app/cli/node_modules /usr/src/app/docs/node_modules /usr/src/app/e2e/node_modules /usr/src/app/open-api/typescript-sdk/node_modules /usr/src/app/web/.svelte-kit /usr/src/app/web/coverage /usr/src/app/node_modules /usr/src/app/web/node_modules; do [ -e "$$path" ] && chown -R ${UID:-1000}:${GID:-1000} "$$path" || true; done'+ command: sh -c 'find /data -maxdepth 1 -type d -exec chown ${UID:-1000}:${GID:-1000} {} + 2>/dev/null || true; for path in /usr/src/app/.pnpm-store /usr/src/app/server/node_modules /usr/src/app/server/dist /usr/src/app/.github/node_modules /usr/src/app/cli/node_modules /usr/src/app/docs/node_modules /usr/src/app/e2e/node_modules /usr/src/app/open-api/typescript-sdk/node_modules /usr/src/app/web/.svelte-kit /usr/src/app/web/coverage /usr/src/app/node_modules /usr/src/app/web/node_modules; do [ -e "$$path" ] && chown -R ${UID:-1000}:${GID:-1000} "$$path" || true; done'volumes:- pnpm-store:/usr/src/app/.pnpm-store- server-node_modules:/usr/src/app/server/node_modulesdiff --git a/misc/release/pump-version.sh b/misc/release/pump-version.shindex 789805255b..35ce9a1f33 100755--- a/misc/release/pump-version.sh+++ b/misc/release/pump-version.sh@@ -65,7 +65,7 @@ if [ "$CURRENT_SERVER" != "$NEXT_SERVER" ]; thenpnpm install --frozen-lockfile --prefix serverpnpm --prefix server run build- make open-api+ ( cd ./open-api && bash ./bin/generate-open-api.sh )jq --arg version "$NEXT_SERVER" '.version = $version' open-api/typescript-sdk/package.json > open-api/typescript-sdk/package.json.tmp && mv open-api/typescript-sdk/package.json.tmp open-api/typescript-sdk/package.json