From 293fd65da4faf795ddde786f29a856e047f795f8 Mon Sep 17 00:00:00 2001 From: John Locke Date: Sat, 20 Aug 2016 08:53:37 -0700 Subject: [PATCH] Add support for #4 - Make Postgres port configurable at run time --- Dockerfile | 3 +++ README.md | 8 ++++++++ start.sh | 2 ++ 3 files changed, 13 insertions(+) diff --git a/Dockerfile b/Dockerfile index 06843a2..1b6ce7f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -33,6 +33,7 @@ RUN DEBIAN_FRONTENT=noninteractive && apt-get install -y openjdk-7-jre # Build time variables ENV LSMB_VERSION master +ARG CACHEBUST # Install LedgerSMB RUN cd /srv && \ @@ -63,6 +64,8 @@ ENV SSMTP_FROMLINE_OVERRIDE YES #ENV SSMTP_AUTH_METHOD ENV POSTGRES_HOST postgres +ENV POSTGRES_PORT 5432 +ENV DEFAULT_DB lsmb COPY start.sh /usr/local/bin/start.sh COPY update_ssmtp.sh /usr/local/bin/update_ssmtp.sh diff --git a/README.md b/README.md index 835139b..3675794 100644 --- a/README.md +++ b/README.md @@ -62,6 +62,14 @@ This environment variable is used to specify the hostname of the Postgres server If you set this to another hostname, LedgerSMB will attempt to connect to that hostname instead. +## `POSTGRES_PORT` = 5432 + +Port to connect to Postgres on. Use to connect to a Postgres server running on an alternate port. + +## `DEFAULT_DB` = lsmb + +Set this if you want to automatically log in to a particular LSMB database. + ### `SSMTP_ROOT` `SSMTP_MAILHUB` `SSMTP_HOSTNAME` `SSMTP_USE_STARTTLS` `SSMTP_AUTH_USER` `SSMTP_AUTH_PASS` `SSMTP_METHOD` `SSMTP_FROMLINE_OVERRIDE` These variables are used to set outgoing SMTP defaults. To set the outgoing email address, set SSMTP_ROOT, and SSMTP_HOSTNAME at a minimum -- SSMTP_MAILHUB defaults to the default docker0 interface, so if your host is already configured to relay mail, this should relay successfully with only those two set. diff --git a/start.sh b/start.sh index ceead8f..f84f375 100755 --- a/start.sh +++ b/start.sh @@ -8,6 +8,8 @@ if [[ ! -f ledgersmb.conf ]]; then sed -i \ -e "s/\(cache_templates = \).*\$/cache_templates = 1/g" \ -e "s/\(host = \).*\$/\1$POSTGRES_HOST/g" \ + -e "s/\(port = \).*\$/\1$POSTGRES_PORT/g" \ + -e "s/\(default_db = \).*\$/\1$DEFAULT_DB/g" \ -e "s%\(sendmail = \).*%\1/usr/bin/ssmtp%g" \ /srv/ledgersmb/ledgersmb.conf fi