diff options
author | 2021-02-09 21:59:23 +0100 | |
---|---|---|
committer | 2021-02-09 21:59:23 +0100 | |
commit | 0e658695e452b4136e45fbe086b6e00a8a004e65 (patch) | |
tree | 729afd32d4590b52749d30e744e890339515332a | |
parent | Mark Ethereal as deprecated (diff) | |
parent | Update docker/README.md - one mention for MariaDB/MySQL (diff) | |
download | ferdium-server-0e658695e452b4136e45fbe086b6e00a8a004e65.tar.gz ferdium-server-0e658695e452b4136e45fbe086b6e00a8a004e65.tar.zst ferdium-server-0e658695e452b4136e45fbe086b6e00a8a004e65.zip |
Merge branch 'master' of https://github.com/k0staa/server
-rw-r--r-- | docker/README.md | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/docker/README.md b/docker/README.md index b5cd3a8..00e3df7 100644 --- a/docker/README.md +++ b/docker/README.md | |||
@@ -1,7 +1,3 @@ | |||
1 | <p align="center"> | ||
2 | <img src="./logo.png" alt="" width="300"/> | ||
3 | </p> | ||
4 | |||
5 | # Ferdi-server-docker | 1 | # Ferdi-server-docker |
6 | [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. | 2 | [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. |
7 | 3 | ||
@@ -78,7 +74,7 @@ The server will be launched at [http://localhost:3333/](http://localhost:3333/) | |||
78 | 74 | ||
79 | Container images are configured using parameters passed at runtime (such as those above). | 75 | Container images are configured using parameters passed at runtime (such as those above). |
80 | 76 | ||
81 | **Warning ,using `config.txt` will be deprecated in the future releases.** | 77 | **Warning, using `config.txt` will be deprecated in the future releases.** |
82 | 78 | ||
83 | 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.** | 79 | 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.** |
84 | 80 | ||
@@ -120,8 +116,7 @@ To use a different database than the default, SQLite, enter the driver code belo | |||
120 | 116 | ||
121 | | Database | Driver | | 117 | | Database | Driver | |
122 | | :----: | --- | | 118 | | :----: | --- | |
123 | | MariaDB | mysql | | 119 | | MariaDB/MySQL | mysql | |
124 | | MySQL | mysql | | ||
125 | | PostgreSQL | pg | | 120 | | PostgreSQL | pg | |
126 | | SQLite3 | sqlite | | 121 | | SQLite3 | sqlite | |
127 | 122 | ||