* Update Dockerfile to 1.5.6

Fixes #6.

Dockerfile

@@ -1,9 +1,13 @@
 FROM        perl:5
 MAINTAINER  Freelock john@freelock.com
 
+# Use postgres repository to get newer pg_dump and postgres client
+RUN wget --quiet -O - https://www.postgresql.org/media/keys/ACCC4CF8.asc | apt-key add - && \
+  echo "deb http://apt.postgresql.org/pub/repos/apt/ jessie-pgdg main 9.6" |tee /etc/apt/sources.list.d/postgres.list
+
 # Install Perl, Tex, Starman, psql client, and all dependencies
 RUN DEBIAN_FRONTENT=noninteractive && \
-  apt-get update && apt-get -y install \
+  apt-get update && apt-get dist-upgrade -y && apt-get -y install \
   libcgi-emulate-psgi-perl libcgi-simple-perl libconfig-inifiles-perl \
   libdbd-pg-perl libdbi-perl libdatetime-perl \
   libdatetime-format-strptime-perl libdigest-md5-perl \
@@ -15,20 +19,23 @@ RUN DEBIAN_FRONTENT=noninteractive && \
   libpgobject-util-dbmethod-perl libplack-perl libtemplate-perl \
   libnamespace-autoclean-perl \
   libtemplate-plugin-latex-perl libtex-encode-perl \
+  libmoosex-nonmoose-perl \
   texlive-latex-recommended \
   texlive-xetex \
   starman \
   libopenoffice-oodoc-perl \
-  postgresql-client \
+  postgresql-client-9.6 \
+  lpr \
   ssmtp
 
 # Build time variables
-ENV LSMB_VERSION 1.5.0-beta6
+ENV LSMB_VERSION 1.5.6
 
 # Install LedgerSMB
 RUN cd /srv && \
-  curl -Lo ledgersmb-$LSMB_VERSION.tar.gz https://sourceforge.net/projects/ledger-smb/files/Releases/$LSMB_VERSION/ledgersmb-$LSMB_VERSION.tar.gz/download && \
+  curl -Lo ledgersmb-$LSMB_VERSION.tar.gz "http://downloads.sourceforge.net/project/ledger-smb/Releases/$LSMB_VERSION/ledgersmb-$LSMB_VERSION.tar.gz?r=https%3A%2F%2Fsourceforge.net%2Fprojects%2Fledger-smb%2Ffiles%2FReleases%2F$LSMB_VERSION%2F&ts=1483124209&use_mirror=superb-sea2" && \
   tar -xvzf ledgersmb-$LSMB_VERSION.tar.gz
+  # https://sourceforge.net/projects/ledger-smb/files/Releases/$LSMB_VERSION/ledgersmb-$LSMB_VERSION.tar.gz/download && \
 
 WORKDIR /srv/ledgersmb
 
@@ -52,6 +59,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
@@ -60,9 +69,14 @@ RUN chown www-data /etc/ssmtp /etc/ssmtp/ssmtp.conf && \
   chmod +x /usr/local/bin/update_ssmtp.sh /usr/local/bin/start.sh && \
   mkdir -p /var/www
 
+# Work around an aufs bug related to directory permissions:
+RUN mkdir -p /tmp && \
+  chmod 1777 /tmp
 
 # Internal Port Expose
 EXPOSE 5762
-#USER www-data
+# If ledgersmb.conf does not exist, www-data user needs to be able to create it.
+RUN chown www-data /srv/ledgersmb
+USER www-data
 
 CMD ["start.sh"]

README.md

@@ -1,13 +1,14 @@
-# ledgersmb-docker - EXPERIMENTAL
+# ledgersmb-docker
 Dockerfile for LedgerSMB Docker image
 
 This is a work in progress to make a docker image for running LedgerSMB. It should not be relied upon for production use!
 
 # Supported tags and respective `Dockerfile` links
 
--	`dev-master` - Master branch from git, unstable
-- `1.5`, `1.5.x` - Latest release tarball from 1.5 branch
-- `1.4`, `latest` - Latest tagged release of git 1.4 branch
+- `1.5.x`, `latest` - Latest release tarball from 1.5 branch
+- `1.4`, `1.4.x` - Latest tagged release of git 1.4 branch
+-	`dev-master` - Master (1.6) branch from git, unstable, updated only on demand
+- `1.5` - Develop HEAD of 1.5 branch, updated only on demand
 
 
 # What is LedgerSMB?
@@ -62,6 +63,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.

start.sh

@@ -8,10 +8,15 @@ if [[ ! -f ledgersmb.conf ]]; then
   sed -i \
     -e "s/\(cache_templates = \).*\$/cache_templates = 1/g" \
     -e "s/\(host = \).*\$/\1$POSTGRES_HOST/g" \
-    -e "s%\(sendmail   = \).*%\1/usr/bin/ssmtp%g" \
+    -e "s/\(port = \).*\$/\1$POSTGRES_PORT/g" \
+    -e "s/\(default_db = \).*\$/\1$DEFAULT_DB/g" \
+    -e "s%\(sendmail   = \).*%\1/usr/sbin/ssmtp%g" \
     /srv/ledgersmb/ledgersmb.conf
 fi
 
+if [ ! -f "/tmp/ledgersmb" ]; then
+  mkdir /tmp/ledgersmb
+fi
 # Currently unmaintained/untested
 # if [ ! -z ${CREATE_DATABASE+x} ]; then
 #   perl tools/dbsetup.pl --company $CREATE_DATABASE \

update_ssmtp.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 ConfiguredComment='# install script update_ssmtp.sh has configured ssmtp'
-grep -qc "$ConfiguredComment" /etc/ssmtp.conf && {
+grep -qc "$ConfiguredComment" /etc/ssmtp/ssmtp.conf && {
     echo "smtp configured."
     exit
 }