dave/coolify
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

refactor: Update environment variables for services in compose files

Browse Source
This commit is contained in:
Andras Bacsai
2024-09-23 09:26:53 +02:00
parent ff9b68b450
commit 341c7e3598
6 changed files with 24 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
templates/compose/fider.yaml
View File

@@ -8,21 +8,22 @@ services:
fider: fider:
image: getfider/fider:stable image: getfider/fider:stable
environment: environment:
BASE_URL: $SERVICE_FQDN_FIDER_3000 - SERVICE_FQDN_FIDER_3000
DATABASE_URL: postgres://$SERVICE_USER_POSTGRES:$SERVICE_PASSWORD_POSTGRES@database:5432/fider?sslmode=disable - BASE_URL=$SERVICE_FQDN_FIDER_3000
JWT_SECRET: $SERVICE_PASSWORD_64_FIDER - DATABASE_URL=postgres://$SERVICE_USER_POSTGRES:$SERVICE_PASSWORD_POSTGRES@database:5432/fider?sslmode=disable
EMAIL_NOREPLY: ${EMAIL_NOREPLY:-noreply@example.com} - JWT_SECRET=$SERVICE_PASSWORD_64_FIDER
EMAIL_MAILGUN_API: $EMAIL_MAILGUN_API - EMAIL_NOREPLY=${EMAIL_NOREPLY:-noreply@example.com}
EMAIL_MAILGUN_DOMAIN: $EMAIL_MAILGUN_DOMAIN - EMAIL_MAILGUN_API=$EMAIL_MAILGUN_API
EMAIL_MAILGUN_REGION: $EMAIL_MAILGUN_REGION - EMAIL_MAILGUN_DOMAIN=$EMAIL_MAILGUN_DOMAIN
EMAIL_SMTP_HOST: ${EMAIL_SMTP_HOST:-smtp.mailgun.com} - EMAIL_MAILGUN_REGION=$EMAIL_MAILGUN_REGION
EMAIL_SMTP_PORT: ${EMAIL_SMTP_PORT:-587} - EMAIL_SMTP_HOST=${EMAIL_SMTP_HOST:-smtp.mailgun.com}
EMAIL_SMTP_USERNAME: ${EMAIL_SMTP_USERNAME:-postmaster@mailgun.com} - EMAIL_SMTP_PORT=${EMAIL_SMTP_PORT:-587}
EMAIL_SMTP_PASSWORD: $EMAIL_SMTP_PASSWORD - EMAIL_SMTP_USERNAME=${EMAIL_SMTP_USERNAME:-postmaster@mailgun.com}
EMAIL_SMTP_ENABLE_STARTTLS: $EMAIL_SMTP_ENABLE_STARTTLS - EMAIL_SMTP_PASSWORD=$EMAIL_SMTP_PASSWORD
EMAIL_AWSSES_REGION: $EMAIL_AWSSES_REGION - EMAIL_SMTP_ENABLE_STARTTLS=$EMAIL_SMTP_ENABLE_STARTTLS
EMAIL_AWSSES_ACCESS_KEY_ID: $EMAIL_AWSSES_ACCESS_KEY_ID - EMAIL_AWSSES_REGION=$EMAIL_AWSSES_REGION
EMAIL_AWSSES_SECRET_ACCESS_KEY: $EMAIL_AWSSES_SECRET_ACCESS_KEY - EMAIL_AWSSES_ACCESS_KEY_ID=$EMAIL_AWSSES_ACCESS_KEY_ID
- EMAIL_AWSSES_SECRET_ACCESS_KEY=$EMAIL_AWSSES_SECRET_ACCESS_KEY
healthcheck: healthcheck:
test: ["CMD", "/app/fider", "ping"] test: ["CMD", "/app/fider", "ping"]
interval: 2s interval: 2s
@@ -33,9 +34,9 @@ services:
volumes: volumes:
- pg_data:/var/lib/postgresql/data - pg_data:/var/lib/postgresql/data
environment: environment:
POSTGRES_USER: $SERVICE_USER_POSTGRES - POSTGRES_USER=$SERVICE_USER_POSTGRES
POSTGRES_PASSWORD: $SERVICE_PASSWORD_POSTGRES - POSTGRES_PASSWORD=$SERVICE_PASSWORD_POSTGRES
POSTGRES_DB: ${POSTGRES_DB:-fider} - POSTGRES_DB=${POSTGRES_DB:-fider}
healthcheck: healthcheck:
test: ["CMD", "pg_isready", "-U", "$SERVICE_USER_POSTGRES"] test: ["CMD", "pg_isready", "-U", "$SERVICE_USER_POSTGRES"]
interval: 5s interval: 5s

