* Automatic Dockerfile update by release process

Dockerfile

@@ -2,8 +2,8 @@ FROM        debian:stretch-slim
 MAINTAINER  Freelock john@freelock.com
 
 # Build time variables
-ARG LSMB_VERSION="1.7.10"
-ARG LSMB_DL_DIR="Releases"
+ARG LSMB_VERSION="1.7.0-rc1"
+ARG LSMB_DL_DIR="Beta Releases"
 
 # Install Perl, Tex, Starman, psql client, and all dependencies
 # Without libclass-c3-xs-perl, performance is terribly slow...

README.md

@@ -3,11 +3,9 @@ Dockerfile for LedgerSMB Docker image
 
 # Supported tags
 
-- `1.7`, `1.7.x`, `latest` - Latest official release from 1.7 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
+- `1.6`, `1.6.x`, `latest` - Latest release tarball from 1.6 branch
+- `1.5`, `1.5.x` - Latest release tarball from 1.5 branch
+- `1.4`, `1.4.x` - Latest tagged release of git 1.4 branch
 
 
 # What is LedgerSMB?
@@ -41,48 +39,56 @@ could require additional setup of a mail service or CUPS printer service.
 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.7/docker-compose.yml
+  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. The database
-username and password are:
+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
 
 ```plain
-   username: postgres
-   password: abc
+ $ docker run -d --name postgres \
+              -e POSTGRES_PASSWORD=mysecretpassword \
+              postgres:latest
 ```
 
-The docker-compose file does *not* set 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 (and especially the internet).
+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:
 
-## Manual installation
-
-This section assumes availability of a PostgreSQL server to attach to the
-LedgerSMB image as the database server.
+```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 \
-              -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.
-
-Below are more variables which determine container configuration,
-like `POSTGRES_HOST` above.
+http://localhost:5762/setup.pl.
 
 ## Set up LedgerSMB
 
  * Visit http://myledger:5762/setup.pl.
- * Log in with the "postgres" user and the password `abc` as given above -
-   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.
+ * Log in with the "postgres" user and the password `mysecretpassword`
+   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
@@ -167,18 +173,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,
-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.7
+    image: ledgersmb/ledgersmb:1.6
     networks:
       - internal
       - default