restructured docs a bit, added missing docker env vars

README.md

 # Tinode Instant Messaging Server
 
-<img src="docs/logo.svg" align="left" width=128 height=128> Instant messaging server. Backend in pure [Go](http://golang.org) (license [GPL 3.0](http://www.gnu.org/licenses/gpl-3.0.en.html)), client-side binding in Java, Javascript, and Swift, as well as [gRPC](https://grpc.io/) client support for C++, C#, Go, Java, Node, PHP, Python, Ruby, Objective-C, etc. (license [Apache 2.0](http://www.apache.org/licenses/LICENSE-2.0)). Wire transport is JSON over websocket (long polling is also available) for custom bindings, or [protobuf](https://developers.google.com/protocol-buffers/) with gRPC. Persistent storage is any one of MySQL, MongoDB or [RethinkDB](http://rethinkdb.com/). Other databases can be supported by writing custom adapters.
+<img src="docs/logo.svg" align="left" width=128 height=128> Instant messaging server. Backend in pure [Go](http://golang.org) (license [GPL 3.0](http://www.gnu.org/licenses/gpl-3.0.en.html)), client-side binding in Java, Javascript, and Swift, as well as [gRPC](https://grpc.io/) client support for C++, C#, Go, Java, Node, PHP, Python, Ruby, Objective-C, etc. (license [Apache 2.0](http://www.apache.org/licenses/LICENSE-2.0)). Wire transport is JSON over websocket (long polling is also available) for custom bindings, or [protobuf](https://developers.google.com/protocol-buffers/) with gRPC.
 
 Tinode is *not* XMPP/Jabber. It is *not* compatible with XMPP. It's meant as a replacement for XMPP. On the surface, it's a lot like open source WhatsApp or Telegram.
 
@@ -112,7 +112,11 @@ When you register a new account you are asked for an email address to send valid
     * Java with dependencies on [Jackson](https://github.com/FasterXML/jackson) and [Java-Websocket](https://github.com/TooTallNate/Java-WebSocket). Suitable for Android but with no Android SDK dependencies.
     * Swift with no external dependencies.
     * C/C++, C#, Go, Python, PHP, Ruby and many other languages using [gRPC](https://grpc.io/docs/languages/).
-  * Choice of a database backend: MySQL, RethinkDB, MongoDB. Other databases can be added with by writing [adapters](server/db/adapter.go).
+  * Choice of a database backend. Other databases can be added with by writing [adapters](server/db/adapter.go).
+    * MySQL
+    * PostgreSQL
+    * MongoDB
+    * [RethinkDB](http://rethinkdb.com/)
 
 ### Planned
 

docker/README.md

@@ -11,17 +11,19 @@ All images are available at https://hub.docker.com/r/tinode/
 
 3. Decide which database backend you want to use: RethinkDB, MySQL or MongoDB. Run the selected database container, attaching it to `tinode-net` network:
 
-	1. **RethinkDB**: If you've decided to use RethinkDB backend, run the official RethinkDB Docker container:
+	1. **MySQL**: If you've decided to use MySQL backend, run the official MySQL Docker container:
 	```
-	$ docker run --name rethinkdb --network tinode-net --restart always -d rethinkdb:2.3
+	$ docker run --name mysql --network tinode-net --restart always --env MYSQL_ALLOW_EMPTY_PASSWORD=yes -d mysql:5.7
 	```
-	See [instructions](https://hub.docker.com/_/rethinkdb/) for more options.
+	See [instructions](https://hub.docker.com/_/mysql/) for more options. MySQL 5.7 or above is required.
 
-	2. **MySQL**: If you've decided to use MySQL backend, run the official MySQL Docker container:
+	2. **PostgreSQL**: If you've decided to use PostgreSQL backend, run the official PostgreSQL Docker container:
 	```
-	$ docker run --name mysql --network tinode-net --restart always --env MYSQL_ALLOW_EMPTY_PASSWORD=yes -d mysql:5.7
+	$ docker run --name postgres --network tinode-net --restart always --env POSTGRES_PASSWORD=postgres -d postgres:13
 	```
-	See [instructions](https://hub.docker.com/_/mysql/) for more options. MySQL 5.7 or above is required.
+	See [instructions](https://hub.docker.com/_/postgres/) for more options. PostgresSQL 13 or above is required.
+
+	The name `rethinkdb`, `mysql`, `mongodb` or `postgres` in the `--name` assignment is important. It's used by other containers as a database's host name.
 
 	3. **MongoDB**: If you've decided to use MongoDB backend, run the official MongoDB Docker container and initialise it as single node replica set (you can change "rs0" if you wish):
    ```
@@ -34,24 +36,22 @@ All images are available at https://hub.docker.com/r/tinode/
    ```
 	See [instructions](https://hub.docker.com/_/mongo/) for more options. MongoDB 4.2 or above is required.
 
-	4. **PostgreSQL**: If you've decided to use PostgreSQL backend, run the official PostgreSQL Docker container:
+	4. **RethinkDB**: If you've decided to use RethinkDB backend, run the official RethinkDB Docker container:
 	```
-	$ docker run --name postgres --network tinode-net --restart always --env POSTGRES_PASSWORD=postgres -d postgres:13
+	$ docker run --name rethinkdb --network tinode-net --restart always -d rethinkdb:2.3
 	```
-	See [instructions](https://hub.docker.com/_/postgres/) for more options. PostgresSQL 13 or above is required.
-
-	The name `rethinkdb`, `mysql`, `mongodb` or `postgres` in the `--name` assignment is important. It's used by other containers as a database's host name.
+	See [instructions](https://hub.docker.com/_/rethinkdb/) for more options.
 
 4. Run the Tinode container for the appropriate database:
 
-	1. **RethinkDB**:
+	1. **MySQL**:
 	```
-	$ docker run -p 6060:6060 -d --name tinode-srv --network tinode-net tinode/tinode-rethinkdb:latest
+	$ docker run -p 6060:6060 -d --name tinode-srv --network tinode-net tinode/tinode-mysql:latest
 	```
 
-	2. **MySQL**:
+	2. **PostgreSQL**:
 	```
-	$ docker run -p 6060:6060 -d --name tinode-srv --network tinode-net tinode/tinode-mysql:latest
+	$ docker run -p 6060:6060 -d --name tinode-srv --network tinode-net tinode/tinode-postgresql:latest
 	```
 
 	3. **MongoDB**:
@@ -59,9 +59,9 @@ All images are available at https://hub.docker.com/r/tinode/
 	$ docker run -p 6060:6060 -d --name tinode-srv --network tinode-net tinode/tinode-mongodb:latest
 	```
 
-	4. **PostgreSQL**:
+	4. **RethinkDB**:
 	```
-	$ docker run -p 6060:6060 -d --name tinode-srv --network tinode-net tinode/tinode-postgresql:latest
+	$ docker run -p 6060:6060 -d --name tinode-srv --network tinode-net tinode/tinode-rethinkdb:latest
 	```
 
 	You can also run Tinode with the `tinode/tinode` image (which has all of the above DB adapters compiled in). You will need to specify the database adapter via `STORE_USE_ADAPTER` environment variable. E.g. for `mysql`, the command line will look like
@@ -75,10 +75,10 @@ All images are available at https://hub.docker.com/r/tinode/
 
 	You may replace `:latest` with a different tag. See all all available tags here:
 	 * [MySQL tags](https://hub.docker.com/r/tinode/tinode-mysql/tags/)
-	 * [RethinkDB tags](https://hub.docker.com/r/tinode/tinode-rethink/tags/)
+	 * [PostgreSQL tags](https://hub.docker.com/r/tinode/tinode-postgresql/tags/) (beta version)
 	 * [MongoDB tags](https://hub.docker.com/r/tinode/tinode-mongodb/tags/)
-	 * [PostgreSQL tags](https://hub.docker.com/r/tinode/tinode-postgresql/tags/) (comming soon)
-	 * [All bundle tags](https://hub.docker.com/r/tinode/tinode/tags/) (comming soon)
+	 * [RethinkDB tags](https://hub.docker.com/r/tinode/tinode-rethink/tags/)
+	 * [All bundle tags](https://hub.docker.com/r/tinode/tinode/tags/)
 
 5. Test the installation by pointing your browser to [http://localhost:6060/](http://localhost:6060/).
 
@@ -201,6 +201,7 @@ You can specify the following environment variables when issuing `docker run` co
 | `MEDIA_HANDLER` | string | `fs` | Handler of large files, either `fs` or `s3` |
 | `MYSQL_DSN` | string | `'root@tcp(mysql)/tinode'` | MySQL [DSN](https://github.com/go-sql-driver/mysql#dsn-data-source-name). |
 | `PLUGIN_PYTHON_CHAT_BOT_ENABLED` | bool | `false` | Enable calling into the plugin provided by Python chatbot |
+| `POSTGRES_DSN` | string | `'postgresql://postgres:postgres@localhost:5432/tinode'` |  PostgreSQL [DSN](https://www.postgresql.org/docs/current/libpq-connect.html#LIBPQ-CONNSTRING). |
 | `RESET_DB` | bool | `false` | Drop and recreate the database. |
 | `SAMPLE_DATA` | string |  _see comment →_ | File with sample data to load. Default `data.json` when resetting or generating new DB, none when upgrading. Use `` (empty string) to disable |
 | `SMTP_DOMAINS` | string |  | White list of email domains; when non-empty, accept registrations with emails from these domains only (email verification). |

docker/tinode/Dockerfile

@@ -21,12 +21,11 @@ LABEL version=$VERSION
 
 # Build-time options.
 
-# Database selector. Builds for RethinkDB by default.
-# Alternatively use
-# `--build-arg TARGET_DB=mysql` to build for MySQL or
-# `--build-arg TARGET_DB=mongodb` to build for MongoDB.
-# `--build-arg TARGET_DB=alldbs` to build a generic Tinode docker image.
-ARG TARGET_DB=rethinkdb
+# Database selector. Builds for MySQL by default.
+# Alternatively use one of: postgres mongodb rethinkdb for a corresponsing
+# DB backend or alldbs to build a generic Tinode docker image, for example:
+# `--build-arg TARGET_DB=postgres` to build for PostgreSQL.
+ARG TARGET_DB=mysql
 ENV TARGET_DB=$TARGET_DB
 
 # Runtime options.
@@ -51,6 +50,9 @@ ENV SAMPLE_DATA=$SAMPLE_DATA
 # The MySQL DSN connection.
 ENV MYSQL_DSN='root@tcp(mysql)/tinode'
 
+# The PostgreSQL DSN connection.
+ENV POSTGRES_DSN='postgresql://postgres:postgres@localhost:5432/tinode'
+
 # Disable chatbot plugin by default.
 ENV PLUGIN_PYTHON_CHAT_BOT_ENABLED=false
 

docker/tinode/config.template

@@ -63,6 +63,10 @@
 				"database": "tinode",
 				"dsn": "$MYSQL_DSN?parseTime=true&collation=utf8mb4_unicode_ci"
 			},
+			"postgres": {
+				"database": "tinode",
+				"dsn": "$POSTGRES_DSN?sslmode=disable"
+			},
 			"rethinkdb": {
 				"database": "tinode",
 				"addresses": "rethinkdb"