1
templates/compose/glitchtip.yaml
View File

@@ -53,6 +53,7 @@ services:
- postgres - postgres
- redis - redis
environment: environment:
- SERVICE_FQDN_GLITCHTIP
- DATABASE_URL=postgres://$SERVICE_USER_POSTGRESQL:$SERVICE_PASSWORD_POSTGRESQL@postgres:5432/${POSTGRESQL_DATABASE:-glitchtip} - DATABASE_URL=postgres://$SERVICE_USER_POSTGRESQL:$SERVICE_PASSWORD_POSTGRESQL@postgres:5432/${POSTGRESQL_DATABASE:-glitchtip}
- SECRET_KEY=$SERVICE_BASE64_64_ENCRYPTION - SECRET_KEY=$SERVICE_BASE64_64_ENCRYPTION
- EMAIL_URL=${EMAIL_URL:-consolemail://} - EMAIL_URL=${EMAIL_URL:-consolemail://}

1
templates/compose/logto.yaml
View File

@@ -11,6 +11,7 @@ services:
condition: service_healthy condition: service_healthy
entrypoint: ["sh", "-c", "npm run cli db seed -- --swe && npm start"] entrypoint: ["sh", "-c", "npm run cli db seed -- --swe && npm start"]
environment: environment:
- SERVICE_FQDN_LOGTO
- TRUST_PROXY_HEADER=1 - TRUST_PROXY_HEADER=1
- DB_URL=postgres://${SERVICE_USER_POSTGRES}:${SERVICE_PASSWORD_POSTGRES}@postgres:5432/${POSTGRES_DB:-logto} - DB_URL=postgres://${SERVICE_USER_POSTGRES}:${SERVICE_PASSWORD_POSTGRES}@postgres:5432/${POSTGRES_DB:-logto}
# Mandatory for GitPod to map host env to the container, thus GitPod can dynamically configure the public URL of Logto; # Mandatory for GitPod to map host env to the container, thus GitPod can dynamically configure the public URL of Logto;

1
templates/compose/plausible.yaml
View File

@@ -9,6 +9,7 @@ services:
image: "ghcr.io/plausible/community-edition:v2.1" image: "ghcr.io/plausible/community-edition:v2.1"
command: 'sh -c "sleep 10 && /entrypoint.sh db createdb && /entrypoint.sh db migrate && /entrypoint.sh run"' command: 'sh -c "sleep 10 && /entrypoint.sh db createdb && /entrypoint.sh db migrate && /entrypoint.sh run"'
environment: environment:
- SERVICE_FQDN_PLAUSIBLE
- "DATABASE_URL=postgres://postgres:$SERVICE_PASSWORD_POSTGRES@plausible_db/plausible" - "DATABASE_URL=postgres://postgres:$SERVICE_PASSWORD_POSTGRES@plausible_db/plausible"
- BASE_URL=$SERVICE_FQDN_PLAUSIBLE - BASE_URL=$SERVICE_FQDN_PLAUSIBLE
- SECRET_KEY_BASE=$SERVICE_BASE64_64_PLAUSIBLE - SECRET_KEY_BASE=$SERVICE_BASE64_64_PLAUSIBLE

1
templates/compose/windmill.yaml
View File

@@ -26,6 +26,7 @@ services:
windmill_server: windmill_server:
image: ghcr.io/windmill-labs/windmill:main image: ghcr.io/windmill-labs/windmill:main
environment: environment:
- SERVICE_FQDN_WINDMILL
- DATABASE_URL=postgres://postgres:$SERVICE_PASSWORD_WINDMILL_POSTGRES@db/windmill - DATABASE_URL=postgres://postgres:$SERVICE_PASSWORD_WINDMILL_POSTGRES@db/windmill
- MODE=server - MODE=server
- BASE_URL=$SERVICE_FQDN_WINDMILL - BASE_URL=$SERVICE_FQDN_WINDMILL

2
templates/service-templates.json
View File

File diff suppressed because one or more lines are too long