* Automatic Dockerfile update by release process

We've seen multiple users thinking that simple creation of two containers
is enough, whereas this isn't the case: at the very least, the deprecated
`--link` docker option must be used, but more compliant is the use of
custom networks and bridges. Docker-compose sets all that up automatically,
so don't suggest going without docker-compose is simpler.

Dockerfile

@@ -1,25 +1,43 @@
-FROM        debian:stretch
+FROM        debian:stretch-slim
 MAINTAINER  Freelock john@freelock.com
 
+# Build time variables
+ARG LSMB_VERSION="1.7.12"
+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-c3-xs-perl, everything grinds to a halt;
+# Without libclass-accessor-lite-perl, HTML::Entities won't build from CPAN
-# add it, because it's a 'recommends' it the dep tree, which
+# libnet-cidr-lite-perl is a dependency for Plack::Builder::Conditionals
-# we're skipping, normally
+#   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
 
-RUN echo "APT::Install-Recommends \"false\";\nAPT::Install-Suggests \"false\";" > /etc/apt/apt.conf.d/00recommends && \
+# for Buster, add:
-  DEBIAN_FRONTEND="noninteractive" apt-mark hold sensible-utils && \
+#    libhtml-escape-perl \
-  DEBIAN_FRONTEND="noninteractive" apt-get -y update && \
+#    libplack-middleware-builder-conditionals-perl \
-  DEBIAN_FRONTEND="noninteractive" apt-get -y upgrade && \
+#    libplack-request-withencoding-perl \
-  DEBIAN_FRONTEND="noninteractive" apt-get -y install \
+#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/ && \
+  mkdir -p /usr/share/man/man3/ && \
+  mkdir -p /usr/share/man/man4/ && \
+  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 dist-upgrade -y -q && \
+  DEBIAN_FRONTEND="noninteractive" apt-get -y -q install \
     wget ca-certificates gnupg \
-    libcgi-emulate-psgi-perl libcgi-simple-perl libconfig-inifiles-perl \
+    libcgi-emulate-psgi-perl libconfig-inifiles-perl \
     libdbd-pg-perl libdbi-perl libdata-uuid-perl libdatetime-perl \
-    libdatetime-format-strptime-perl libio-stringy-perl \
+    libdatetime-format-strptime-perl \
-    libjson-xs-perl libcpanel-json-xs-perl liblist-moreutils-perl \
+    libio-stringy-perl \
+    libcpanel-json-xs-perl liblist-moreutils-perl \
     liblocale-maketext-perl liblocale-maketext-lexicon-perl \
     liblog-log4perl-perl libmime-lite-perl libmime-types-perl \
     libmath-bigint-gmp-perl libmodule-runtime-perl libmoose-perl \
@@ -27,14 +45,15 @@ RUN echo "APT::Install-Recommends \"false\";\nAPT::Install-Suggests \"false\";"
     libpgobject-perl libpgobject-simple-perl libpgobject-simple-role-perl \
     libpgobject-type-bigfloat-perl libpgobject-type-datetime-perl \
     libpgobject-type-bytestring-perl libpgobject-util-dbmethod-perl \
-    libpgobject-util-dbadmin-perl libplack-perl libfile-find-rule-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 \
+    libtext-markdown-perl  libxml-simple-perl \
     libnamespace-autoclean-perl \
-    libimage-size-perl \
+    libfile-find-rule-perl \
     libtemplate-plugin-latex-perl libtex-encode-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 \
@@ -43,52 +62,27 @@ RUN echo "APT::Install-Recommends \"false\";\nAPT::Install-Suggests \"false\";"
     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 -q -y update && \
