fix: ente photos

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

@@ -0,0 +1,95 @@
+# documentation: https://help.ente.io/self-hosting/installation/compose
+# slogan: Ente Photos is a fully open source, End to End Encrypted alternative to Google Photos and Apple Photos.
+# category: media
+# tags: photos,gallery,backup,encryption,privacy,self-hosted,google-photos,alternative
+# logo: svgs/ente-photos.svg
+# port: 8080
+
+services:
+  museum:
+    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}
+      # S3/MinIO configuration
+      - S3_ARE_LOCAL_BUCKETS=true
+      - S3_USE_PATH_STYLE_URLS=true
+      - S3_B2_EU_CEN_KEY=${SERVICE_USER_MINIO}
+      - S3_B2_EU_CEN_SECRET=${SERVICE_PASSWORD_MINIO}
+      - 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
+    depends_on:
+      postgres:
+        condition: service_healthy
+      minio:
+        condition: service_started
+    healthcheck:
+      test: ["CMD", "curl", "-f", "http://127.0.0.1:8080/ping"]
+      interval: 30s
+      timeout: 10s
+      retries: 3
+
+  postgres:
+    image: postgres:15-alpine
+    environment:
+      - POSTGRES_USER=${SERVICE_USER_POSTGRES}
+      - POSTGRES_PASSWORD=${SERVICE_PASSWORD_POSTGRES}
+      - POSTGRES_DB=${POSTGRES_DB:-ente_db}
+    volumes:
+      - postgres-data:/var/lib/postgresql/data
+    healthcheck:
+      test: ["CMD-SHELL", "pg_isready -U ${SERVICE_USER_POSTGRES} -d ${POSTGRES_DB:-ente_db}"]
+      interval: 10s
+      timeout: 5s
+      retries: 5
+
+  minio:
+    image: quay.io/minio/minio:latest
+    environment:
+      - SERVICE_URL_MINIO_3200
+      - MINIO_ROOT_USER=${SERVICE_USER_MINIO}
+      - MINIO_ROOT_PASSWORD=${SERVICE_PASSWORD_MINIO}
+    command: server /data --address ":3200" --console-address ":3201"
+    volumes:
+      - minio-data:/data
+    healthcheck:
+      test: ["CMD", "mc", "ready", "local"]
+      interval: 5s
+      timeout: 20s
+      retries: 10
+
+  minio-init:
+    image: minio/mc:latest
+    depends_on:
+      minio:
+        condition: service_healthy
+    environment:
+      - MINIO_ROOT_USER=${SERVICE_USER_MINIO}
+      - MINIO_ROOT_PASSWORD=${SERVICE_PASSWORD_MINIO}
+    entrypoint: >
+      /bin/sh -c "
+      mc alias set minio http://minio:3200 $${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;
+      echo 'MinIO buckets created successfully';
+      "

templates/compose/ente-photos.yaml

@@ -10,86 +10,73 @@ 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}
-      # S3/MinIO configuration
-      - S3_ARE_LOCAL_BUCKETS=true
-      - S3_USE_PATH_STYLE_URLS=true
-      - S3_B2_EU_CEN_KEY=${SERVICE_USER_MINIO}
-      - S3_B2_EU_CEN_SECRET=${SERVICE_PASSWORD_MINIO}
-      - 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
+
+      - 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}
+
+      - ENTE_S3_B2_EU_CEN_ARE_LOCAL_BUCKETS=${PRIMARY_STORAGE_ARE_LOCAL_BUCKETS:-false}
+      - ENTE_S3_B2_EU_CEN_USE_PATH_STYLE_URLS=${PRIMARY_STORAGE_USE_PATH_STYLE_URLS:-true}
+      - ENTE_S3_B2_EU_CEN_KEY=${S3_STORAGE_KEY:?}
+      - ENTE_S3_B2_EU_CEN_SECRET=${S3_STORAGE_SECRET:?}
+      - ENTE_S3_B2_EU_CEN_ENDPOINT=${S3_STORAGE_ENDPOINT:?}
+      - ENTE_S3_B2_EU_CEN_REGION=${S3_STORAGE_REGION:-us-east-1}
+      - ENTE_S3_B2_EU_CEN_BUCKET=${S3_STORAGE_BUCKET:?}
+
     depends_on:
       postgres:
         condition: service_healthy
-      minio:
-        condition: service_started
+    volumes:
+      - museum-data:/data:rw
     healthcheck:
-      test: ["CMD", "curl", "-f", "http://127.0.0.1:8080/ping"]
+      test: ["CMD", "wget", "-qO-", "http://localhost:8080/ping"]
+      interval: 60s
+      timeout: 5s
+      retries: 3
+      start_period: 10s
+
+  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://localhost:3000"]
       interval: 30s
       timeout: 10s
       retries: 3
