Pass more environment variables to karrot

.env.sample

@@ -13,9 +13,12 @@ SECRET_MAXMIND_LICENSE_KEY_VERSION=v1
 SITE_NAME=karrot dev
 SITE_LOGO=https://user-images.githubusercontent.com/31616/36565633-517373a4-1821-11e8-9948-5bf6887c667e.png
 
+FILE_UPLOAD_MAX_SIZE=10m
+
 # postal,smtp,console
 EMAIL_BACKEND=console
-# only set those when using SMTP
+
+# only set these when using EMAIL_BACKEND=smtp
 # SMTP USER and EMAIL_FROM are usually the same
 #EMAIL_FROM=
 #SMTP_USER=
@@ -24,6 +27,14 @@ EMAIL_BACKEND=console
 #SMTP_USE_TLS=true
 #SMTP_PORT=587
 
+# only set these when using EMAIL_BACKEND=postal
+#POSTAL_API_KEY=
+#POSTAL_API_URL=
+#POSTAL_WEBHOOK_KEY=
+
+# only if you have configured incoming emails
+#EMAIL_REPLY_DOMAIN=
+
 SITE_URL=https://${DOMAIN}
 LETS_ENCRYPT_ENV=production
 CSRF_TRUSTED_ORIGINS=${SITE_URL}

compose.yml

@@ -57,31 +57,41 @@ services:
       - "geoip_data:/var/lib/GeoIP"
       - "app_data:/app/uploads"
     environment:
-      - MODE=prod
-      - MAXMIND_ACCOUNT_ID
+      - CSRF_TRUSTED_ORIGINS
+      - DATABASE_CONN_MAX_AGE
+      - DATABASE_HOST=db
+      - DATABASE_NAME=karrot
+      - DATABASE_PASSWORD_FILE=/run/secrets/db_password
+      - DATABASE_PORT=5432
+      - DATABASE_USER=karrot
       - EMAIL_BACKEND
       - EMAIL_FROM
-      - SMTP_USER
-      - SMTP_PASSWORD_FILE=/run/secrets/smtp_password
-      - SMTP_HOST
-      - SMTP_USE_SSL
-      - SMTP_USE_TLS
-      - SMTP_PORT
-      - SITE_URL
-      - SITE_NAME
-      - SITE_LOGO
+      - EMAIL_REPLY_DOMAIN
+      - FILE_UPLOAD_DIR=/app/uploads
+      - FILE_UPLOAD_MAX_SIZE
+      - FORUM_BANNER_TOPIC_ID
+      - FORUM_DISCUSSIONS_FEED
       - LISTEN_HOST=0.0.0.0
       - LISTEN_SERVER=uvicorn
-      - SECRET_KEY_FILE=/run/secrets/secret_key
-      - DATABASE_HOST=db
-      - DATABASE_PORT=5432
-      - DATABASE_NAME=karrot
-      - DATABASE_USER=karrot
-      - DATABASE_PASSWORD_FILE=/run/secrets/db_password
+      - MAXMIND_ACCOUNT_ID
+      - MODE=prod
+      - POSTAL_API_KEY
+      - POSTAL_API_URL
+      - POSTAL_WEBHOOK_KEY
+      - PROXY_DISCOURSE_URL
+      - REDIS_DB=0
       - REDIS_HOST=redis
       - REDIS_PORT=6379
-      - REDIS_DB=0
-      - CSRF_TRUSTED_ORIGINS
+      - SECRET_KEY_FILE=/run/secrets/secret_key
+      - SITE_LOGO
+      - SITE_NAME
+      - SITE_URL
+      - SMTP_HOST
+      - SMTP_PASSWORD_FILE=/run/secrets/smtp_password
+      - SMTP_PORT
+      - SMTP_USE_SSL
+      - SMTP_USE_TLS
+      - SMTP_USER
     healthcheck:
       test: ["CMD", "curl", "-f", "http://localhost:8000/api/config/"]
       interval: 10s
@@ -90,7 +100,7 @@ services:
       start_period: 45s
     deploy:
       labels:
-        - "coop-cloud.${STACK_NAME}.version=0.1.3+0.1.3"
+        - "coop-cloud.${STACK_NAME}.version=0.1.4+0.1.3"
 
   worker:
     image: "ghcr.io/karrot-dev/karrot-docker-images:0.1.3-backend"
@@ -113,26 +123,35 @@ services:
       - secret_key
       - smtp_password
     environment:
-      - MODE=prod
-      - SITE_URL
-      - SMTP_USER
-      - SMTP_HOST
-      - SMTP_USE_SSL
-      - SMTP_USE_TLS
-      - SMTP_PORT
-      - SMTP_PASSWORD_FILE=/run/secrets/smtp_password
+      - DATABASE_CONN_MAX_AGE
+      - DATABASE_HOST=db
+      - DATABASE_NAME=karrot
+      - DATABASE_PASSWORD_FILE=/run/secrets/db_password
+      - DATABASE_PORT=5432
+      - DATABASE_USER=karrot
+      - EMAIL_BACKEND
+      - EMAIL_FROM
+      - EMAIL_REPLY_DOMAIN
       - IS_WORKER=1
       - LISTEN_HOST=0.0.0.0
       - LISTEN_SERVER=uvicorn
-      - SECRET_KEY_FILE=/run/secrets/secret_key
-      - DATABASE_HOST=db
-      - DATABASE_PORT=5432
-      - DATABASE_NAME=karrot
-      - DATABASE_USER=karrot
-      - DATABASE_PASSWORD_FILE=/run/secrets/db_password
+      - MODE=prod
+      - POSTAL_API_KEY
+      - POSTAL_API_URL
+      - POSTAL_WEBHOOK_KEY
+      - REDIS_DB=0
       - REDIS_HOST=redis
       - REDIS_PORT=6379
-      - REDIS_DB=0
+      - SECRET_KEY_FILE=/run/secrets/secret_key
+      - SITE_LOGO
+      - SITE_NAME
+      - SITE_URL
+      - SMTP_HOST
+      - SMTP_PASSWORD_FILE=/run/secrets/smtp_password
+      - SMTP_PORT
+      - SMTP_USE_SSL
+      - SMTP_USE_TLS
+      - SMTP_USER
   
   redis:
     image: "redis:6-alpine"