From b45b258c2188bed5319f981dbe99171c7db2ce40 Mon Sep 17 00:00:00 2001 From: Michał Kostewicz Date: Tue, 9 Feb 2021 21:33:14 +0100 Subject: Update docker/README.md Co-authored-by: Cromefire_ --- docker/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/README.md b/docker/README.md index 1cea8ae..73c660d 100644 --- a/docker/README.md +++ b/docker/README.md @@ -78,7 +78,7 @@ The server will be launched at [http://localhost:3333/](http://localhost:3333/) Container images are configured using parameters passed at runtime (such as those above). -**Warning ,using `config.txt` will be deprecated in the future releases.** +**Warning, using `config.txt` will be deprecated in the future releases.** If any of environmental parameters is not passed to the container, its value will be taken from the `/config/config.txt` file. **The previous functionality of saving container parameters in this file is now removed.** -- cgit v1.2.3-70-g09d2 From 489b90c81cc51321015dbb678ac42503d770b45c Mon Sep 17 00:00:00 2001 From: Michał Kostewicz Date: Tue, 9 Feb 2021 21:51:09 +0100 Subject: Update docker/README.md - removing logo from docker readme Co-authored-by: Cromefire_ --- docker/README.md | 4 ---- 1 file changed, 4 deletions(-) diff --git a/docker/README.md b/docker/README.md index 73c660d..f7345ca 100644 --- a/docker/README.md +++ b/docker/README.md @@ -1,7 +1,3 @@ -

- -

- # Ferdi-server-docker [Ferdi](https://github.com/getferdi/ferdi) is a hard-fork of [Franz](https://github.com/meetfranz/franz), adding awesome features and removing unwanted ones. Ferdi-server is an unofficial replacement of the Franz server for use with the Ferdi Client. -- cgit v1.2.3-70-g09d2 From 17c8eed91a061fcda781bf42ca58a75b188f69cc Mon Sep 17 00:00:00 2001 From: Michał Kostewicz Date: Tue, 9 Feb 2021 21:52:54 +0100 Subject: Update docker/README.md - one mention for MariaDB/MySQL Co-authored-by: Cromefire_ --- docker/README.md | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/docker/README.md b/docker/README.md index f7345ca..66364b0 100644 --- a/docker/README.md +++ b/docker/README.md @@ -116,8 +116,7 @@ To use a different database than the default, SQLite, enter the driver code belo | Database | Driver | | :----: | --- | -| MariaDB | mysql | -| MySQL | mysql | +| MariaDB/MySQL | mysql | | PostgreSQL | pg | | SQLite3 | sqlite | -- cgit v1.2.3-70-g09d2