+      start_period: 10s
 
   postgres:
-    image: postgres:15-alpine
+    image: postgres:15
     environment:
-      - POSTGRES_USER=${SERVICE_USER_POSTGRES}
+      - POSTGRES_USER=${SERVICE_USER_POSTGRES:-pguser}
       - POSTGRES_PASSWORD=${SERVICE_PASSWORD_POSTGRES}
-      - POSTGRES_DB=${POSTGRES_DB:-ente_db}
+      - POSTGRES_DB=${SERVICE_DB_NAME:-ente_db}
     volumes:
       - postgres-data:/var/lib/postgresql/data
     healthcheck:
-      test: ["CMD-SHELL", "pg_isready -U ${SERVICE_USER_POSTGRES} -d ${POSTGRES_DB:-ente_db}"]
+      test: ["CMD-SHELL", "pg_isready -U ${POSTGRES_USER} -d ${POSTGRES_DB}"]
       interval: 10s
       timeout: 5s
       retries: 5
+      start_period: 30s
 
-  minio:
-    image: quay.io/minio/minio:latest
-    environment:
-      - SERVICE_URL_MINIO_3200
-      - MINIO_ROOT_USER=${SERVICE_USER_MINIO}
-      - MINIO_ROOT_PASSWORD=${SERVICE_PASSWORD_MINIO}
-    command: server /data --address ":3200" --console-address ":3201"
-    volumes:
-      - minio-data:/data
-    healthcheck:
-      test: ["CMD", "mc", "ready", "local"]
-      interval: 5s
-      timeout: 20s
-      retries: 10
-
-  minio-init:
-    image: minio/mc:latest
-    depends_on:
-      minio:
-        condition: service_healthy
-    environment:
-      - MINIO_ROOT_USER=${SERVICE_USER_MINIO}
-      - MINIO_ROOT_PASSWORD=${SERVICE_PASSWORD_MINIO}
-    entrypoint: >
-      /bin/sh -c "
-      mc alias set minio http://minio:3200 $${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;
-      echo 'MinIO buckets created successfully';
-      "

templates/compose/ente.yaml

@@ -1,81 +0,0 @@
-# documentation: https://help.ente.io/
-# slogan: End-to-end encrypted photo backup and sharing platform
-# category: media
-# tags: photos, backup, encryption, sharing, privacy, media, storage, encryption, minio, postgresql
-# logo: svgs/ente.png
-
-services:
-  museum:
-    image: ghcr.io/ente-io/server:latest
-    environment:
-      - SERVICE_URL_MUSEUM_8080
-
-      - 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}
-
-      - ENTE_S3_B2_EU_CEN_ARE_LOCAL_BUCKETS=${PRIMARY_STORAGE_ARE_LOCAL_BUCKETS:-false}
-      - ENTE_S3_B2_EU_CEN_USE_PATH_STYLE_URLS=${PRIMARY_STORAGE_USE_PATH_STYLE_URLS:-true}
-      - ENTE_S3_B2_EU_CEN_KEY=${S3_STORAGE_KEY:?}
-      - ENTE_S3_B2_EU_CEN_SECRET=${S3_STORAGE_SECRET:?}
-      - ENTE_S3_B2_EU_CEN_ENDPOINT=${S3_STORAGE_ENDPOINT:?}
-      - ENTE_S3_B2_EU_CEN_REGION=${S3_STORAGE_REGION:-us-east-1}
-      - ENTE_S3_B2_EU_CEN_BUCKET=${S3_STORAGE_BUCKET:?}
-
-    depends_on:
-      postgres:
-        condition: service_healthy
-    volumes:
-      - museum-data:/data:rw
-    healthcheck:
-      test: ["CMD", "wget", "-qO-", "http://localhost:8080/ping"]
-      interval: 60s
-      timeout: 5s
-      retries: 3
-      start_period: 10s
-
-  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://localhost:3000"]
-      interval: 30s
-      timeout: 10s
-      retries: 3
-      start_period: 10s
-
-  postgres:
-    image: postgres:15
-    environment:
-      - POSTGRES_USER=${SERVICE_USER_POSTGRES:-pguser}
-      - POSTGRES_PASSWORD=${SERVICE_PASSWORD_POSTGRES}
-      - POSTGRES_DB=${SERVICE_DB_NAME:-ente_db}
-    volumes:
-      - postgres-data:/var/lib/postgresql/data
-    healthcheck:
-      test: ["CMD-SHELL", "pg_isready -U ${POSTGRES_USER} -d ${POSTGRES_DB}"]
-      interval: 10s
-      timeout: 5s
-      retries: 5
-      start_period: 30s
-