From c4ddabacb4862be3e9c001f7442531cefaa7ecf7 Mon Sep 17 00:00:00 2001 From: root Date: Tue, 11 Mar 2025 15:23:20 +0100 Subject: [PATCH 1/4] support postgresql other port number --- docker-compose.yml | 1 + files/service/config.json.template | 1 + files/service/scripts/start-odk.sh | 2 +- 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/docker-compose.yml b/docker-compose.yml index 97b7ac651..b1e2bc32d 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -55,6 +55,7 @@ services: - DB_USER=${DB_USER:-odk} - DB_PASSWORD=${DB_PASSWORD:-odk} - DB_NAME=${DB_NAME:-odk} + - DB_PORT=${DB_PORT:-5432} - DB_SSL=${DB_SSL:-null} - EMAIL_FROM=${EMAIL_FROM:-no-reply@$DOMAIN} - EMAIL_HOST=${EMAIL_HOST:-mail} diff --git a/files/service/config.json.template b/files/service/config.json.template index c2d6ea8f9..275bdb958 100644 --- a/files/service/config.json.template +++ b/files/service/config.json.template @@ -3,6 +3,7 @@ "database": { "host": "${DB_HOST}", "user": "${DB_USER}", + "port": "${DB_PORT}", "password": "${DB_PASSWORD}", "database": "${DB_NAME}", "ssl": ${DB_SSL} diff --git a/files/service/scripts/start-odk.sh b/files/service/scripts/start-odk.sh index 1c2471aff..1d49eb2c1 100755 --- a/files/service/scripts/start-odk.sh +++ b/files/service/scripts/start-odk.sh @@ -4,7 +4,7 @@ echo "generating local service configuration.." ENKETO_API_KEY=$(cat /etc/secrets/enketo-api-key) \ BASE_URL=$( [ "${HTTPS_PORT}" = 443 ] && echo https://"${DOMAIN}" || echo https://"${DOMAIN}":"${HTTPS_PORT}" ) \ -envsubst '$DOMAIN $BASE_URL $SYSADMIN_EMAIL $ENKETO_API_KEY $DB_HOST $DB_USER $DB_PASSWORD $DB_NAME $DB_SSL $EMAIL_FROM $EMAIL_HOST $EMAIL_PORT $EMAIL_SECURE $EMAIL_IGNORE_TLS $EMAIL_USER $EMAIL_PASSWORD $OIDC_ENABLED $OIDC_ISSUER_URL $OIDC_CLIENT_ID $OIDC_CLIENT_SECRET $SENTRY_ORG_SUBDOMAIN $SENTRY_KEY $SENTRY_PROJECT $S3_SERVER $S3_ACCESS_KEY $S3_SECRET_KEY $S3_BUCKET_NAME' \ +envsubst '$DOMAIN $BASE_URL $SYSADMIN_EMAIL $ENKETO_API_KEY $DB_HOST $DB_USER $DB_PASSWORD $DB_NAME $DB_PORT $DB_SSL $EMAIL_FROM $EMAIL_HOST $EMAIL_PORT $EMAIL_SECURE $EMAIL_IGNORE_TLS $EMAIL_USER $EMAIL_PASSWORD $OIDC_ENABLED $OIDC_ISSUER_URL $OIDC_CLIENT_ID $OIDC_CLIENT_SECRET $SENTRY_ORG_SUBDOMAIN $SENTRY_KEY $SENTRY_PROJECT $S3_SERVER $S3_ACCESS_KEY $S3_SECRET_KEY $S3_BUCKET_NAME' \ < /usr/share/odk/config.json.template \ > /usr/odk/config/local.json From 0e6d765225a3d4f218019a996c8d1ade277d2934 Mon Sep 17 00:00:00 2001 From: Matthew White Date: Mon, 12 May 2025 21:41:30 -0400 Subject: [PATCH 2/4] No envsubst --- files/service/scripts/start-odk.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/files/service/scripts/start-odk.sh b/files/service/scripts/start-odk.sh index 9ac2df4e5..848d6be55 100755 --- a/files/service/scripts/start-odk.sh +++ b/files/service/scripts/start-odk.sh @@ -4,7 +4,7 @@ echo "generating local service configuration.." ENKETO_API_KEY=$(cat /etc/secrets/enketo-api-key) \ BASE_URL=$( [ "${HTTPS_PORT}" = 443 ] && echo https://"${DOMAIN}" || echo https://"${DOMAIN}":"${HTTPS_PORT}" ) \ -envsubst '$DOMAIN $BASE_URL $SYSADMIN_EMAIL $ENKETO_API_KEY $DB_HOST $DB_USER $DB_PASSWORD $DB_NAME $DB_PORT $DB_SSL $EMAIL_FROM $EMAIL_HOST $EMAIL_PORT $EMAIL_SECURE $EMAIL_IGNORE_TLS $EMAIL_USER $EMAIL_PASSWORD $OIDC_ENABLED $OIDC_ISSUER_URL $OIDC_CLIENT_ID $OIDC_CLIENT_SECRET $SENTRY_ORG_SUBDOMAIN $SENTRY_KEY $SENTRY_PROJECT $S3_SERVER $S3_ACCESS_KEY $S3_SECRET_KEY $S3_BUCKET_NAME' \ +envsubst '$DOMAIN $BASE_URL $SYSADMIN_EMAIL $ENKETO_API_KEY $DB_HOST $DB_USER $DB_PASSWORD $DB_NAME $DB_SSL $EMAIL_FROM $EMAIL_HOST $EMAIL_PORT $EMAIL_SECURE $EMAIL_IGNORE_TLS $EMAIL_USER $EMAIL_PASSWORD $OIDC_ENABLED $OIDC_ISSUER_URL $OIDC_CLIENT_ID $OIDC_CLIENT_SECRET $SENTRY_ORG_SUBDOMAIN $SENTRY_KEY $SENTRY_PROJECT $S3_SERVER $S3_ACCESS_KEY $S3_SECRET_KEY $S3_BUCKET_NAME' \ < /usr/share/odk/config.json.template \ > /usr/odk/config/local.json From 26b5751bbd1db23f262d774ec0375b8e4db63872 Mon Sep 17 00:00:00 2001 From: Matthew White Date: Mon, 12 May 2025 21:42:30 -0400 Subject: [PATCH 3/4] Don't quote $DB_PORT --- files/service/config.json.template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/files/service/config.json.template b/files/service/config.json.template index 61c910fde..cdf5bb763 100644 --- a/files/service/config.json.template +++ b/files/service/config.json.template @@ -3,7 +3,7 @@ "database": { "host": "${DB_HOST}", "user": "${DB_USER}", - "port": "${DB_PORT}", + "port": ${DB_PORT}, "password": "${DB_PASSWORD}", "database": "${DB_NAME}", "ssl": ${DB_SSL} From ce1c62e0c7528d6227e4a74861ba674e97c08621 Mon Sep 17 00:00:00 2001 From: Matthew White Date: Mon, 12 May 2025 22:06:57 -0400 Subject: [PATCH 4/4] Use null for default port instead of 5432 --- docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose.yml b/docker-compose.yml index a0b10254b..b52f7c6a6 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -55,7 +55,7 @@ services: - DB_USER=${DB_USER:-odk} - DB_PASSWORD=${DB_PASSWORD:-odk} - DB_NAME=${DB_NAME:-odk} - - DB_PORT=${DB_PORT:-5432} + - DB_PORT=${DB_PORT:-null} - DB_SSL=${DB_SSL:-null} - EMAIL_FROM=${EMAIL_FROM:-no-reply@$DOMAIN} - EMAIL_HOST=${EMAIL_HOST:-mail}