* Automatic Dockerfile update by release process

As noted by John, requests improve by a factor 10 (20-30secs -> 2-3secs)
with this dependency in place.

Dockerfile

@@ -1,9 +1,12 @@
-FROM        perl:5
+FROM        debian:jessie
 MAINTAINER  Freelock john@freelock.com
 
+RUN echo -n "APT::Install-Recommends \"0\";\nAPT::Install-Suggests \"0\";\n" >> /etc/apt/apt.conf
+
 # Install Perl, Tex, Starman, psql client, and all dependencies
-RUN DEBIAN_FRONTENT=noninteractive && \
+# Without libclass-c3-xs-perl, performance is terribly slow...
-  apt-get update && apt-get -y install \
+RUN DEBIAN_FRONTEND=noninteractive 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,29 +18,42 @@ 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 libclass-c3-xs-perl \
     texlive-latex-recommended \
     texlive-xetex \
     starman \
     libopenoffice-oodoc-perl \
     postgresql-client \
-  ssmtp
+    ssmtp \
+    lsb-release \
+    && rm -rf /var/lib/apt/lists/*
+
 
 # Build time variables
-ENV LSMB_VERSION 1.5.0-beta6
+ENV LSMB_VERSION 1.5.12
 
 # Install LedgerSMB
-RUN cd /srv && \
+RUN DEBIAN_FRONTEND=noninteractive apt-get update && \
-  curl -Lo ledgersmb-$LSMB_VERSION.tar.gz https://sourceforge.net/projects/ledger-smb/files/Releases/$LSMB_VERSION/ledgersmb-$LSMB_VERSION.tar.gz/download && \
+    apt-get -y install git cpanminus make gcc libperl-dev && \
-  tar -xvzf ledgersmb-$LSMB_VERSION.tar.gz
+    cd /srv && \
-
+    curl -Lo ledgersmb-$LSMB_VERSION.tar.gz "http://download.ledgersmb.org/f/Releases/$LSMB_VERSION/ledgersmb-$LSMB_VERSION.tar.gz" && \
-WORKDIR /srv/ledgersmb
+    tar -xvzf ledgersmb-$LSMB_VERSION.tar.gz && \
-
+    rm -f ledgersmb-$LSMB_VERSION.tar.gz && \
-# 1.5 requirements
+    cd ledgersmb && \
-RUN cpanm --quiet --notest \
+    cpanm --quiet --notest \
       --with-feature=starman \
       --with-feature=latex-pdf-ps \
       --with-feature=openoffice \
-  --installdeps .
+      --installdeps . && \
+    apt-get purge -y git cpanminus make gcc libperl-dev && \
+    apt-get autoremove -y && \
+    apt-get autoclean && \
+    rm -rf ~/.cpanm/ && \
+    rm -rf /var/lib/apt/lists/*
+
+WORKDIR /srv/ledgersmb
+
+# master requirements
 
 # Configure outgoing mail to use host, other run time variable defaults
 
@@ -52,6 +68,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 +78,12 @@ 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
 
+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.x`, `latest` - Latest release tarball from 1.5 branch
-- `1.5`, `1.5.x` - Latest release tarball from 1.5 branch
+- `1.4`, `1.4.x` - Latest tagged release of git 1.4 branch
-- `1.4`, `latest` - 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

@@ -4,14 +4,25 @@ update_ssmtp.sh
 cd /srv/ledgersmb
 
 if [[ ! -f ledgersmb.conf ]]; then
-  cp conf/ledgersmb.conf.default ledgersmb.conf
+  cat <<EOF >/tmp/ledgersmb.conf
-  sed -i \
+[main]
-    -e "s/\(cache_templates = \).*\$/cache_templates = 1/g" \
+cache_templates = 1
-    -e "s/\(host = \).*\$/\1$POSTGRES_HOST/g" \
+
-    -e "s%\(sendmail   = \).*%\1/usr/bin/ssmtp%g" \
+[database]
-    /srv/ledgersmb/ledgersmb.conf
+host = $POSTGRES_HOST
+port = $POSTGRES_PORT
+default_db = $DEFAULT_DB
+
+[mail]
+sendmail   = /usr/sbin/ssmtp
+
+EOF
+  export LSMB_CONFIG_FILE='/tmp/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 \
@@ -21,6 +32,7 @@ fi
 
 # Needed for modules loaded by cpanm
 export PERL5LIB
+
 for PerlLib in /usr/lib/perl5* /usr/local/lib/perl5*/site_perl/* ; do
     [[ -d "$PerlLib" ]] && {
         PERL5LIB="$PerlLib";
@@ -30,4 +42,7 @@ done ;
 echo "Selected PERL5LIB=$PERL5LIB";
 
 # start ledgersmb
-exec starman --port 5762 tools/starman.psgi
+# --preload-app allows application initialization to kill the entire
+# starman instance (instead of just the worker, which will immediately
+# get restarted); it also has a positive effect on memory use
+exec starman --port 5762 --preload-app tools/starman.psgi

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
 }