-  DEBIAN_FRONTEND="noninteractive" apt-get -y install postgresql-client && \
+  DEBIAN_FRONTEND="noninteractive" apt-get -q -y install postgresql-client && \
-  DEBIAN_FRONTEND="noninteractive" apt-get -y autoremove && \
+  DEBIAN_FRONTEND="noninteractive" apt-get -q -y install git cpanminus make gcc libperl-dev && \
-  DEBIAN_FRONTEND="noninteractive" apt-get -y autoclean && \
+  wget --quiet -O /tmp/ledgersmb-$LSMB_VERSION.tar.gz "https://download.ledgersmb.org/f/$LSMB_DL_DIR/$LSMB_VERSION/ledgersmb-$LSMB_VERSION.tar.gz" && \
-  rm -rf /var/lib/apt/lists/*
+  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/*
 
 
-# Build time variables
+WORKDIR /srv/ledgersmb
-ENV LSMB_VERSION 1.7.0-alpha1
-ENV NODE_PATH /usr/local/lib/node_modules
 
-
+# master requirements
-###########################################################
-# 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 .  && \
-    npm install uglify-js@">=2.0 <3.0" && \
-    make dojo && \
-    DEBIAN_FRONTEND="noninteractive" apt-get -y purge ${DOJO_Build_Deps_removal} && \
-    rm -rf /usr/local/lib/node_modules && \
-    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
-ENV DOJO_Build_Deps=
-ENV DOJO_Build_Deps_removal=
-ENV NODE_PATH=
 
 # Configure outgoing mail to use host, other run time variable defaults
 

README.md

@@ -1,13 +1,17 @@
 # ledgersmb-docker
+
 Dockerfile for LedgerSMB Docker image
 
 # Supported tags
 
-- `1.5`, `1.5.x`, `latest` - Latest release tarball from 1.5 branch
+- `1.7`, `1.7.x`, `latest` - Latest official release from 1.7 branch
-- `1.4`, `1.4.x` - Latest tagged release of git 1.4 branch
+- `1.6`, `1.6.x` - Latest official release from 1.6 branch 
+- `1.5`, `1.5.30` - Last official release from 1.5 branch
+- `1.4`, `1.4.42` - Last official release from 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?
 
@@ -53,49 +57,44 @@ variables, are:
  $ docker-compose up
 ```
 
+This will set up two containers: (1) a PostgreSQL container with persistent
+storage which is retained between container updates and (2) a LedgerSMB
+container configured to connect to the PostgreSQL container as its database
+server.
+
+The database username and password are:
+
+```plain
+   username: postgres
+   password: abc
+```
 
 ## Manual installation
 
-### Start a postgres instance
+This section assumes availability of a PostgreSQL server to attach to the
-
+LedgerSMB image as the database server.
-```plain
- $ docker run -d --name postgres \
-              -e POSTGRES_PASSWORD=mysecretpassword \
-              postgres:latest
-```
-
-BEWARE: The command above creates a container with the database data stored
-*inside* the container. Upon removal of the container, the database data will
-be removed too!
-
-To prevent destruction of the database data upon replacement of the container,
-please use these commands instead:
-
-```plain
- $ docker volume create dbdata
- $ docker run -d --name postgres \
-              -e POSTGRES_PASSWORD=mysecretpassword \
-              -e PGDATA=/var/lib/postgresql/data/pgdata \
-              -v dbdata:/var/lib/postgresql/data \
-              postgres:latest
-```
 
 ### Start LedgerSMB
 
 ```plain
  $ docker run -d -p 5762:5762 --name myledger \
-              ledgersmb/ledgersmb:latest
+              -e POSTGRES_HOST=<ip/hostname> ledgersmb/ledgersmb:latest
 ```
 
 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.
+http://localhost:5762/setup.pl and http://localhost:5762/login.pl.
+
+Below are more variables which determine container configuration,
+like `POSTGRES_HOST` above.
 
 # Set up LedgerSMB
 
  * Visit http://myledger:5762/setup.pl.
- * Log in with the "postgres" user and the password `mysecretpassword`
+ * Log in with the "postgres" user and the password `abc` as given above -
-   and provide the name of a company (= database name) you want to create.
+   or with the credentials of your own database server in case of a manual
+   setup - and provide the name of a company (= database name) you want to
+   create.
  * Go over the steps presented in the browser
 
 Once you have completed the setup steps, you have a fully functional
@@ -145,19 +144,18 @@ affect the performance experience of users.
 
 ## Mail configuration
 
-* `SSMTP_ROOT` (config: `Root`)
+### Before 1.8.0
+
+These variables are used to set outgoing SMTP defaults.
+
+* `SSMTP_ROOT` (config: `Root` -- DEPRECATED)
 * `SSMTP_MAILHUB` (config: `Mailhub`)
 * `SSMTP_HOSTNAME` (config: `Hostname`)
 * `SSMTP_USE_STARTTLS` (config: `UseSTARTTLS`)
 * `SSMTP_AUTH_USER` (config: `AuthUser`)
 * `SSMTP_AUTH_PASS` (config: `AuthPass`)
-* `SSMTP_AUTH_METHOD` (config: `AuthMethod`)
+* `SSMTP_AUTH_METHOD` (config: `AuthMethod` -- DEPRECATED)
-* `SSMTP_FROMLINE_OVERRIDE` (config: `FromLineOverride`)
+* `SSMTP_FROMLINE_OVERRIDE` (config: `FromLineOverride` -- DEPRECATED)
-
-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
@@ -168,6 +166,25 @@ 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.
 
+### 1.8.0 and higher (under development)
+
+As of 1.8.0, the image is based on Debian Buster instead of Debian Stretch;
+with Buster, the `ssmtp` program has been removed from Debian, this image
+had to change strategy. The main application always came with built-in e-mail
+yet with the deprecation, the abilities have expanded.
+
+The following parameters are now supported to set mail preferences:
+
+* `LSMB_MAIL_SMTPHOST`
+* `LSMB_MAIL_SMTPPORT`
+* `LSMB_MAIL_SMTPTLS`
+* `LSMB_MAIL_SMTPSENDER_HOSTNAME`
+* `LSMB_MAIL_SMTPUSER`
+* `LSMB_MAIL_SMTPPASS`
+* `LSMB_MAIL_SMTPAUTHMECH`
+
+
+
 # Troubleshooting/Developing
 
 Currently the LedgerSMB installation is in /srv/ledgersmb
@@ -178,11 +195,18 @@ and the startup & config script is /usr/bin/start.sh.
 
 ## Issues
 
-If you have any problems with or questions about this image or LedgerSMB, please contact us on the [mailing list](http://ledgersmb.org/topic/support/mailing-lists-rss-and-nntp-feeds) or through a [GitHub issue](https://github.com/ledgersmb/ledgersmb-docker/issues).
+If you have any problems with or questions about this image or LedgerSMB,
+please contact us on the [mailing list](http://ledgersmb.org/topic/support/mailing-lists-rss-and-nntp-feeds)
+or through a [GitHub issue](https://github.com/ledgersmb/ledgersmb-docker/issues).
 
-You can also reach some of the official LedgerSMB maintainers via the `#ledgersmb` IRC channel on [Freenode](https://freenode.net), or on the bridged [Matrix](https://matrix.org) room in [#ledgersmb:matrix.org](https://matrix.to/#/#ledgersmb:matrix.org). The [Riot.im](https://riot.im/app/#/room/#ledgersmb:matrix.org) Matrix client is highly recommended.
+You can also reach some of the official LedgerSMB maintainers via the
+`#ledgersmb` IRC channel on [Freenode](https://freenode.net), or on the
+bridged [Matrix](https://matrix.org) room in [#ledgersmb:matrix.org](https://matrix.to/#/#ledgersmb:matrix.org).
+The [Riot.im](https://riot.im/app/#/room/#ledgersmb:matrix.org) Matrix client is highly recommended.
 
 
 ## Contributing
 
-You are invited to contribute new features, fixes, or updates, large or small; we are always thrilled to receive pull requests, and do our best to process them as fast as we can.
+You are invited to contribute new features, fixes, or updates, large or small;
+we are always thrilled to receive pull requests, and do our best to process
+them as fast as we can.

docker-compose.yml

@@ -28,7 +28,7 @@ services:
   lsmb:
     depends_on:
       - postgres
-    image: ledgersmb/ledgersmb:1.6
+    image: ledgersmb/ledgersmb:1.7
     networks:
       - internal
       - default

start.sh

@@ -20,12 +20,9 @@ EOF
   export LSMB_CONFIG_FILE='/tmp/ledgersmb.conf'
 fi
 
-# Currently unmaintained/untested
+if [ ! -d "/tmp/ledgersmb" ]; then
-# if [ ! -z ${CREATE_DATABASE+x} ]; then
+  mkdir -p /tmp/ledgersmb
-#   perl tools/dbsetup.pl --company $CREATE_DATABASE \
+fi
-#   --host $POSTGRES_HOST \
-#   --postgres_password "$POSTGRES_PASS"
-#fi
 
 # start ledgersmb
 # --preload-app allows application initialization to kill the entire
@@ -33,4 +30,4 @@ fi
 # get restarted); it also has a positive effect on memory use
 
 exec starman --port 5762 --workers ${LSMB_WORKERS:-5} -I lib -I old/lib \
-             --preload-app bin/ledgersmb-server.psgi
+        --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
 }