* 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,94 +1,53 @@
-FROM        debian:stretch
+FROM        debian:jessie
 MAINTAINER  Freelock john@freelock.com
 
-# Install Perl, Tex, Starman, psql client, and all dependencies
+# Build time variables
-#
+ENV LSMB_VERSION 1.5.15
-# Without libclass-c3-xs-perl, everything grinds to a halt;
-# add it, because it's a 'recommends' it the dep tree, which
-# we're skipping, normally
-#
-# 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
 
-RUN echo "APT::Install-Recommends \"false\";\nAPT::Install-Suggests \"false\";" > /etc/apt/apt.conf.d/00recommends && \
+
-  DEBIAN_FRONTEND="noninteractive" apt-mark hold sensible-utils && \
+# Install Perl, Tex, Starman, psql client, and all dependencies
-  DEBIAN_FRONTEND="noninteractive" apt-get -y update && \
+# Without libclass-c3-xs-perl, performance is terribly slow...
-  DEBIAN_FRONTEND="noninteractive" apt-get -y upgrade && \
+RUN echo -n "APT::Install-Recommends \"0\";\nAPT::Install-Suggests \"0\";\n" >> /etc/apt/apt.conf && \
-  DEBIAN_FRONTEND="noninteractive" apt-get -y install \
+  DEBIAN_FRONTEND=noninteractive apt-get update && \
-    wget ca-certificates gnupg \
+    apt-get dist-upgrade -y && apt-get -y install \
     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 libfile-find-rule-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 \
+    libmoosex-nonmoose-perl libclass-c3-xs-perl \
     texlive-latex-recommended \
-    texlive-xetex fonts-liberation \
+    texlive-xetex \
     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 && \
