* Automatic Dockerfile update by release process

Dockerfile

@@ -1,17 +1,12 @@
-FROM        debian:stretch-slim
+FROM        debian:jessie-slim
 MAINTAINER  Freelock john@freelock.com
 
 # Build time variables
-ENV LSMB_VERSION 1.6.12
+ENV LSMB_VERSION 1.5.19
 
 
 # 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
@@ -24,54 +19,46 @@ 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 -q && \
+  DEBIAN_FRONTEND=noninteractive apt-get update && \
-  DEBIAN_FRONTEND="noninteractive" apt-get dist-upgrade -y -q && \
+    apt-get dist-upgrade -y && apt-get -y install \
-  DEBIAN_FRONTEND="noninteractive" apt-get -y -q install \
+    curl wget ca-certificates \
-    wget ca-certificates gnupg \
     libcgi-emulate-psgi-perl libcgi-simple-perl libconfig-inifiles-perl \
-    libdbd-pg-perl libdbi-perl libdata-uuid-perl libdatetime-perl \
+    libdbd-pg-perl libdbi-perl libdatetime-perl \
-    libdatetime-format-strptime-perl libio-stringy-perl \
+    libdatetime-format-strptime-perl libdigest-md5-perl \
-    libjson-xs-perl libcpanel-json-xs-perl liblist-moreutils-perl \
+    libfile-mimeinfo-perl libjson-xs-perl libjson-perl \
     liblocale-maketext-perl liblocale-maketext-lexicon-perl \
-    liblog-log4perl-perl libmime-lite-perl libmime-types-perl \
+    liblog-log4perl-perl libmime-base64-perl libmime-lite-perl \
-    libmath-bigint-gmp-perl libmodule-runtime-perl libmoose-perl \
+    libmath-bigint-gmp-perl libmoose-perl libnumber-format-perl \
-    libmoosex-nonmoose-perl libnumber-format-perl \
     libpgobject-perl libpgobject-simple-perl libpgobject-simple-role-perl \
-    libpgobject-type-bigfloat-perl libpgobject-type-datetime-perl \
+    libpgobject-util-dbmethod-perl libplack-perl libtemplate-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 \
-    libimage-size-perl \
     libtemplate-plugin-latex-perl libtex-encode-perl \
-    libclass-c3-xs-perl libclass-accessor-lite-perl \
+    libmoosex-nonmoose-perl libclass-c3-xs-perl \
-    libnet-cidr-lite-perl libtest-requires-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 -q -y update && \
+  DEBIAN_FRONTEND="noninteractive" apt-get -y update && \
-  DEBIAN_FRONTEND="noninteractive" apt-get -q -y install postgresql-client && \
+  DEBIAN_FRONTEND="noninteractive" apt-get -y install postgresql-client && \
-  DEBIAN_FRONTEND="noninteractive" apt-get -q -y install git cpanminus make gcc libperl-dev && \
+  DEBIAN_FRONTEND=noninteractive apt-get -y install git cpanminus make gcc libperl-dev && \
-  wget --quiet -O /tmp/ledgersmb-$LSMB_VERSION.tar.gz "https://download.ledgersmb.org/f/Releases/$LSMB_VERSION/ledgersmb-$LSMB_VERSION.tar.gz" && \
+    curl -Lo /tmp/ledgersmb-$LSMB_VERSION.tar.gz "https://download.ledgersmb.org/f/Releases/$LSMB_VERSION/ledgersmb-$LSMB_VERSION.tar.gz" && \
-  tar -xzf /tmp/ledgersmb-$LSMB_VERSION.tar.gz --directory /srv && \
+    tar -xvzf /tmp/ledgersmb-$LSMB_VERSION.tar.gz --directory /srv && \
-  rm -f /tmp/ledgersmb-$LSMB_VERSION.tar.gz && \
+    rm -f /tmp/ledgersmb-$LSMB_VERSION.tar.gz && \
-  cpanm --notest \
+    cpanm --quiet --notest \
-    --with-feature=starman \
+      --with-feature=starman \
-    --with-feature=latex-pdf-ps \
+      --with-feature=latex-pdf-ps \
-    --with-feature=openoffice \
+      --with-feature=openoffice \
-    --installdeps /srv/ledgersmb/ && \
+      --installdeps /srv/ledgersmb/ && \
-  apt-get purge -q -y git cpanminus make gcc libperl-dev && \
+    apt-get purge -y git cpanminus make gcc libperl-dev && \
-  apt-get autoremove -q -y && \
+    apt-get autoremove -y && \
-  apt-get autoclean -q && \
+    apt-get autoclean && \
-  rm -rf ~/.cpanm/ && \
+    rm -rf ~/.cpanm/ && \
-  rm -rf /var/lib/apt/lists/* /usr/share/man/*
+    rm -rf /var/lib/apt/lists/* /usr/share/man/*
 
 
 WORKDIR /srv/ledgersmb

README.md

@@ -3,9 +3,10 @@ Dockerfile for LedgerSMB Docker image
 
 # Supported tags
 
-- `1.6`, `1.6.x`, `latest` - Latest release tarball from 1.6 branch
+- `1.5`, `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
+- `master` - Master branch from git, unstable
+- `master-dev`, `1.5-dev` - Containers to kick off a development setup
 
 
 # What is LedgerSMB?
@@ -39,12 +40,12 @@ could require additional setup of a mail service or CUPS printer service.
 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
+  https://github.com/ledgersmb/ledgersmb-docker/blob/1.5/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
+with TLS 1.2 support -- a requirement if you want to access your
 installation over any type of network.
 
 # How to use this image
@@ -128,17 +129,9 @@ 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.
+The docker image uses `ssmtp` to send mail. 
 
 * `SSMTP_ROOT` (config: `Root`)
 * `SSMTP_MAILHUB` (config: `Mailhub`)

docker-compose.yml

@@ -12,10 +12,7 @@
 
 version: "3.2"
 services:
-  # Note that the container needs to be named "postgres" here,
+  db:
-  # 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
@@ -24,32 +21,15 @@ services:
     networks:
       - internal
     volumes:
-      - "pgdata:/var/lib/postgresql/data"
+      - "dbdata:/var/lib/postgresql/data"
   lsmb:
     depends_on:
-      - postgres
+      - db
-    image: ledgersmb/ledgersmb:1.6
+    image: ledgersmb/ledgersmb:1.5
     networks:
       - internal
       - default
-    # Uncomment the 'ports' section to map the LedgerSMB container port (5762)
+    # environment:
-    #  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:
@@ -65,7 +45,7 @@ services:
 # the rest of the image and on update/upgrade, the
 # data will be lost.
 volumes:
-  pgdata:
+  dbdata:
 
 
 networks:

start.sh

@@ -45,5 +45,4 @@ echo "Selected PERL5LIB=$PERL5LIB";
 # --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} --preload-app bin/ledgersmb-server.psgi