Skip to content

High performance self-hosted photo and video management solution.

feat: run e2e server in dev mode (#23921)

Min Idzelis58c3c7e26b80
diff --git a/Makefile b/Makefile
index fc99170676..2fc1c5d801 100644
--- a/Makefile
+++ b/Makefile
@@ -17,6 +17,9 @@ dev-docs:
e2e:
@trap 'make e2e-down' EXIT; COMPOSE_BAKE=true docker compose -f ./e2e/docker-compose.yml up --remove-orphans
+e2e-dev:
+ @trap 'make e2e-down' EXIT; COMPOSE_BAKE=true docker compose -f ./e2e/docker-compose.dev.yml up --remove-orphans
+
e2e-update:
@trap 'make e2e-down' EXIT; COMPOSE_BAKE=true docker compose -f ./e2e/docker-compose.yml up --build -V --remove-orphans
diff --git a/e2e/docker-compose.dev.yml b/e2e/docker-compose.dev.yml
new file mode 100644
index 0000000000..cd1d3d4982
--- /dev/null
+++ b/e2e/docker-compose.dev.yml
@@ -0,0 +1,105 @@
+name: immich-e2e
+
+services:
+ immich-server:
+ container_name: immich-e2e-server
+ command: ['immich-dev']
+ image: immich-server-dev:latest
+ build:
+ context: ../
+ dockerfile: server/Dockerfile.dev
+ target: dev
+ environment:
+ - DB_HOSTNAME=database
+ - DB_USERNAME=postgres
+ - DB_PASSWORD=postgres
+ - DB_DATABASE_NAME=immich
+ - IMMICH_MACHINE_LEARNING_ENABLED=false
+ - IMMICH_TELEMETRY_INCLUDE=all
+ - IMMICH_ENV=testing
+ - IMMICH_PORT=2285
+ - IMMICH_IGNORE_MOUNT_CHECK_ERRORS=true
+ volumes:
+ - ./test-assets:/test-assets
+ - ..:/usr/src/app
+ - ${UPLOAD_LOCATION}/photos:/data
+ - /etc/localtime:/etc/localtime:ro
+ - 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/coverage
+ - ../plugins:/build/corePlugin
+ depends_on:
+ redis:
+ condition: service_started
+ database:
+ condition: service_healthy
+
+ immich-web:
+ container_name: immich-e2e-web
+ image: immich-web-dev:latest
+ build:
+ context: ../
+ dockerfile: server/Dockerfile.dev
+ target: dev
+ command: ['immich-web']
+ ports:
+ - 2285:3000
+ environment:
+ - IMMICH_SERVER_URL=http://immich-server:2285/
+ volumes:
+ - ..:/usr/src/app
+ - 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/coverage
+ restart: unless-stopped
+
+ redis:
+ image: redis:6.2-alpine@sha256:37e002448575b32a599109664107e374c8709546905c372a34d64919043b9ceb
+
+ database:
+ image: ghcr.io/immich-app/postgres:14-vectorchord0.3.0@sha256:6f3e9d2c2177af16c2988ff71425d79d89ca630ec2f9c8db03209ab716542338
+ command: -c fsync=off -c shared_preload_libraries=vchord.so -c config_file=/var/lib/postgresql/data/postgresql.conf
+ environment:
+ POSTGRES_PASSWORD: postgres
+ POSTGRES_USER: postgres
+ POSTGRES_DB: immich
+ ports:
+ - 5435:5432
+ healthcheck:
+ test: ['CMD-SHELL', 'pg_isready -U postgres -d immich']
+ interval: 1s
+ timeout: 5s
+ retries: 30
+ start_period: 10s
+
+volumes:
+ model-cache:
+ prometheus-data:
+ grafana-data:
+ pnpm-store:
+ server-node_modules:
+ web-node_modules:
+ github-node_modules:
+ cli-node_modules:
+ docs-node_modules:
+ e2e-node_modules:
+ sdk-node_modules:
+ app-node_modules:
+ sveltekit:
+ coverage:
diff --git a/server/bin/immich-dev b/server/bin/immich-dev
index 28a0443be7..84c5eea8da 100755
--- a/server/bin/immich-dev
+++ b/server/bin/immich-dev
@@ -1,6 +1,6 @@
#!/usr/bin/env bash
-if [ "$IMMICH_ENV" != "development" ]; then
+if [[ "$IMMICH_ENV" == "production" ]]; then
echo "This command can only be run in development environments"
exit 1
fi