From 4f76dc835b6b577d03363a1961a6381750c78110 Mon Sep 17 00:00:00 2001
From: Franck Kerbiriou <contact@franckkerbiriou.com>
Date: Sat, 12 Oct 2024 14:04:57 -0500
Subject: [PATCH] Refactor service

---
 templates/compose/calcom.yaml | 66 ++++++++++++++++++++---------------
 1 file changed, 37 insertions(+), 29 deletions(-)

diff --git a/templates/compose/calcom.yaml b/templates/compose/calcom.yaml
index ac737f8aa..c7ea7744c 100644
--- a/templates/compose/calcom.yaml
+++ b/templates/compose/calcom.yaml
@@ -5,55 +5,63 @@
 # port: 3000
 
 services:
-  postgresql:
-    image: postgres:16-alpine
-    volumes:
-      - postgresql-data:/var/lib/postgresql/data
-    environment:
-      - POSTGRES_USER=$SERVICE_USER_POSTGRES
-      - POSTGRES_PASSWORD=$SERVICE_PASSWORD_POSTGRES
-      - POSTGRES_DB=${POSTGRES_DB:-calendso}
-    healthcheck:
-      test: ["CMD-SHELL", "pg_isready -U $${POSTGRES_USER} -d $${POSTGRES_DB}"]
-      interval: 5s
-      timeout: 20s
-      retries: 10
   calcom:
     image: calcom.docker.scarf.sh/calcom/cal.com
     environment:
       # Some variables still uses Calcom previous name, Calendso
+      #
       # Full list https://github.com/calcom/cal.com/blob/main/.env.example
       - SERVICE_FQDN_CALCOM_3000
       - NEXT_PUBLIC_LICENSE_CONSENT=agree
       - NODE_ENV=production
-      - NEXT_PUBLIC_WEBAPP_URL=$SERVICE_FQDN_CALCOM
+      - NEXT_PUBLIC_WEBAPP_URL=${SERVICE_FQDN_CALCOM}
       - NEXT_PUBLIC_API_V2_URL=${SERVICE_FQDN_CALCOM}/api/v2
-        # NEXTAUTH_URL=http://localhost:3000/api/auth
+      # https://next-auth.js.org/configuration/options#nextauth_url
+      # From https://github.com/calcom/docker?tab=readme-ov-file#important-run-time-variables, it should be ${NEXT_PUBLIC_WEBAPP_URL}/api/auth
+      - NEXTAUTH_URL=${SERVICE_FQDN_CALCOM}/api/auth
       # It is highly recommended that the NEXTAUTH_SECRET must be overridden and very unique
       # Use `openssl rand -base64 32` to generate a key
-      - NEXTAUTH_SECRET=$SERVICE_BASE64_CALCOM_SECRET
+      - NEXTAUTH_SECRET=${NEXTAUTH_SECRET:-$SERVICE_BASE64_CALCOM_SECRET}
       # Encryption key that will be used to encrypt CalDAV credentials, choose a random string, for example with `dd if=/dev/urandom bs=1K count=1 | md5sum`
-      - CALENDSO_ENCRYPTION_KEY=$SERVICE_BASE64_CALCOM_KEY
-      - POSTGRES_USER=$SERVICE_USER_POSTGRES
-      - POSTGRES_PASSWORD=$SERVICE_PASSWORD_POSTGRES
+      - CALENDSO_ENCRYPTION_KEY=${CALENDSO_ENCRYPTION_KEY:-$SERVICE_BASE64_CALCOM_KEY}
+      - POSTGRES_USER=${SERVICE_USER_POSTGRES}
+      - POSTGRES_PASSWORD=${SERVICE_PASSWORD_POSTGRES}
       - POSTGRES_DB=${POSTGRES_DB:-calendso}
       - DATABASE_HOST=postgresql
-      - DATABASE_URL=postgresql://${SERVICE_USER_POSTGRES}:${SERVICE_PASSWORD_POSTGRES}@${DATABASE_HOST}/${POSTGRES_DB:-calendso}
+      - DATABASE_URL=postgresql://${SERVICE_USER_POSTGRES}:${SERVICE_PASSWORD_POSTGRES}@${DATABASE_HOST:-postgresql}/${POSTGRES_DB:-calendso}
       # Needed to run migrations while using a connection pooler like PgBouncer
-      # Use the same one as DATABASE_URL if you're not using a connection pooler
-      - DATABASE_DIRECT_URL=postgresql://${SERVICE_USER_POSTGRES}:${SERVICE_PASSWORD_POSTGRES}@${DATABASE_HOST}/${POSTGRES_DB:-calendso}
+      # Use the same one as DATABASE_URL if you are not using a connection pooler
+      - DATABASE_DIRECT_URL=postgresql://${SERVICE_USER_POSTGRES}:${SERVICE_PASSWORD_POSTGRES}@${DATABASE_HOST:-postgresql}/${POSTGRES_DB:-calendso}
       # GOOGLE_API_CREDENTIALS={}
-      # Set this to '1' if you don't want Cal to collect anonymous usage
+      # Set this to 1 if you don't want Cal to collect anonymous usage
       - CALCOM_TELEMETRY_DISABLED=1
       # E-mail settings
       # Configures the global From: header whilst sending emails.
-      - EMAIL_FROM=$EMAIL_FROM
-      - EMAIL_FROM_NAME=$EMAIL_FROM_NAME
+      - EMAIL_FROM=${EMAIL_FROM}
+      - EMAIL_FROM_NAME=${EMAIL_FROM_NAME}
       # Configure SMTP settings (@see https://nodemailer.com/smtp/).
-      - EMAIL_SERVER_HOST=$EMAIL_SERVER_HOST
-      - EMAIL_SERVER_PORT=$EMAIL_SERVER_PORT
-      - EMAIL_SERVER_USER=$EMAIL_SERVER_USER
-      - EMAIL_SERVER_PASSWORD=$EMAIL_SERVER_PASSWORD
+      - EMAIL_SERVER_HOST=${EMAIL_SERVER_HOST}
+      - EMAIL_SERVER_PORT=${EMAIL_SERVER_PORT}
+      - EMAIL_SERVER_USER=${EMAIL_SERVER_USER}
+      - EMAIL_SERVER_PASSWORD=${EMAIL_SERVER_PASSWORD}
       - NEXT_PUBLIC_APP_NAME="Cal.com"
+      # More info on ALLOWED_HOSTNAMES https://github.com/calcom/cal.com/issues/12201
+      - ALLOWED_HOSTNAMES=["${SERVICE_FQDN_CALCOM}"]
     depends_on:
       - postgresql
+  postgresql:
+    image: postgres:16-alpine
+    environment:
+      - POSTGRES_USER=${SERVICE_USER_POSTGRES}
+      - POSTGRES_PASSWORD=${SERVICE_PASSWORD_POSTGRES}
+      - POSTGRES_DB=${POSTGRES_DATABASE:-calcom}
+    volumes:
+      - calcom-postgresql-data:/var/lib/postgresql/data
+    healthcheck:
+      test:
+        - CMD-SHELL
+        - pg_isready -U ${SERVICE_USER_POSTGRES} -d ${POSTGRES_DATABASE:-calcom}
+      interval: 10s
+      timeout: 5s
+      retries: 5
+    restart: unless-stopped