refactor: update ente photos configuration for improved service management

- Enhanced environment variable configuration for the server and web services, including database and encryption settings.
- Updated health check intervals and retries for better reliability.
- Changed MinIO service configuration to use port 9000 and adjusted health checks accordingly.
- Improved volume management for data persistence.

These changes aim to streamline the deployment process and ensure better service health monitoring.

templates/compose/ente-photos-with-s3.yaml

@@ -10,12 +10,26 @@ services:
     image: ghcr.io/ente-io/server:latest
     environment:
       - SERVICE_URL_MUSEUM_8080
-      # Database configuration
-      - POSTGRES_HOST=postgres
-      - POSTGRES_PORT=5432
-      - POSTGRES_DB=${POSTGRES_DB:-ente_db}
-      - POSTGRES_USER=${SERVICE_USER_POSTGRES}
-      - POSTGRES_PASSWORD=${SERVICE_PASSWORD_POSTGRES}
+      - ENTE_HTTP_USE_TLS=${ENTE_HTTP_USE_TLS:-false}
+
+      - ENTE_APPS_PUBLIC_ALBUMS=${SERVICE_URL_WEB_3002}
+      - ENTE_APPS_CAST=${SERVICE_URL_WEB_3004}
+      - ENTE_APPS_ACCOUNTS=${SERVICE_URL_WEB_3001}
+
+      - ENTE_DB_HOST=${ENTE_DB_HOST:-postgres}
+      - ENTE_DB_PORT=${ENTE_DB_PORT:-5432}
+      - ENTE_DB_NAME=${ENTE_DB_NAME:-ente_db}
+      - ENTE_DB_USER=${SERVICE_USER_POSTGRES:-pguser}
+      - ENTE_DB_PASSWORD=${SERVICE_PASSWORD_POSTGRES}
+
+      - ENTE_KEY_ENCRYPTION=${SERVICE_REALBASE64_ENCRYPTION}
+      - ENTE_KEY_HASH=${SERVICE_REALBASE64_64_HASH}
+
+      - ENTE_JWT_SECRET=${SERVICE_REALBASE64_JWT}
+
+      - ENTE_INTERNAL_ADMIN=${ENTE_INTERNAL_ADMIN:-1580559962386438}
+      - ENTE_INTERNAL_DISABLE_REGISTRATION=${ENTE_INTERNAL_DISABLE_REGISTRATION:-false}
+      
       # S3/MinIO configuration
       - S3_ARE_LOCAL_BUCKETS=true
       - S3_USE_PATH_STYLE_URLS=true
@@ -24,16 +38,6 @@ services:
       - S3_B2_EU_CEN_ENDPOINT=${SERVICE_URL_MINIO_3200}
       - S3_B2_EU_CEN_REGION=eu-central-2
       - S3_B2_EU_CEN_BUCKET=b2-eu-cen
-      # Security keys
-      - ENCRYPTION_KEY=${SERVICE_PASSWORD_64_ENCRYPTION}
-      - HASH_KEY=${SERVICE_PASSWORD_64_HASH}
-      - JWT_SECRET=${SERVICE_PASSWORD_64_JWT}
-      # Admin permissions (grants first account admin access)
-      - ENTE_INTERNAL_ADMIN=1580559962386438
-      # App URLs (optional - for web interface)
-      - APPS_PUBLIC_ALBUMS=${APPS_PUBLIC_ALBUMS:-}
-      - APPS_CAST=${APPS_CAST:-}
-      - APPS_ACCOUNTS=${APPS_ACCOUNTS:-}
     volumes:
       - museum-data:/data
       - museum-config:/config
@@ -43,11 +47,23 @@ services:
       minio:
         condition: service_started
     healthcheck:
-      test: ["CMD", "curl", "-f", "http://127.0.0.1:8080/ping"]
-      interval: 30s
-      timeout: 10s
-      retries: 3
+      test: ["CMD", "wget", "-qO-", "http://127.0.0.1:8080/ping"]
+      interval: 5s
+      timeout: 5s
+      retries: 10
 
