wip44

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

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

e2e/test-assets

@@ -1 +1 @@
-Subproject commit 4e9731d3fc270fe25901f72a6b6f57277cdb8a30
+Subproject commit 3e057d2f58750acdf7ff281a3938e34a86cfef4d