From 150e6bb17ae88cd14bce8137aa2209bf56a4f9e9 Mon Sep 17 00:00:00 2001 From: FatoYo <55811548+FatoYo@users.noreply.github.com> Date: Tue, 4 Mar 2025 14:30:04 +0100 Subject: [PATCH] Prepare docker-compose.yml for mail and calendar variables (#10464) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Adding the placeholders for the environment variables related to setting up the mail and calendar sync. This will make the Twenty setup easier for new users. --------- Co-authored-by: Félix Malfait Co-authored-by: Félix Malfait --- packages/twenty-docker/docker-compose.yml | 54 ++++++++++++++++++++++- 1 file changed, 52 insertions(+), 2 deletions(-) diff --git a/packages/twenty-docker/docker-compose.yml b/packages/twenty-docker/docker-compose.yml index db2fb9f0e..841cb5392 100644 --- a/packages/twenty-docker/docker-compose.yml +++ b/packages/twenty-docker/docker-compose.yml @@ -30,7 +30,32 @@ services: STORAGE_S3_NAME: ${STORAGE_S3_NAME} STORAGE_S3_ENDPOINT: ${STORAGE_S3_ENDPOINT} - APP_SECRET: ${APP_SECRET} + APP_SECRET: ${APP_SECRET:-replace_me_with_a_random_string} + + # MESSAGING_PROVIDER_GMAIL_ENABLED: ${MESSAGING_PROVIDER_GMAIL_ENABLED} + # CALENDAR_PROVIDER_GOOGLE_ENABLED: ${CALENDAR_PROVIDER_GOOGLE_ENABLED} + # AUTH_GOOGLE_CLIENT_ID: ${AUTH_GOOGLE_CLIENT_ID} + # AUTH_GOOGLE_CLIENT_SECRET: ${AUTH_GOOGLE_CLIENT_SECRET} + # AUTH_GOOGLE_CALLBACK_URL: ${AUTH_GOOGLE_CALLBACK_URL} + # AUTH_GOOGLE_APIS_CALLBACK_URL: ${AUTH_GOOGLE_APIS_CALLBACK_URL} + + # CALENDAR_PROVIDER_MICROSOFT_ENABLED: ${CALENDAR_PROVIDER_MICROSOFT_ENABLED} + # MESSAGING_PROVIDER_MICROSOFT_ENABLED: ${MESSAGING_PROVIDER_MICROSOFT_ENABLED} + # AUTH_MICROSOFT_ENABLED: ${AUTH_MICROSOFT_ENABLED} + # AUTH_MICROSOFT_CLIENT_ID: ${AUTH_MICROSOFT_CLIENT_ID} + # AUTH_MICROSOFT_CLIENT_SECRET: ${AUTH_MICROSOFT_CLIENT_SECRET} + # AUTH_MICROSOFT_CALLBACK_URL: ${AUTH_MICROSOFT_CALLBACK_URL} + # AUTH_MICROSOFT_APIS_CALLBACK_URL: ${AUTH_MICROSOFT_APIS_CALLBACK_URL} + + # EMAIL_FROM_ADDRESS: ${EMAIL_FROM_ADDRESS:-contact@yourdomain.com} + # EMAIL_FROM_NAME: ${EMAIL_FROM_NAME:-"John from YourDomain"} + # EMAIL_SYSTEM_ADDRESS: ${EMAIL_SYSTEM_ADDRESS:-system@yourdomain.com} + # EMAIL_DRIVER: ${EMAIL_DRIVER:-smtp} + # EMAIL_SMTP_HOST: ${EMAIL_SMTP_HOST:-smtp.gmail.com} + # EMAIL_SMTP_PORT: ${EMAIL_SMTP_PORT:-465} + # EMAIL_SMTP_USER: ${EMAIL_SMTP_USER:-} + # EMAIL_SMTP_PASSWORD: ${EMAIL_SMTP_PASSWORD:-} + depends_on: change-vol-ownership: condition: service_completed_successfully @@ -57,7 +82,32 @@ services: STORAGE_S3_NAME: ${STORAGE_S3_NAME} STORAGE_S3_ENDPOINT: ${STORAGE_S3_ENDPOINT} - APP_SECRET: ${APP_SECRET} + APP_SECRET: ${APP_SECRET:-replace_me_with_a_random_string} + + # MESSAGING_PROVIDER_GMAIL_ENABLED: ${MESSAGING_PROVIDER_GMAIL_ENABLED} + # CALENDAR_PROVIDER_GOOGLE_ENABLED: ${CALENDAR_PROVIDER_GOOGLE_ENABLED} + # AUTH_GOOGLE_CLIENT_ID: ${AUTH_GOOGLE_CLIENT_ID} + # AUTH_GOOGLE_CLIENT_SECRET: ${AUTH_GOOGLE_CLIENT_SECRET} + # AUTH_GOOGLE_CALLBACK_URL: ${AUTH_GOOGLE_CALLBACK_URL} + # AUTH_GOOGLE_APIS_CALLBACK_URL: ${AUTH_GOOGLE_APIS_CALLBACK_URL} + + # CALENDAR_PROVIDER_MICROSOFT_ENABLED: ${CALENDAR_PROVIDER_MICROSOFT_ENABLED} + # MESSAGING_PROVIDER_MICROSOFT_ENABLED: ${MESSAGING_PROVIDER_MICROSOFT_ENABLED} + # AUTH_MICROSOFT_ENABLED: ${AUTH_MICROSOFT_ENABLED} + # AUTH_MICROSOFT_CLIENT_ID: ${AUTH_MICROSOFT_CLIENT_ID} + # AUTH_MICROSOFT_CLIENT_SECRET: ${AUTH_MICROSOFT_CLIENT_SECRET} + # AUTH_MICROSOFT_CALLBACK_URL: ${AUTH_MICROSOFT_CALLBACK_URL} + # AUTH_MICROSOFT_APIS_CALLBACK_URL: ${AUTH_MICROSOFT_APIS_CALLBACK_URL} + + # EMAIL_FROM_ADDRESS: ${EMAIL_FROM_ADDRESS:-contact@yourdomain.com} + # EMAIL_FROM_NAME: ${EMAIL_FROM_NAME:-"John from YourDomain"} + # EMAIL_SYSTEM_ADDRESS: ${EMAIL_SYSTEM_ADDRESS:-system@yourdomain.com} + # EMAIL_DRIVER: ${EMAIL_DRIVER:-smtp} + # EMAIL_SMTP_HOST: ${EMAIL_SMTP_HOST:-smtp.gmail.com} + # EMAIL_SMTP_PORT: ${EMAIL_SMTP_PORT:-465} + # EMAIL_SMTP_USER: ${EMAIL_SMTP_USER:-} + # EMAIL_SMTP_PASSWORD: ${EMAIL_SMTP_PASSWORD:-} + depends_on: db: condition: service_healthy