* Automatic Dockerfile update by release process

Starman is looking for LedgerSMB::PSGI and can't find it due to missing
library paths. Add -I arguments to fix it up.

Dockerfile

@@ -1,16 +1,26 @@
-FROM        debian:jessie-slim
+FROM        debian:stretch-slim
 MAINTAINER  Freelock john@freelock.com
 
 # Build time variables
-ENV LSMB_VERSION 1.5.17
-
+ARG LSMB_VERSION="1.7.1"
+ARG LSMB_DL_DIR="Releases"
 
 # Install Perl, Tex, Starman, psql client, and all dependencies
 # Without libclass-c3-xs-perl, performance is terribly slow...
+# Without libclass-accessor-lite-perl, HTML::Entities won't build from CPAN
+# libnet-cidr-lite-perl is a dependency for Plack::Builder::Conditionals
+#   which is being installed from CPAN
+# libtest-requires-perl is a dependency of Module-Build-Pluggable-PPPort
+#   on which HTML::Escape depends
 
 # Installing psql client directly from instructions at https://wiki.postgresql.org/wiki/Apt
 # That mitigates issues where the PG instance is running a newer version than this container
 
+# for Buster, add:
+#    libhtml-escape-perl \
+#    libplack-middleware-builder-conditionals-perl \
+#    libplack-request-withencoding-perl \
+#libversion-compare-perl
 RUN echo -n "APT::Install-Recommends \"0\";\nAPT::Install-Suggests \"0\";\n" >> /etc/apt/apt.conf && \
   mkdir -p /usr/share/man/man1/ && \
   mkdir -p /usr/share/man/man2/ && \
@@ -19,46 +29,55 @@ RUN echo -n "APT::Install-Recommends \"0\";\nAPT::Install-Suggests \"0\";\n" >>
   mkdir -p /usr/share/man/man5/ && \
   mkdir -p /usr/share/man/man6/ && \
   mkdir -p /usr/share/man/man7/ && \
-  DEBIAN_FRONTEND=noninteractive apt-get update && \
-    apt-get dist-upgrade -y && apt-get -y install \
-    curl wget ca-certificates \
-    libcgi-emulate-psgi-perl libcgi-simple-perl libconfig-inifiles-perl \
-    libdbd-pg-perl libdbi-perl libdatetime-perl \
-    libdatetime-format-strptime-perl libdigest-md5-perl \
-    libfile-mimeinfo-perl libjson-xs-perl libjson-perl \
+  DEBIAN_FRONTEND="noninteractive" apt-get update -q && \
+  DEBIAN_FRONTEND="noninteractive" apt-get dist-upgrade -y -q && \
+  DEBIAN_FRONTEND="noninteractive" apt-get -y -q install \
+    wget ca-certificates gnupg \
+    libcgi-emulate-psgi-perl libconfig-inifiles-perl \
+    libdbd-pg-perl libdbi-perl libdata-uuid-perl libdatetime-perl \
+    libdatetime-format-strptime-perl \
+    libio-stringy-perl \
+    libcpanel-json-xs-perl liblist-moreutils-perl \
     liblocale-maketext-perl liblocale-maketext-lexicon-perl \
-    liblog-log4perl-perl libmime-base64-perl libmime-lite-perl \
-    libmath-bigint-gmp-perl libmoose-perl libnumber-format-perl \
+    liblog-log4perl-perl libmime-lite-perl libmime-types-perl \
+    libmath-bigint-gmp-perl libmodule-runtime-perl libmoose-perl \
+    libmoosex-nonmoose-perl libnumber-format-perl \
     libpgobject-perl libpgobject-simple-perl libpgobject-simple-role-perl \
-    libpgobject-util-dbmethod-perl libplack-perl libtemplate-perl \
+    libpgobject-type-bigfloat-perl libpgobject-type-datetime-perl \
+    libpgobject-type-bytestring-perl libpgobject-util-dbmethod-perl \
+    libpgobject-util-dbadmin-perl libplack-perl \
+    libplack-middleware-reverseproxy-perl \
+    libtemplate-perl libtext-csv-perl libtext-csv-xs-perl \
+    libtext-markdown-perl  libxml-simple-perl \
     libnamespace-autoclean-perl \
+    libfile-find-rule-perl \
     libtemplate-plugin-latex-perl libtex-encode-perl \
