Merge remote-tracking branch 'origin/next' into subscription-refunds-cancellation

templates/compose/cloudreve.yaml

@@ -38,7 +38,7 @@ services:
       - POSTGRES_PASSWORD=${SERVICE_PASSWORD_POSTGRES}
       - POSTGRES_DB=${POSTGRES_DB:-cloudreve-db}
     volumes:
-      - postgres-data:/var/lib/postgresql/data
+      - postgres-data:/var/lib/postgresql
     healthcheck:
       test: ["CMD-SHELL", "pg_isready -U $${POSTGRES_USER} -d $${POSTGRES_DB}"]
       interval: 10s

templates/compose/ente-photos.yaml

@@ -16,6 +16,7 @@ services:
       - ENTE_APPS_PUBLIC_ALBUMS=${SERVICE_URL_WEB_3002}
       - ENTE_APPS_CAST=${SERVICE_URL_WEB_3004}
       - ENTE_APPS_ACCOUNTS=${SERVICE_URL_WEB_3001}
+      - ENTE_PHOTOS_ORIGIN=${SERVICE_URL_WEB}
 
       - ENTE_DB_HOST=${ENTE_DB_HOST:-postgres}
       - ENTE_DB_PORT=${ENTE_DB_PORT:-5432}