This commit is contained in:
3wc 2023-07-11 16:24:12 +01:00
parent e759e2e7d3
commit 8f0289e018
3 changed files with 9 additions and 6 deletions

View File

@ -1,6 +1,6 @@
TYPE=calendso TYPE=cal
DOMAIN=calendso.example.com DOMAIN=cal.example.com
## Domain aliases ## Domain aliases
#EXTRA_DOMAINS=', `www.calendso.example.com`' #EXTRA_DOMAINS=', `www.calendso.example.com`'

View File

@ -3,7 +3,7 @@ version: "3.8"
services: services:
app: app:
image: 3wordchant/calendso:latest image: calcom.docker.scarf.sh/calcom/cal.com
networks: networks:
- proxy - proxy
- backend - backend
@ -14,8 +14,7 @@ services:
- POSTGRES_PASSWORD_FILE=/run/secrets/db_password - POSTGRES_PASSWORD_FILE=/run/secrets/db_password
- POSTGRES_DB=calendso - POSTGRES_DB=calendso
- POSTGRES_HOST=db - POSTGRES_HOST=db
- "BASE_URL=${DOMAIN}" - "NEXT_PUBLIC_WEBAPP_URL=https://${DOMAIN}"
- "NEXTAUTH_URL=${DOMAIN}"
- NEXT_PUBLIC_TELEMETRY_KEY - NEXT_PUBLIC_TELEMETRY_KEY
- MS_GRAPH_CLIENT_ID - MS_GRAPH_CLIENT_ID
- ZOOM_CLIENT_ID - ZOOM_CLIENT_ID
@ -82,6 +81,9 @@ secrets:
db_password: db_password:
external: true external: true
name: ${STACK_NAME}_db_password_${SECRET_DB_PASSWORD_VERSION} name: ${STACK_NAME}_db_password_${SECRET_DB_PASSWORD_VERSION}
nextauth_secret:
external: true
name: ${STACK_NAME}_nextauth_secret_${SECRET_NEXTAUTH_SECRET_VERSION}
configs: configs:
entrypoint_conf: entrypoint_conf:

View File

@ -30,6 +30,7 @@ load_vars() {
file_env "GOOGLE_API_CREDENTIALS" file_env "GOOGLE_API_CREDENTIALS"
file_env "ZOOM_CLIENT_SECRET" file_env "ZOOM_CLIENT_SECRET"
file_env "EMAIL_SERVER_PASSWORD" file_env "EMAIL_SERVER_PASSWORD"
file_env "NEXTAUTH_SECRET"
export "DATABASE_URL=postgresql://$POSTGRES_USER:$POSTGRES_PASSWORD@$POSTGRES_HOST:5432/$POSTGRES_DB" export "DATABASE_URL=postgresql://$POSTGRES_USER:$POSTGRES_PASSWORD@$POSTGRES_HOST:5432/$POSTGRES_DB"
} }
@ -44,4 +45,4 @@ main
# 3wc: upstream CMD # 3wc: upstream CMD
# https://github.com/calendso/docker/blob/main/Dockerfile # https://github.com/calendso/docker/blob/main/Dockerfile
/app/scripts/start.sh /calcom/scripts/start.sh