* Automatic Dockerfile update by release process

Note that we found in the LedgerSMB Matrix chat channel that users
need more straight forward ways to quickly evaluate our proposition
which they are able to offer if we skip the TLS requirement

Also note that the TLS requirement requires a domain, which some
might not have at the stage where the system is only being evaluated.

Dockerfile

@@ -2,7 +2,7 @@ FROM        debian:jessie-slim
 MAINTAINER  Freelock john@freelock.com
 
 # Build time variables
-ENV LSMB_VERSION 1.5.18
+ENV LSMB_VERSION 1.5.21
 
 
 # Install Perl, Tex, Starman, psql client, and all dependencies

README.md

@@ -129,6 +129,14 @@ 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. 

docker-compose.yml

@@ -12,7 +12,10 @@
 
 version: "3.2"
 services:
-  db:
+  # 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
@@ -21,15 +24,32 @@ services:
     networks:
       - internal
     volumes:
-      - "dbdata:/var/lib/postgresql/data"
+      - "pgdata:/var/lib/postgresql/data"
   lsmb:
     depends_on:
-      - db
+      - postgres
     image: ledgersmb/ledgersmb:1.5
     networks:
       - internal
       - default
-    # environment:
+    # 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:
@@ -45,7 +65,7 @@ services:
 # the rest of the image and on update/upgrade, the
 # data will be lost.
 volumes:
-  dbdata:
+  pgdata:
 
 
 networks:

start.sh

@@ -45,4 +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 tools/starman.psgi