Update Dockerfile for 1.5.7 release

Dockerfile

@@ -1,9 +1,11 @@
-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 && \
-  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 \
@@ -21,21 +23,20 @@ RUN DEBIAN_FRONTENT=noninteractive && \
   starman \
   libopenoffice-oodoc-perl \
   postgresql-client \
-  lpr \
+  ssmtp \
-  ssmtp
+  git cpanminus make gcc libperl-dev lsb-release
 
 # Build time variables
-ENV LSMB_VERSION 1.5.4
+ENV LSMB_VERSION 1.5.7
 
 # Install LedgerSMB
 RUN cd /srv && \
-  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" && \
+  curl -Lo ledgersmb-$LSMB_VERSION.tar.gz "https://github.com/ledgersmb/LedgerSMB/releases/download/$LSMB_VERSION/ledgersmb-$LSMB_VERSION.tar.gz" && \
   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
 
-# 1.5 requirements
+# master requirements
 RUN cpanm --quiet --notest \
   --with-feature=starman \
   --with-feature=latex-pdf-ps \

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` - 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?

start.sh

@@ -14,6 +14,9 @@ if [[ ! -f ledgersmb.conf ]]; then
     /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 \
@@ -32,4 +35,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
 }