From 0d37b007f00b56ec0a389d1ccd6893bd3720c75f Mon Sep 17 00:00:00 2001 From: Florent Guiotte Date: Fri, 2 Jan 2026 17:39:01 +0100 Subject: [PATCH] WIP on ENTE need to setup domain names --- docker-compose.yml | 97 ++++++++++++++++++++++++++++++++++++++++-- ente-db-pw.secret | Bin 0 -> 50 bytes ente-s3-key.secret | Bin 0 -> 48 bytes ente-s3-secret.secret | Bin 0 -> 86 bytes 4 files changed, 93 insertions(+), 4 deletions(-) create mode 100644 ente-db-pw.secret create mode 100644 ente-s3-key.secret create mode 100644 ente-s3-secret.secret diff --git a/docker-compose.yml b/docker-compose.yml index 34eca75..5133299 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -454,11 +454,93 @@ services: - ./garage/garage.toml:/etc/garage.toml - garage-meta:/meta - ./data/garage-data:/data + ports: # TODO: Remove? + - 3900:3900 #s3_api + - 3901:3901 #rpc + - 3902:3902 #s3_web + - 3903:3903 #k2v_api + + + ente-db: + image: postgres:15 + container_name: ente-db + restart: unless-stopped + environment: + <<: *common-environment + POSTGRES_DB: ente_db + POSTGRES_USER: pguser + POSTGRES_PASSWORD_FILE: /run/secrets/ente-db-pw + healthcheck: + test: pg_isready -q -d ente_db -U pguser + start_period: 40s + start_interval: 1s + volumes: + - ente-db:/var/lib/postgresql/data + secrets: + - ente-db-pw + + + ente-server: # named "museum" in the doc + image: ghcr.io/ente-io/server + container_name: ente-server + restart: unless-stopped ports: - - 3900:3900 - - 3901:3901 - - 3902:3902 - - 3903:3903 + - 8080:8080 # API + depends_on: + ente-db: + condition: service_healthy + environment: + <<: *common-environment + ENTE_DB_HOST: ente-db + ENTE_DB_NAME: ente_db + ENTE_DB_USER: pguser + ENTE_S3_B2_EU_CEN_ENDPOINT: garage:3900 + ENTE_S3_B2_EU_CEN_REGION: garage + ENTE_S3_B2_EU_CEN_BUCKET: ente + ENTE_APPS_PUBLIC_ALBUMS: http://dm:3002 + ENTE_APPS_CAST: http://dm:3004 + ENTE_APPS_EMBED_ALBUMS: http://dm:3005 + ENTE_APPS_ACCOUNTS: http://dm:3001 + secrets: + - ente-db-pw + - ente-s3-key + - ente-s3-secret +# volumes: +# - ./ente/config.yaml:/museum.yaml:ro + command: > + sh -c " + export ENTE_DB_PASSWORD=$(cat /run/secrets/ente-db-pw); + export ENTE_S3_B2_EU_CEN_KEY=$(cat /run/secrets/ente-s3-key | xargs); + export ENTE_S3_B2_EU_CEN_SECRET=$(cat /run/secrets/ente-s3-secret | xargs); + exec /museum + " + healthcheck: + test: ["CMD", "wget", "--quiet", "--tries=1", "--spider", "http://localhost:8080/ping"] + interval: 60s + timeout: 5s + retries: 3 + start_period: 120s + + + ente-web: + image: ghcr.io/ente-io/web + container_name: ente-web + restart: unless-stopped + # Uncomment what you need to tweak. + ports: + - 3000:3000 # Photos web app + - 3001:3001 # Accounts + - 3002:3002 # Public albums + - 3003:3003 # Auth + - 3004:3004 # Cast + - 3005:3005 # Share + - 3006:3006 # Embed + # Modify these values to your custom subdomains, if using any + environment: + <<: *common-environment + ENTE_API_ORIGIN: http://localhost:8080 + ENTE_ALBUMS_ORIGIN: https://dm:3002 + ENTE_PHOTOS_ORIGIN: http://dm:3000 volumes: @@ -491,6 +573,7 @@ volumes: vikunja-data: vikunja-db: garage-meta: + ente-db: secrets: @@ -520,3 +603,9 @@ secrets: file: nocodb-db-pw.secret nocodb-json: file: nocodb-json.secret + ente-db-pw: + file: ente-db-pw.secret + ente-s3-key: + file: ente-s3-key.secret + ente-s3-secret: + file: ente-s3-secret.secret diff --git a/ente-db-pw.secret b/ente-db-pw.secret new file mode 100644 index 0000000000000000000000000000000000000000..51efb0bb1c8c0fef18af4bba7046c0fdfb2c73af GIT binary patch literal 50 zcmV-20L}jZM@dveQdv+`0Gg%OvTqdh;+VX-o3XIm5=q_Z(&=qOev3%t+Bu-Ez-#&w Irw=MqVgwQ`IXVO)g^F0{kNkG?*fjuj#I{Jmd@F@ G%^OW0DHv1$ literal 0 HcmV?d00001 diff --git a/ente-s3-secret.secret b/ente-s3-secret.secret new file mode 100644 index 0000000000000000000000000000000000000000..3933004a5ed1fb4d5b9b76dabddf2bacfcefcc32 GIT binary patch literal 86 zcmV-c0IB}~M@dveQdv+`0305s)=0z2VXKw>M-aFOH--2p5j&zNU4t>-7ww6i5{y)> s{-4*XxvqUY25UYr?w0$0e18ZjOrjN5y=xbT0Nd7h5!Hn literal 0 HcmV?d00001