From 4a131be82ebaf2375dc82e8cd3ad42c6caeb8e45 Mon Sep 17 00:00:00 2001 From: 3wc <3wc@doesthisthing.work> Date: Tue, 18 Oct 2022 17:27:02 -0400 Subject: [PATCH] Attempt at updating to latest --- abra.sh | 2 +- compose.yml | 2 ++ entrypoint.sh | 10 ++++++---- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/abra.sh b/abra.sh index e1813e3..ab5889e 100644 --- a/abra.sh +++ b/abra.sh @@ -1 +1 @@ -export ENTRYPOINT_CONF_VERSION=v6 +export ENTRYPOINT_CONF_VERSION=v9 diff --git a/compose.yml b/compose.yml index 3f65de3..5b283de 100644 --- a/compose.yml +++ b/compose.yml @@ -15,6 +15,7 @@ services: - POSTGRES_DB=calendso - POSTGRES_HOST=db - "BASE_URL=${DOMAIN}" + - "NEXT_PUBLIC_APP_URL=${DOMAIN}" - "NEXTAUTH_URL=${DOMAIN}" - NEXT_PUBLIC_TELEMETRY_KEY - MS_GRAPH_CLIENT_ID @@ -23,6 +24,7 @@ services: - EMAIL_SERVER_HOST - EMAIL_SERVER_PORT - EMAIL_SERVER_USER + - NODE_TLS_REJECT_UNAUTHORIZED=0 configs: - source: entrypoint_conf target: /docker-entrypoint.sh diff --git a/entrypoint.sh b/entrypoint.sh index 110cb5c..b57e159 100644 --- a/entrypoint.sh +++ b/entrypoint.sh @@ -38,10 +38,12 @@ main() { set -eu load_vars + + if [ ! "${1-}" = "-e" ]; then + # 3wc: upstream CMD + # https://github.com/calendso/docker/blob/main/Dockerfile + /app/scripts/start.sh + fi } main - -# 3wc: upstream CMD -# https://github.com/calendso/docker/blob/main/Dockerfile -/app/scripts/start.sh