+  DEBIAN_FRONTEND=noninteractive apt-get update && \
-  (wget --quiet -O - https://www.postgresql.org/media/keys/ACCC4CF8.asc | apt-key add -) && \
+    apt-get -y install git cpanminus make gcc libperl-dev && \
-  DEBIAN_FRONTEND="noninteractive" apt-get -y update && \
+    curl -Lo /tmp/ledgersmb-$LSMB_VERSION.tar.gz "https://download.ledgersmb.org/f/Releases/$LSMB_VERSION/ledgersmb-$LSMB_VERSION.tar.gz" && \
-  DEBIAN_FRONTEND="noninteractive" apt-get -y install postgresql-client && \
+    tar -xvzf /tmp/ledgersmb-$LSMB_VERSION.tar.gz --directory /srv && \
-  DEBIAN_FRONTEND="noninteractive" apt-get -y autoremove && \
+    rm -f /tmp/ledgersmb-$LSMB_VERSION.tar.gz && \
-  DEBIAN_FRONTEND="noninteractive" apt-get -y autoclean && \
-  rm -rf /var/lib/apt/lists/*
-
-
-# Build time variables
-ENV LSMB_VERSION 1.7.0-beta1
-ENV NODE_PATH /usr/local/lib/node_modules
-
-
-###########################################################
-# Java & Nodejs for doing Dojo build
-# Uglify needs to be installed right before 'make dojo'?!
-
-# These packages are only needed during the dojo build
-ENV DOJO_Build_Deps git make gcc libperl-dev curl nodejs
-# These packages can be removed after the dojo build
-ENV DOJO_Build_Deps_removal ${DOJO_Build_Deps} nodejs
-
-RUN wget --quiet -O - https://deb.nodesource.com/setup_8.x | bash -
-RUN DEBIAN_FRONTEND="noninteractive" apt-get -y update && \
-    DEBIAN_FRONTEND="noninteractive" apt-get -y install ${DOJO_Build_Deps} && \
-    cd /srv && \
-    git clone --recursive -b $LSMB_VERSION https://github.com/ledgersmb/LedgerSMB.git ledgersmb && \
-    cd ledgersmb && \
-    (curl -L https://cpanmin.us | perl - App::cpanminus) && \
     cpanm --quiet --notest \
       --with-feature=starman \
       --with-feature=latex-pdf-ps \
       --with-feature=openoffice \
-      --installdeps .  && \
+      --installdeps /srv/ledgersmb/ && \
-    npm install uglify-js@">=2.0 <3.0" && \
+    apt-get purge -y git cpanminus make gcc libperl-dev && \
-    make dojo && \
+    apt-get autoremove -y && \
-    DEBIAN_FRONTEND="noninteractive" apt-get -y purge ${DOJO_Build_Deps_removal} && \
+    apt-get autoclean && \
-    rm -rf /usr/local/lib/node_modules && \
+    rm -rf ~/.cpanm/ && \
-    DEBIAN_FRONTEND="noninteractive" apt-get -y autoremove && \
-    DEBIAN_FRONTEND="noninteractive" apt-get -y autoclean && \
-    rm -rf ~/.cpanm && \
     rm -rf /var/lib/apt/lists/*
 
-# Cleanup args that are for internal use
+WORKDIR /srv/ledgersmb
-ENV DOJO_Build_Deps=
+
-ENV DOJO_Build_Deps_removal=
+# master requirements
-ENV NODE_PATH=
 
 # Configure outgoing mail to use host, other run time variable defaults
 

README.md

@@ -1,16 +1,13 @@
 # ledgersmb-docker
-
 Dockerfile for LedgerSMB Docker image
 
 # Supported tags
 
-- `1.6`, `1.6.x`, `latest` - Latest official release from 1.6 branch 
+- `1.5`, `1.5.x`, `latest` - Latest release tarball from 1.5 branch
-- `1.5`, `1.5.x` - Latest official release 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
 
-Containers supporting the development process are provided
-through the ledgersmb-dev-docker project. See https://github.com/ledgersmb/ledgersmb-dev-docker/blob/master/README.md#getting-started.
 
 # What is LedgerSMB?
 
@@ -40,26 +37,7 @@ could require additional setup of a mail service or CUPS printer service.
 
 # How to use this image
 
-This image can be installed either automatically with the Docker compose file
+## Start a postgres instance
-manually with docker only.
-
-## Docker-Compose installation and start
-
-This image provides `docker-compose.yml` which can be used to pull related
-images, install them, establish an internal network for their communications,
-adjust environment variables, start and stop LedgerSMB. The only instructions
-required, after the optional edition of the file to adjust the environment
-variables, are:
-
-```plain
- $ docker-compose pull
- $ docker-compose up
-```
-
-
-## Manual installation
-
-### Start a postgres instance
 
 ```plain
  $ docker run -d --name postgres \
@@ -83,7 +61,7 @@ please use these commands instead:
               postgres:latest
 ```
 
-### Start LedgerSMB
+## Start LedgerSMB
 
 ```plain
  $ docker run -d -p 5762:5762 --name myledger \
@@ -94,7 +72,7 @@ This command maps port 5762 of your container to port 5762 in your host. The
 web application inside the container should now be accessible through
 http://localhost:5762/setup.pl.
 
-# Set up LedgerSMB
+## Set up LedgerSMB
 
  * Visit http://myledger:5762/setup.pl.
  * Log in with the "postgres" user and the password `mysecretpassword`
@@ -138,24 +116,16 @@ 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
 
-* `SSMTP_ROOT` (config: `Root`)
+* `SSMTP_ROOT`
-* `SSMTP_MAILHUB` (config: `Mailhub`)
+* `SSMTP_MAILHUB`
-* `SSMTP_HOSTNAME` (config: `Hostname`)
+* `SSMTP_HOSTNAME`
-* `SSMTP_USE_STARTTLS` (config: `UseSTARTTLS`)
+* `SSMTP_USE_STARTTLS`
-* `SSMTP_AUTH_USER` (config: `AuthUser`)
+* `SSMTP_AUTH_USER`
-* `SSMTP_AUTH_PASS` (config: `AuthPass`)
+* `SSMTP_AUTH_PASS`
-* `SSMTP_AUTH_METHOD` (config: `AuthMethod`)
+* `SSMTP_METHOD`
-* `SSMTP_FROMLINE_OVERRIDE` (config: `FromLineOverride`)
+* `SSMTP_FROMLINE_OVERRIDE`
 
 These variables are used to set outgoing SMTP defaults.
 
@@ -167,9 +137,6 @@ already configured to relay mail, this should relay successfully with only
 the root and hostname set.
 
 Use the other environment variables to relay mail through a different host.
-Use the [ssmtp.conf man
-page](https://www.systutorials.com/docs/linux/man/5-ssmtp.conf/) to look up
-the meaning and function of each of the mail configuration keys.
 
 # Troubleshooting/Developing
 

docker-compose.yml

@@ -1,72 +0,0 @@
-# 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,6 +20,9 @@ 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 \
@@ -27,10 +30,19 @@ fi
 #   --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

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
 }