refactor: Update environment variables for services in compose files

templates/compose/fider.yaml

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

templates/compose/glitchtip.yaml

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

templates/compose/logto.yaml

@@ -11,6 +11,7 @@ services:
         condition: service_healthy
     entrypoint: ["sh", "-c", "npm run cli db seed -- --swe && npm start"]
     environment:
+      - SERVICE_FQDN_LOGTO
       - TRUST_PROXY_HEADER=1
       - 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;

templates/compose/plausible.yaml

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

templates/compose/windmill.yaml

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