diff options
| -rw-r--r-- | CHANGELOG.md | 2 | ||||
| -rw-r--r-- | Docker/README.md | 8 |
2 files changed, 6 insertions, 4 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 8420c2534..44764f0fa 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -41,6 +41,7 @@ * Add language negotiation when the user is not logged in [#3022](https://github.com/FreshRSS/FreshRSS/pull/3022) * New United States English [#3060](https://github.com/FreshRSS/FreshRSS/pull/3060) * Improved British English [#3068](https://github.com/FreshRSS/FreshRSS/pull/3068) + * Improved Dutch [#3063](https://github.com/FreshRSS/FreshRSS/pull/3063) * Improved Slovak [#3020](https://github.com/FreshRSS/FreshRSS/pull/3020) * Add a language reference when adding a new one [#3044](https://github.com/FreshRSS/FreshRSS/pull/3044) * Change how updating a key works [#3072](https://github.com/FreshRSS/FreshRSS/pull/3072) @@ -49,6 +50,7 @@ * Return proper MIME type for favicons [#3032](https://github.com/FreshRSS/FreshRSS/pull/3032) * Add a migration system [#2760](https://github.com/FreshRSS/FreshRSS/pull/2760) * Makefile support for FreshRSS extensions [#3042](https://github.com/FreshRSS/FreshRSS/pull/3042) + * Update rules to use Make syntax [#3062](https://github.com/FreshRSS/FreshRSS/pull/3062) * Refactor the export feature [#3045](https://github.com/FreshRSS/FreshRSS/pull/3045) diff --git a/Docker/README.md b/Docker/README.md index 4fe1b0cde..671335a3c 100644 --- a/Docker/README.md +++ b/Docker/README.md @@ -141,10 +141,10 @@ The tags correspond to FreshRSS branches and versions: * `:x.y.z` are specific FreshRSS releases * `:arm` or `:*-arm` are the ARM versions (e.g. for Raspberry Pi) -### Linux: Ubuntu vs. Alpine -Our default image is based on [Ubuntu](https://www.ubuntu.com/server). We offer an alternative based on [Alpine](https://alpinelinux.org/) (with the `*-alpine` tag suffix). -In [our tests](https://github.com/FreshRSS/FreshRSS/pull/2205), Ubuntu is ~3 times faster, -while Alpine is ~2.5 times [smaller on disk](https://hub.docker.com/r/freshrss/freshrss/tags) (and much faster to build). +### Linux: Debian vs. Alpine +Our default image is based on [Debian](https://www.debian.org/). We offer an alternative based on [Alpine](https://alpinelinux.org/) (with the `*-alpine` tag suffix). +In [our tests](https://github.com/FreshRSS/FreshRSS/pull/2205), Ubuntu is faster, +while Alpine is [smaller on disk](https://hub.docker.com/r/freshrss/freshrss/tags) (and much faster to build). ## Optional: Build Docker image of FreshRSS |