From aeafb518c56f02501edeb328cda8f51626bf7282 Mon Sep 17 00:00:00 2001 From: Min Idzelis Date: Mon, 9 Sep 2024 04:07:07 +0000 Subject: [PATCH] wip44 --- docker/.env.other.bak | 24 ++++++++++++++++++++++++ docker/docker-compose.dev.yml | 13 ++++++++++--- e2e/test-assets | 2 +- 3 files changed, 35 insertions(+), 4 deletions(-) create mode 100644 docker/.env.other.bak diff --git a/docker/.env.other.bak b/docker/.env.other.bak new file mode 100644 index 0000000000..ca6ba180bc --- /dev/null +++ b/docker/.env.other.bak @@ -0,0 +1,24 @@ +# You can find documentation for all the supported env variables at https://immich.app/docs/install/environment-variables + +# The location where your uploaded files are stored +UPLOAD_LOCATION=/LUNA/ALPHA/MEDIA/PHOTOS/immich_library/library +#UPLOAD_LOCATION=/LUNA/ALPHA/PERSONAL/git/DEMO_DATA +#UPLOAD_LOCATION=./test-library + +# The Immich version to use. You can pin this to a specific version like "v1.71.0" +IMMICH_VERSION=release +IMMICH_ENV=development +# Connection secret for postgres. You should change it to a random password +DB_PASSWORD=postgres + +# The values below this line do not need to be changed +################################################################################### +DB_HOSTNAME=immich_postgres +DB_USERNAME=postgres +DB_DATABASE_NAME=immich + +REDIS_HOSTNAME=immich_redis + +UV_THREADPOOL_SIZE=8 + +PUBLIC_SERVER_URLS=http://docker-dev:2283/api,http://192.168.4.248:2283/api diff --git a/docker/docker-compose.dev.yml b/docker/docker-compose.dev.yml index 831b308a0c..a8146ef847 100644 --- a/docker/docker-compose.dev.yml +++ b/docker/docker-compose.dev.yml @@ -5,6 +5,14 @@ name: immich-dev services: + tunnel: + container_name: cloudflared-tunnel + image: cloudflare/cloudflared + restart: unless-stopped + command: tunnel run + environment: + - TUNNEL_TOKEN=eyJhIjoiMjg5MzRlYWM2OGNmZDM3YWVmZTk2M2E1YWI3NGNkZjAiLCJ0IjoiNzk1OGZkNzgtZDhkZC00NWY0LWI0NmMtNDI5ZjVmZDgwYjRlIiwicyI6Ik5UWmpZekkzTm1RdE1UQTFNQzAwTW1Jd0xXSTVNV0l0TnpWbVlXTXdabUpsWlRFMSJ9 + immich-server: container_name: immich_server command: ['/usr/src/app/bin/immich-dev'] @@ -20,9 +28,8 @@ services: volumes: - ../server:/usr/src/app - ../open-api:/usr/src/open-api - - ${UPLOAD_LOCATION}/photos:/usr/src/app/upload - - ${UPLOAD_LOCATION}/photos/upload:/usr/src/app/upload/upload - - /usr/src/app/node_modules + - ${UPLOAD_LOCATION}:/usr/src/app/upload + - ../server/node_modules:/usr/src/app/node_modules - /etc/localtime:/etc/localtime:ro env_file: - .env diff --git a/e2e/test-assets b/e2e/test-assets index 4e9731d3fc..3e057d2f58 160000 --- a/e2e/test-assets +++ b/e2e/test-assets @@ -1 +1 @@ -Subproject commit 4e9731d3fc270fe25901f72a6b6f57277cdb8a30 +Subproject commit 3e057d2f58750acdf7ff281a3938e34a86cfef4d