* 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

@@ -2,7 +2,7 @@ FROM        debian:stretch-slim
 MAINTAINER  Freelock john@freelock.com
 
 # Build time variables
-ARG LSMB_VERSION="1.7.0"
+ARG LSMB_VERSION="1.7.13"
 ARG LSMB_DL_DIR="Releases"
 
 # Install Perl, Tex, Starman, psql client, and all dependencies

README.md

@@ -1,12 +1,17 @@
 # ledgersmb-docker
+
 Dockerfile for LedgerSMB Docker image
 
 # Supported tags
 
-- `1.6`, `1.6.x`, `latest` - Latest release tarball from 1.6 branch
+- `1.7`, `1.7.x`, `latest` - Latest official release from 1.7 branch
-- `1.5`, `1.5.x` - Latest release tarball from 1.5 branch
+- `1.6`, `1.6.x` - Latest official release from 1.6 branch 
-- `1.4`, `1.4.x` - Latest tagged release of git 1.4 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
 
+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?
 
@@ -34,61 +39,62 @@ to add the TLS layer by applying Nginx or Apache as reverse proxy.
 Enabling optional functionalities such as outgoing e-mail and printing
 could require additional setup of a mail service or CUPS printer service.
 
-# Quickstart
-
-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
-
-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
-installation over any type of network.
-
 # How to use this image
 
-## Start a postgres instance
+This image can be installed either automatically with the Docker compose file
+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 run -d --name postgres \
+ $ docker-compose pull
-              -e POSTGRES_PASSWORD=mysecretpassword \
+ $ docker-compose up
-              postgres:latest
 ```
 
-BEWARE: The command above creates a container with the database data stored
+This will set up two containers: (1) a PostgreSQL container with persistent
-*inside* the container. Upon removal of the container, the database data will
+storage which is retained between container updates and (2) a LedgerSMB
-be removed too!
+container configured to connect to the PostgreSQL container as its database
+server.
 
-To prevent destruction of the database data upon replacement of the container,
+The database username and password are:
-please use these commands instead:
 
 ```plain
- $ docker volume create dbdata
+   username: postgres
- $ docker run -d --name postgres \
+   password: abc
-              -e POSTGRES_PASSWORD=mysecretpassword \
-              -e PGDATA=/var/lib/postgresql/data/pgdata \
-              -v dbdata:/var/lib/postgresql/data \
-              postgres:latest
 ```
 
-## Start LedgerSMB
+## 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 \
-              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.
 
-## Set up LedgerSMB
+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
@@ -138,21 +144,18 @@ affect the performance experience of users.
 
 ## Mail configuration
 
-The docker image uses `ssmtp` to send mail.
+### Before 1.8.0
 
-* `SSMTP_ROOT` (config: `Root`)
+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
@@ -163,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
@@ -173,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