+  web:
+    image: ghcr.io/ente-io/web
+    environment:
+      - SERVICE_URL_WEB_3000
+      - ENTE_API_ORIGIN=${SERVICE_URL_MUSEUM}
+      - ENTE_ALBUMS_ORIGIN=${SERVICE_URL_WEB_3002}
+
+    healthcheck:
+      test: ["CMD", "curl", "--fail", "http://127.0.0.1:3000"]
+      interval: 5s
+      timeout: 5s
+      retries: 10
   postgres:
     image: postgres:15-alpine
     environment:
@@ -57,18 +73,18 @@ services:
     volumes:
       - postgres-data:/var/lib/postgresql/data
     healthcheck:
-      test: ["CMD-SHELL", "pg_isready -U ${SERVICE_USER_POSTGRES} -d ${POSTGRES_DB:-ente_db}"]
-      interval: 10s
+      test: ["CMD-SHELL", "pg_isready -U ${POSTGRES_USER} -d ${POSTGRES_DB}"]
+      interval: 5s
       timeout: 5s
-      retries: 5
+      retries: 10
 
   minio:
     image: quay.io/minio/minio:latest
     environment:
-      - SERVICE_URL_MINIO_3200
+      - SERVICE_URL_MINIO_9000
       - MINIO_ROOT_USER=${SERVICE_USER_MINIO}
       - MINIO_ROOT_PASSWORD=${SERVICE_PASSWORD_MINIO}
-    command: server /data --address ":3200" --console-address ":3201"
+    command: server /data --address ":9000" --console-address ":9001"
     volumes:
       - minio-data:/data
     healthcheck:
@@ -79,6 +95,8 @@ services:
 
   minio-init:
     image: minio/mc:latest
+    exclude_from_hc: true
+    restart: no
     depends_on:
       minio:
         condition: service_healthy
@@ -87,7 +105,7 @@ services:
       - MINIO_ROOT_PASSWORD=${SERVICE_PASSWORD_MINIO}
     entrypoint: >
       /bin/sh -c "
-      mc alias set minio http://minio:3200 $${MINIO_ROOT_USER} $${MINIO_ROOT_PASSWORD};
+      mc alias set minio http://minio:9000 $${MINIO_ROOT_USER} $${MINIO_ROOT_PASSWORD};
       mc mb minio/b2-eu-cen --ignore-existing;
       mc mb minio/wasabi-eu-central-2-v3 --ignore-existing;
       mc mb minio/scw-eu-fr-v3 --ignore-existing;

templates/compose/ente-photos.yaml

@@ -43,13 +43,13 @@ services:
       postgres:
         condition: service_healthy
     volumes:
-      - museum-data:/data:rw
+      - museum-data:/data
+      - museum-config:/config
     healthcheck:
-      test: ["CMD", "wget", "-qO-", "http://localhost:8080/ping"]
-      interval: 60s
+      test: ["CMD", "wget", "-qO-", "http://127.0.0.1:8080/ping"]
+      interval: 5s
       timeout: 5s
-      retries: 3
-      start_period: 10s
+      retries: 10
 
   web:
     image: ghcr.io/ente-io/web
@@ -59,11 +59,10 @@ services:
       - ENTE_ALBUMS_ORIGIN=${SERVICE_URL_WEB_3002}
 
     healthcheck:
-      test: ["CMD", "curl", "--fail", "http://localhost:3000"]
-      interval: 30s
-      timeout: 10s
-      retries: 3
-      start_period: 10s
+      test: ["CMD", "curl", "--fail", "http://127.0.0.1:3000"]
+      interval: 5s
+      timeout: 5s
+      retries: 10
 
   postgres:
     image: postgres:15
@@ -75,8 +74,7 @@ services:
       - postgres-data:/var/lib/postgresql/data
     healthcheck:
       test: ["CMD-SHELL", "pg_isready -U ${POSTGRES_USER} -d ${POSTGRES_DB}"]
-      interval: 10s
+      interval: 5s
       timeout: 5s
-      retries: 5
-      start_period: 30s
+      retries: 10