* Automatic Dockerfile update by release process

Dockerfile

@@ -1,84 +1,49 @@
-FROM        debian:stretch-slim
+FROM        debian:jessie
 MAINTAINER  Freelock john@freelock.com
 
 # Build time variables
-ARG LSMB_VERSION="1.7.22"
+ENV LSMB_VERSION 1.5.15
-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/ && \
+  DEBIAN_FRONTEND=noninteractive apt-get update && \
-  mkdir -p /usr/share/man/man2/ && \
+    apt-get dist-upgrade -y && apt-get -y install \
-  mkdir -p /usr/share/man/man3/ && \
+    libcgi-emulate-psgi-perl libcgi-simple-perl libconfig-inifiles-perl \
-  mkdir -p /usr/share/man/man4/ && \
+    libdbd-pg-perl libdbi-perl libdatetime-perl \
-  mkdir -p /usr/share/man/man5/ && \
+    libdatetime-format-strptime-perl libdigest-md5-perl \
-  mkdir -p /usr/share/man/man6/ && \
+    libfile-mimeinfo-perl libjson-xs-perl libjson-perl \
-  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 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-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 \
-    libfile-find-rule-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 \
+    texlive-latex-recommended \
-    texlive-latex-recommended texlive-fonts-recommended \
+    texlive-xetex \
-    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 && \
+  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 -q -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 -q -y install postgresql-client && \
+    tar -xvzf /tmp/ledgersmb-$LSMB_VERSION.tar.gz --directory /srv && \
-  DEBIAN_FRONTEND="noninteractive" apt-get -q -y install git cpanminus make gcc libperl-dev && \
+    rm -f /tmp/ledgersmb-$LSMB_VERSION.tar.gz && \
-  wget --quiet -O /tmp/ledgersmb-$LSMB_VERSION.tar.gz "https://download.ledgersmb.org/f/$LSMB_DL_DIR/$LSMB_VERSION/ledgersmb-$LSMB_VERSION.tar.gz" && \
+    cpanm --quiet --notest \
-  tar -xzf /tmp/ledgersmb-$LSMB_VERSION.tar.gz --directory /srv && \
+      --with-feature=starman \
-  rm -f /tmp/ledgersmb-$LSMB_VERSION.tar.gz && \
+      --with-feature=latex-pdf-ps \
-  cpanm --notest \
+      --with-feature=openoffice \
-    --with-feature=starman \
+      --installdeps /srv/ledgersmb/ && \
-    --with-feature=latex-pdf-ps \
+    apt-get purge -y git cpanminus make gcc libperl-dev && \
-    --with-feature=openoffice \
+    apt-get autoremove -y && \
-    --installdeps /srv/ledgersmb/ && \
+    apt-get autoclean && \
-  apt-get purge -q -y git cpanminus make gcc libperl-dev && \
+    rm -rf ~/.cpanm/ && \
-  apt-get autoremove -q -y && \
+    rm -rf /var/lib/apt/lists/*
-  apt-get autoclean -q && \
-  rm -rf ~/.cpanm/ && \
-  rm -rf /var/lib/apt/lists/* /usr/share/man/*
-
 
 WORKDIR /srv/ledgersmb
 

README.md

@@ -1,18 +1,13 @@
 # ledgersmb-docker
-
 Dockerfile for LedgerSMB Docker image
 
 # Supported tags
 
-- `1.8` - Preview version for the 1.8 branch
+- `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?
 
@@ -29,9 +24,9 @@ This image is designed to be used in conjunction with a running PostgreSQL
 instance (such as may be provided through a separate image).
 
 This image exposes port 5762 running a Starman HTTP application server. We
-do recommend not exposing this port publicly, because
+do not recommend exposing this port publicly, because
 
-1. The Starman author recommends not exposing it
+1. The Starman author recommends it
 2. We strongly recommend TLS encryption of all application traffic
 
 While the exposed port can be used for quick evaluation, it's recommended
@@ -42,63 +37,46 @@ 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
-or 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 run -d --name postgres \
- $ docker-compose up
+              -e POSTGRES_PASSWORD=mysecretpassword \
+              postgres:latest
 ```
 
-This will set up two containers: (1) a PostgreSQL container with persistent
+BEWARE: The command above creates a container with the database data stored
-storage which is retained between container updates and (2) a LedgerSMB
+*inside* the container. Upon removal of the container, the database data will
-container configured to connect to the PostgreSQL container as its database
+be removed too!
-server.
 
-The database username and password are:
+To prevent destruction of the database data upon replacement of the container,
+please use these commands instead:
 
 ```plain
-   username: postgres
+ $ docker volume create dbdata
-   password: abc
+ $ docker run -d --name postgres \
+              -e POSTGRES_PASSWORD=mysecretpassword \
+              -e PGDATA=/var/lib/postgresql/data/pgdata \
+              -v dbdata:/var/lib/postgresql/data \
+              postgres:latest
 ```
 
-From here, follow the steps as detailed in the instructions for
+## Start LedgerSMB
-[preparing for first use](https://ledgersmb.org/content/preparing-ledgersmb-17-first-use).
-
-## Manual installation
-
-This section assumes availability of a PostgreSQL server to attach to the
-LedgerSMB image as the database server.
-
-### Start LedgerSMB
 
 ```plain
  $ docker run -d -p 5762:5762 --name myledger \
-              -e POSTGRES_HOST=<ip/hostname> ledgersmb/ledgersmb:latest
+              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 and http://localhost:5762/login.pl.
+http://localhost:5762/setup.pl.
 
-Below are more variables which determine container configuration,
+## Set up LedgerSMB
-like `POSTGRES_HOST` above.
-
-# Set up LedgerSMB
 
  * Visit http://myledger:5762/setup.pl.
- * Log in with the "postgres" user and the password `abc` as given above -
+ * Log in with the "postgres" user and the password `mysecretpassword`
-   or with the credentials of your own database server in case of a manual
+   and provide the name of a company (= database name) you want to create.
-   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
@@ -138,56 +116,27 @@ 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
 
-### Before 1.8.0
+* `SSMTP_ROOT`
+* `SSMTP_MAILHUB`
+* `SSMTP_HOSTNAME`
+* `SSMTP_USE_STARTTLS`
+* `SSMTP_AUTH_USER`
+* `SSMTP_AUTH_PASS`
+* `SSMTP_METHOD`
+* `SSMTP_FROMLINE_OVERRIDE`
 
 These variables are used to set outgoing SMTP defaults.
 
-* `SSMTP_ROOT` (config: `Root` -- DEPRECATED)
+To set the outgoing email address, set `SSMTP_ROOT` and `SSMTP_HOSTNAME` at
-* `SSMTP_MAILHUB` (config: `Mailhub`)
+a minimum.
-* `SSMTP_HOSTNAME` (config: `Hostname`)
-* `SSMTP_USE_STARTTLS` (config: `UseSTARTTLS`)
-* `SSMTP_AUTH_USER` (config: `AuthUser`)
-* `SSMTP_AUTH_PASS` (config: `AuthPass`)
-* `SSMTP_AUTH_METHOD` (config: `AuthMethod` -- DEPRECATED)
-* `SSMTP_FROMLINE_OVERRIDE` (config: `FromLineOverride` -- DEPRECATED)
 
 `SSMTP_MAILHUB` defaults to the default docker0 interface, so if your host is
 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.
-
-### 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
 
@@ -199,18 +148,11 @@ and the startup & config script is /usr/bin/start.sh.
 
 ## Issues
 
-If you have any problems with or questions about this image or LedgerSMB,
+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).
-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
+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.
-`#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;
+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.
-we are always thrilled to receive pull requests, and do our best to process
-them as fast as we can.

docker-compose.yml

@@ -1,66 +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.7
-    networks:
-      - internal
-      - default
-    ports:
-      - "127.0.0.1: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,14 +20,29 @@ EOF
   export LSMB_CONFIG_FILE='/tmp/ledgersmb.conf'
 fi
 
-if [ ! -d "/tmp/ledgersmb" ]; then
+if [ ! -f "/tmp/ledgersmb" ]; then
-  mkdir -p /tmp/ledgersmb
+  mkdir /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