Merge pull request #6883 from ariqpradipa/feat/templates/ente-photos

feat(templates): add SMTP configuration to ente-photos compose templates
This commit is contained in:
Andras Bacsai 2025-10-17 10:58:27 +02:00 committed by GitHub
commit ab7bd46e56
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 16 additions and 6 deletions

View file

@ -28,6 +28,13 @@ services:
- 'ENTE_JWT_SECRET=${SERVICE_REALBASE64_JWT}' - 'ENTE_JWT_SECRET=${SERVICE_REALBASE64_JWT}'
- 'ENTE_INTERNAL_ADMIN=${ENTE_INTERNAL_ADMIN:-1580559962386438}' - 'ENTE_INTERNAL_ADMIN=${ENTE_INTERNAL_ADMIN:-1580559962386438}'
- 'ENTE_INTERNAL_DISABLE_REGISTRATION=${ENTE_INTERNAL_DISABLE_REGISTRATION:-false}' - 'ENTE_INTERNAL_DISABLE_REGISTRATION=${ENTE_INTERNAL_DISABLE_REGISTRATION:-false}'
- 'ENTE_SMTP_HOST=${ENTE_SMTP_HOST:-smtp.gmail.com}'
- 'ENTE_SMTP_PORT=${ENTE_SMTP_PORT:-587}'
- 'ENTE_SMTP_USERNAME=${ENTE_SMTP_USERNAME}'
- 'ENTE_SMTP_PASSWORD=${ENTE_SMTP_PASSWORD}'
- 'ENTE_SMTP_EMAIL=${ENTE_SMTP_EMAIL}'
- 'ENTE_SMTP_SENDER_NAME=${ENTE_SMTP_SENDER_NAME}'
- 'ENTE_SMTP_ENCRYPTION=${ENTE_SMTP_ENCRYPTION:-tls}'
volumes: volumes:
- 'museum-data:/data' - 'museum-data:/data'
- 'museum-config:/config' - 'museum-config:/config'
@ -46,7 +53,6 @@ services:
timeout: 10s timeout: 10s
retries: 3 retries: 3
web: web:
image: 'ghcr.io/ente-io/web:ca03165f5e7f2a50105e6e40019c17ae6cdd934f' # Released at 2025-10-08T00:57:05-07:00 image: 'ghcr.io/ente-io/web:ca03165f5e7f2a50105e6e40019c17ae6cdd934f' # Released at 2025-10-08T00:57:05-07:00
environment: environment:
@ -63,7 +69,6 @@ services:
retries: 3 retries: 3
start_period: 10s start_period: 10s
postgres: postgres:
image: 'postgres:15-alpine' image: 'postgres:15-alpine'
environment: environment:
@ -80,7 +85,6 @@ services:
timeout: 5s timeout: 5s
retries: 5 retries: 5
minio: minio:
image: 'quay.io/minio/minio:RELEASE.2025-09-07T16-13-09Z' # Released at 2025-09-07T16-13-09Z image: 'quay.io/minio/minio:RELEASE.2025-09-07T16-13-09Z' # Released at 2025-09-07T16-13-09Z
command: 'server /data --console-address ":9001"' command: 'server /data --console-address ":9001"'
@ -101,7 +105,6 @@ services:
timeout: 20s timeout: 20s
retries: 10 retries: 10
minio-init: minio-init:
image: 'minio/mc:RELEASE.2025-08-13T08-35-41Z' # Released at 2025-08-13T08-35-41Z image: 'minio/mc:RELEASE.2025-08-13T08-35-41Z' # Released at 2025-08-13T08-35-41Z
depends_on: depends_on:

View file

@ -39,6 +39,14 @@ services:
- ENTE_S3_B2_EU_CEN_REGION=${S3_STORAGE_REGION:-us-east-1} - ENTE_S3_B2_EU_CEN_REGION=${S3_STORAGE_REGION:-us-east-1}
- ENTE_S3_B2_EU_CEN_BUCKET=${S3_STORAGE_BUCKET:?} - ENTE_S3_B2_EU_CEN_BUCKET=${S3_STORAGE_BUCKET:?}
- ENTE_SMTP_HOST=${ENTE_SMTP_HOST:-smtp.gmail.com}
- ENTE_SMTP_PORT=${ENTE_SMTP_PORT:-587}
- ENTE_SMTP_USERNAME=${ENTE_SMTP_USERNAME}
- ENTE_SMTP_PASSWORD=${ENTE_SMTP_PASSWORD}
- ENTE_SMTP_EMAIL=${ENTE_SMTP_EMAIL}
- ENTE_SMTP_SENDER_NAME=${ENTE_SMTP_SENDER_NAME}
- ENTE_SMTP_ENCRYPTION=${ENTE_SMTP_ENCRYPTION:-tls}
depends_on: depends_on:
postgres: postgres:
condition: service_healthy condition: service_healthy
@ -77,4 +85,3 @@ services:
interval: 5s interval: 5s
timeout: 5s timeout: 5s
retries: 10 retries: 10