-    libmoosex-nonmoose-perl libclass-c3-xs-perl \
+    libclass-c3-xs-perl libclass-accessor-lite-perl \
+    libnet-cidr-lite-perl \
     texlive-latex-recommended \
     texlive-xetex fonts-liberation \
     starman \
     libopenoffice-oodoc-perl \
-    postgresql-client \
     ssmtp \
     lsb-release && \
   echo "deb http://apt.postgresql.org/pub/repos/apt/ $(lsb_release -cs)-pgdg main" > /etc/apt/sources.list.d/pgdg.list && \
   (wget --quiet -O - https://www.postgresql.org/media/keys/ACCC4CF8.asc | apt-key add -) && \
-  DEBIAN_FRONTEND="noninteractive" apt-get -y update && \
-  DEBIAN_FRONTEND="noninteractive" apt-get -y install postgresql-client && \
-  DEBIAN_FRONTEND=noninteractive apt-get -y install git cpanminus make gcc libperl-dev && \
-    curl -Lo /tmp/ledgersmb-$LSMB_VERSION.tar.gz "https://download.ledgersmb.org/f/Releases/$LSMB_VERSION/ledgersmb-$LSMB_VERSION.tar.gz" && \
-    tar -xvzf /tmp/ledgersmb-$LSMB_VERSION.tar.gz --directory /srv && \
-    rm -f /tmp/ledgersmb-$LSMB_VERSION.tar.gz && \
-    cpanm --quiet --notest \
-      --with-feature=starman \
-      --with-feature=latex-pdf-ps \
-      --with-feature=openoffice \
-      --installdeps /srv/ledgersmb/ && \
-    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/* /usr/share/man/*
+  DEBIAN_FRONTEND="noninteractive" apt-get -q -y update && \
+  DEBIAN_FRONTEND="noninteractive" apt-get -q -y install postgresql-client && \
+  DEBIAN_FRONTEND="noninteractive" apt-get -q -y install git cpanminus make gcc libperl-dev && \
+  wget --quiet -O /tmp/ledgersmb-$LSMB_VERSION.tar.gz "https://download.ledgersmb.org/f/$LSMB_DL_DIR/$LSMB_VERSION/ledgersmb-$LSMB_VERSION.tar.gz" && \
+  tar -xzf /tmp/ledgersmb-$LSMB_VERSION.tar.gz --directory /srv && \
+  rm -f /tmp/ledgersmb-$LSMB_VERSION.tar.gz && \
+  cpanm --notest \
+    --with-feature=starman \
+    --with-feature=latex-pdf-ps \
+    --with-feature=openoffice \
+    --installdeps /srv/ledgersmb/ && \
+  apt-get purge -q -y git cpanminus make gcc libperl-dev && \
+  apt-get autoremove -q -y && \
+  apt-get autoclean -q && \
+  rm -rf ~/.cpanm/ && \
+  rm -rf /var/lib/apt/lists/* /usr/share/man/*
 
 
 WORKDIR /srv/ledgersmb

README.md

@@ -3,10 +3,9 @@ Dockerfile for LedgerSMB Docker image
 
 # Supported tags
 
-- `1.5`, `1.5.x`, `latest` - Latest release tarball from 1.5 branch
+- `1.6`, `1.6.x`, `latest` - Latest release tarball from 1.6 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
-- `master` - Master branch from git, unstable
-- `master-dev`, `1.5-dev` - Containers to kick off a development setup
 
 
 # What is LedgerSMB?
@@ -35,6 +34,19 @@ to add the TLS layer by applying Nginx or Apache as reverse proxy.
 Enabling optional functionalities such as outgoing e-mail and printing
 could require additional setup of a mail service or CUPS printer service.
 
+# Quickstart
+
+The quickest way to get this image up and running is by using the
+`docker-compose` file available through the GitHub repository at:
+
+  https://github.com/ledgersmb/ledgersmb-docker/blob/1.6/docker-compose.yml
+
+which sets up both this image and a supporting database image for
+production purposes (i.e. with persistent (database) data, with the
+exception of one thing: setting up an Nginx or Apache reverse proxy
+with TLS 1.2/1.3 support -- a requirement if you want to access your
+installation over any type of network.
+
 # How to use this image
 
 ## Start a postgres instance
@@ -116,8 +128,18 @@ Default: lsmb
 Set this if you want to automatically log in to a particular LedgerSMB database
 without needing to enter the name of that database on the login.pl login screen.
 
+## `LSMB_WORKERS`
+
+Default: 5
+
+Set this if you want to run in a memory-constrained environment. E.g. set it to
+2 when running in a 1 GB memory setup. Please do note that this may adversely
+affect the performance experience of users.
+
 ## Mail configuration
 
+The docker image uses `ssmtp` to send mail.
+
 * `SSMTP_ROOT` (config: `Root`)
 * `SSMTP_MAILHUB` (config: `Mailhub`)
 * `SSMTP_HOSTNAME` (config: `Hostname`)

docker-compose.yml

@@ -0,0 +1,72 @@
+# This docker-compose file creates one
+# compose 'project' consisting of two containers
+#
+#  1. The PostgreSQL data  container
+#  2. The LedgerSMB application container
+#
+# LedgerSMB persists all its data in the database,
+# so no special care needs to be taken on
+# container upgrades.  With PostgreSQL, data is
+# persisted across upgrades by the use of a
+# special 'dbdata' volume
+
+version: "3.2"
+services:
+  # Note that the container needs to be named "postgres" here,
+  # because that allows us to use the default hostname ("postgres")
+  # from the LedgerSMB configuration
+  postgres:
+    image: postgres:9.6-alpine
+    environment:
+      # Replace the password below for a secure setup
+      POSTGRES_PASSWORD: abc
+      PGDATA: /var/lib/postgresql/data/pgdata
+    networks:
+      - internal
+    volumes:
+      - "pgdata:/var/lib/postgresql/data"
+  lsmb:
+    depends_on:
+      - postgres
+    image: ledgersmb/ledgersmb:1.6
+    networks:
+      - internal
+      - default
+    # Uncomment the 'ports' section to map the LedgerSMB container port (5762)
+    #  to the host's port of the same number, thus making LedgerSMB
+    #  available on http://<host-dns-or-ip>:5762/
+    #     SECURITY NOTE: Do this for evaluation purposes only!
+    #       In production, be sure to use SSL/TLS to protect user's passwords
+    #       and other sensitive data
+    # ports:
+    #   - "5762:5762"
+    environment:
+      # The LSMB_WORKERS environment variable lets you select the number
+      # of processes serving HTTP requests. The default number of 2 workers
+      # is geared toward limited-memory situations (1 GB). In order to
+      # improve the performance experience, increase memory and the
+      # number of workers
+      #
+      LSMB_WORKERS: 2
+      #
+      #
+      # SSMTP_ROOT:
+      # SSMTP_HOSTNAME:
+      # SSMTP_MAILHUB:
+      # SSMTP_AUTH_USER:
+      # SSMTP_AUTH_PASS:
+      # SSMTP_AUTH_METHOD:
+      # SSMTP_USE_STARTTLS:
+      # SSMTP_FROMLINE_OVERRIDE:
+
+# having the dbdata volume is required to persist our
+# data between PostgreSQL container updates; without
+# that, the data is contained in the same volume as
+# the rest of the image and on update/upgrade, the
+# data will be lost.
+volumes:
+  pgdata:
+
+
+networks:
+  internal:

start.sh

@@ -20,29 +20,14 @@ EOF
   export LSMB_CONFIG_FILE='/tmp/ledgersmb.conf'
 fi
 
-if [ ! -f "/tmp/ledgersmb" ]; then
-  mkdir /tmp/ledgersmb
+if [ ! -d "/tmp/ledgersmb" ]; then
+  mkdir -p /tmp/ledgersmb
 fi
-# Currently unmaintained/untested
-# if [ ! -z ${CREATE_DATABASE+x} ]; then
-#   perl tools/dbsetup.pl --company $CREATE_DATABASE \
-#   --host $POSTGRES_HOST \
-#   --postgres_password "$POSTGRES_PASS"
-#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";
-        echo -e "\tmaybe: $PerlLib";
-    }
-done ;
-echo "Selected PERL5LIB=$PERL5LIB";
 
 # start ledgersmb
 # --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
+
+exec starman --port 5762 --workers ${LSMB_WORKERS:-5} -I lib -I old/lib \
+        --preload-app bin/ledgersmb-server.psgi