v4.1 - Admin/onboarding

docker-compose.prod.yml

@@ -3,15 +3,16 @@ services:
     build:
       context: .
       args:
-        APP_VERSION: ${APP_VERSION:-4.2.3}
+        APP_VERSION: ${APP_VERSION:-4.0.0}
     container_name: goodwalk_svelte_app
     environment:
-      APP_VERSION: ${APP_VERSION:-4.2.3}
+      APP_VERSION: ${APP_VERSION:-4.0.0}
       DATABASE_URL: postgresql://${POSTGRES_USER:-goodwalk}:${POSTGRES_PASSWORD_URLENCODED:-goodwalk}@db:5432/${POSTGRES_DB:-goodwalk}
       NODE_ENV: production
       PORT: 3000
       ENABLE_GENERAL_ENQUIRIES: ${ENABLE_GENERAL_ENQUIRIES:-false}
       PUBLIC_ENABLE_MOBILE_CTA_BUTTON: ${PUBLIC_ENABLE_MOBILE_CTA_BUTTON:-false}
+      PUBLIC_ENABLE_ENHANCED_CONTENT_IMAGES: ${PUBLIC_ENABLE_ENHANCED_CONTENT_IMAGES:-false}
       TZ: ${TZ:-Pacific/Auckland}
     depends_on:
       - db
@@ -26,10 +27,12 @@ services:
     build:
       context: ./mail-api
       args:
-        APP_VERSION: ${APP_VERSION:-4.2.3}
+        APP_VERSION: ${APP_VERSION:-4.0.0}
     container_name: goodwalk_svelte_mail_api
+    depends_on:
+      - db
     environment:
-      APP_VERSION: ${APP_VERSION:-4.2.3}
+      APP_VERSION: ${APP_VERSION:-4.0.0}
       RESEND_API_KEY: ${RESEND_API_KEY}
       OWNER_EMAIL: ${OWNER_EMAIL}
       OWNER_BCC: ${OWNER_BCC:-}
@@ -37,6 +40,11 @@ services:
       FROM_EMAIL: ${FROM_EMAIL:-GoodWalk <info@goodwalk.co.nz>}
       REPLY_TO: ${REPLY_TO:-aless@goodwalk.co.nz}
       ENABLE_GENERAL_ENQUIRIES: ${ENABLE_GENERAL_ENQUIRIES:-false}
+      DATA_DIR: ${MAIL_API_DATA_DIR:-/app/data}
+      # Shared postgres for admin state (client_profiles, allowed_emails, drafts).
+      # When unset the mail-api falls back to JSON files under DATA_DIR.
+      DATABASE_URL: postgresql://${POSTGRES_USER:-goodwalk}:${POSTGRES_PASSWORD_URLENCODED:-goodwalk}@db:5432/${POSTGRES_DB:-goodwalk}
+      ADMIN_DATA_SEED_FROM_JSON: ${ADMIN_DATA_SEED_FROM_JSON:-auto}
       FORM_MIN_SECONDS: ${FORM_MIN_SECONDS:-4}
       FORM_MAX_SECONDS: ${FORM_MAX_SECONDS:-7200}
       RATE_LIMIT_WINDOW_SECONDS: ${RATE_LIMIT_WINDOW_SECONDS:-900}
@@ -47,6 +55,8 @@ services:
       TZ: ${TZ:-Pacific/Auckland}
     expose:
       - '8000'
+    volumes:
+      - mail_api_data:${MAIL_API_DATA_DIR:-/app/data}
     restart: unless-stopped
     networks:
       - default
@@ -68,6 +78,7 @@ services:
 
 volumes:
   postgres_data:
+  mail_api_data:
 
 networks:
   webnet: