Merge branch 'linuxserver:master' into mkdocs

pull/64/head
Eric Nemchik 2022-11-28 10:19:43 -06:00 zatwierdzone przez GitHub
commit 0f7a7cdcae
Nie znaleziono w bazie danych klucza dla tego podpisu
ID klucza GPG: 4AEE18F83AFDEB23
3 zmienionych plików z 8 dodań i 2 usunięć

Wyświetl plik

@ -55,6 +55,10 @@ We support all of the official [environment variables](https://docs.joinmastodon
For more information check out the [mastodon documentation](https://docs.joinmastodon.org/).
### Strict reverse proxies
This image automatically redirects to https with a self-signed certificate. If you are using a reverse proxy which validates certificates, you need to [disable this check for the container](https://docs.linuxserver.io/faq#strict-proxy).
## Usage
To help you get started creating a container from this image you can either use docker-compose or the docker cli.
@ -188,7 +192,7 @@ Docker images are configured using parameters passed at runtime (such as those a
| `SMTP_PASSWORD=` | SMTP password |
| `SMTP_FROM_ADDRESS=notifications@example.com` | From address for emails send from Mastodon |
| `S3_ENABLED=false` | Enable or disable S3 storage of uploaded files |
| `WEB_DOMAIN=mastodon.example.com` | This can be set if you want your server identifier to be different to the subdomain hosting Mastodon. See https://docs.joinmastodon.org/admin/config/#basic |
| `WEB_DOMAIN=mastodon.example.com` | This can be set if you want your server identifier to be different to the subdomain hosting Mastodon. See [https://docs.joinmastodon.org/admin/config/#basic](https://docs.joinmastodon.org/admin/config/#basic) |
| `ES_HOST=es` | Elasticsearch server hostname |
| `ES_PORT=9200` | Elasticsearch port |
| `ES_USER=elastic` | Elasticsearch username |

Wyświetl plik

@ -197,6 +197,7 @@ We publish various [Docker Mods](https://github.com/linuxserver/docker-mods) to
## Versions
* **27.11.22:** - Advanced notice: This image will be deprecated on 2022-12-31. Please consider switching to SABnzbd https://github.com/linuxserver/docker-sabnzbd
* **13.11.22:** - Rebase master to 3.16, migrate to s6v3.
* **12.08.22:** - Bump unrar to 6.1.7.
* **22.02.22:** - Rebase to alpine 3.15, add six and python 7zip tools, allow env variables for credentials.

Wyświetl plik

@ -40,7 +40,7 @@ This image provides various versions that are available via tags. Please read th
| Tag | Available | Description |
| :----: | :----: |--- |
| latest | ✅ | Stable releases from Sonarr (currently v3) |
| develop | ✅ | Development releases from Sonarr (currently v3) |
| develop | ✅ | Development releases from Sonarr (currently v4) |
## Application Setup
@ -176,6 +176,7 @@ We publish various [Docker Mods](https://github.com/linuxserver/docker-mods) to
## Versions
* **24.11.22:** - Bump develop branch to v4, rebase to Alpine 3.16.
* **03.08.22:** - Deprecate armhf.
* **02.08.22:** - Add armhf deprecation warning.
* **28.04.22:** - Rebase master branch to mono 6.12 base (focal).