High performance self-hosted photo and video management solution.
TypeScript backup-toolfluttergoogle-photosgoogle-photos-alternativejavascriptmobile-appnestjsnodejsphoto-galleryphotosphotos-managementself-hostedsveltesveltekittypescriptvideos
chore: remove prepare-volumes (#22071)
Jason Rasmussen1d6b98ff868c
diff --git a/Makefile b/Makefileindex 8c5865448d..34fb408c41 100644--- a/Makefile+++ b/Makefile@@ -1,13 +1,13 @@-dev: prepare-volumes+dev:@trap 'make dev-down' EXIT; COMPOSE_BAKE=true docker compose -f ./docker/docker-compose.dev.yml up --remove-orphansdev-down:docker compose -f ./docker/docker-compose.dev.yml down --remove-orphans-dev-update: prepare-volumes+dev-update:@trap 'make dev-down' EXIT; COMPOSE_BAKE=true docker compose -f ./docker/docker-compose.dev.yml up --build -V --remove-orphans-dev-scale: prepare-volumes+dev-scale:@trap 'make dev-down' EXIT; COMPOSE_BAKE=true docker compose -f ./docker/docker-compose.dev.yml up --build -V --scale immich-server=3 --remove-orphansdev-docs:@@ -23,7 +23,7 @@ e2e-update:e2e-down:docker compose -f ./e2e/docker-compose.yml down --remove-orphans-prod:+prod:@trap 'make prod-down' EXIT; COMPOSE_BAKE=true docker compose -f ./docker/docker-compose.prod.yml up --build -V --remove-orphansprod-down:@@ -33,16 +33,16 @@ prod-scale:@trap 'make prod-down' EXIT; COMPOSE_BAKE=true docker compose -f ./docker/docker-compose.prod.yml up --build -V --scale immich-server=3 --scale immich-microservices=3 --remove-orphans.PHONY: open-api-open-api: prepare-volumes+open-api:cd ./open-api && bash ./bin/generate-open-api.sh-open-api-dart: prepare-volumes+open-api-dart:cd ./open-api && bash ./bin/generate-open-api.sh dart-open-api-typescript: prepare-volumes+open-api-typescript:cd ./open-api && bash ./bin/generate-open-api.sh typescript-sql: prepare-volumes+sql:pnpm --filter immich run sync:sqlattach-server:@@ -68,32 +68,6 @@ VOLUME_DIRS = \# Include .env file if it exists-include docker/.env-# Helper function to chown, on error suggest remediation and exit-define safe_chown- CURRENT_OWNER=$$(stat -c '%u:%g' "$(1)" 2>/dev/null || echo "none"); \- DESIRED_OWNER="$(or $(UID),0):$(or $(GID),0)"; \- if [ "$$CURRENT_OWNER" != "$$DESIRED_OWNER" ] && ! chown -v $(2) $$DESIRED_OWNER "$(1)" 2>/dev/null; then \- 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 chown-prepare-volumes:- @$(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)/photos/upload"- @$(call safe_chown,docker/$(UPLOAD_LOCATION),)- @$(call safe_chown,docker/$(UPLOAD_LOCATION)/photos,-R)-else- @mkdir -p "$(UPLOAD_LOCATION)/photos/upload"- @$(call safe_chown,$(UPLOAD_LOCATION),)- @$(call safe_chown,$(UPLOAD_LOCATION)/photos,-R)-endif-endif--MODULES = e2e server web cli sdk docs .github# directory to package name mapping functiondiff --git a/docker/docker-compose.dev.yml b/docker/docker-compose.dev.ymlindex 9e0f2a3f9d..009bd12b68 100644--- a/docker/docker-compose.dev.yml+++ b/docker/docker-compose.dev.yml@@ -72,8 +72,6 @@ services:condition: service_starteddatabase:condition: service_started- init:- condition: service_completed_successfullyhealthcheck:disable: false@@ -114,8 +112,6 @@ services:depends_on:immich-server:condition: service_started- init:- condition: service_completed_successfullyimmich-machine-learning:container_name: immich_machine_learning@@ -183,25 +179,6 @@ services:# volumes:# - grafana-data:/var/lib/grafana- init:- container_name: init- image: busybox@sha256:ab33eacc8251e3807b85bb6dba570e4698c3998eca6f0fc2ccb60575a563ea74- env_file:- - .env- user: 0:0- command: sh -c 'find /data -maxdepth 1 -type d -exec chown ${UID:-0}:${GID:-0} {} + 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:-0}:${GID:-0} "$$path" || true; done'- volumes:- - pnpm-store:/usr/src/app/.pnpm-store- - server-node_modules:/usr/src/app/server/node_modules- - web-node_modules:/usr/src/app/web/node_modules- - github-node_modules:/usr/src/app/.github/node_modules- - cli-node_modules:/usr/src/app/cli/node_modules- - docs-node_modules:/usr/src/app/docs/node_modules- - e2e-node_modules:/usr/src/app/e2e/node_modules- - sdk-node_modules:/usr/src/app/open-api/typescript-sdk/node_modules- - app-node_modules:/usr/src/app/node_modules- - sveltekit:/usr/src/app/web/.svelte-kit- - coverage:/usr/src/app/web/coveragevolumes:model-cache:prometheus-data: