Docker Ubuntu notes (#2259)

https://github.com/FreshRSS/FreshRSS/pull/2205
(And removed proxy_fcgi forgotten from php-fpm)

3 files changed, 21 insertions, 7 deletions

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f9d1bc1d6..fc71fabe6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,16 +2,18 @@
 
 ## 2019-0X-XX FreshRSS 1.13.2-dev
 
-* Bug fixing
-	* Fix API HTTP Authorization case-sensitivity issue introduced in FreshRSS 1.13.1 [#2233](https://github.com/FreshRSS/FreshRSS/issues/2233)
-	* Fix breaking warning in Fever API [#2239](https://github.com/FreshRSS/FreshRSS/issues/2239)
-	* Fix encoding problem in Fever API [#2241](https://github.com/FreshRSS/FreshRSS/issues/2241)
 * UI
 	* New themes *Ansum* and *Mapco* [#2245](https://github.com/FreshRSS/FreshRSS/pull/2245)
 	* Rewrite jQuery and keyboard shortcut code as native JavaScript ES6 (except for graphs on the statistics pages) [#2234](https://github.com/FreshRSS/FreshRSS/pull/2234)
 	* Batch scroll-as-read for better client-side and server-side performance [#2199](https://github.com/FreshRSS/FreshRSS/pull/2199)
 * Deployment
-	* Docker image updated to Alpine 3.9 with PHP 7.2.14 and Apache 2.4.38 [#2238](https://github.com/FreshRSS/FreshRSS/pull/2238)
+	* New default Docker image based on Ubuntu (~3 times faster, but ~2.5 times larger) [#2205](https://github.com/FreshRSS/FreshRSS/pull/2205)
+		* Using Ubuntu 18.10 with PHP 7.2.15 and Apache 2.4.34
+	* Alpine version updated to Alpine 3.9 with PHP 7.2.14 and Apache 2.4.38 [#2238](https://github.com/FreshRSS/FreshRSS/pull/2238)
+* Bug fixing
+	* Fix API HTTP Authorization case-sensitivity issue introduced in FreshRSS 1.13.1 [#2233](https://github.com/FreshRSS/FreshRSS/issues/2233)
+	* Fix breaking warning in Fever API [#2239](https://github.com/FreshRSS/FreshRSS/issues/2239)
+	* Fix encoding problem in Fever API [#2241](https://github.com/FreshRSS/FreshRSS/issues/2241)
 * I18n
 	* Improved Korean [#2242](https://github.com/FreshRSS/FreshRSS/pull/2242)
 * Misc.
diff --git a/Docker/Dockerfile b/Docker/Dockerfile
index 53feb31d4..8f15bec96 100644
--- a/Docker/Dockerfile
+++ b/Docker/Dockerfile
@@ -18,7 +18,7 @@ COPY . /var/www/FreshRSS
 COPY ./Docker/*.Apache.conf /etc/apache2/sites-available/
 
 RUN a2dismod -f alias autoindex negotiation status && \
-	a2enmod deflate expires headers mime proxy_fcgi setenvif && \
+	a2enmod deflate expires headers mime setenvif && \
 	a2disconf '*' && \
 	a2dissite '*' && \
 	a2ensite 'FreshRSS*'
diff --git a/Docker/README.md b/Docker/README.md
index ac745c49d..ba6169ea3 100644
--- a/Docker/README.md
+++ b/Docker/README.md
@@ -10,6 +10,18 @@ sh get-docker.sh
 ```
 
 
+## [Docker tags](https://hub.docker.com/r/freshrss/freshrss/tags)
+The tags correspond to FreshRSS branches and versions:
+* `:latest` (default) is the `master` branch, more stable
+* `:dev` is the `dev` branch, rolling release
+* `:x.y.z` are specific FreshRSS releases
+
+### 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).
+
+
 ## Optional: Build Docker image of FreshRSS
 Optional, as a *less recent* online image can be automatically fetched during the next step (run),
 but online images are not available for as many platforms (e.g. Raspberry Pi / ARM) as if you build yourself.
@@ -20,7 +32,7 @@ git clone https://github.com/FreshRSS/FreshRSS.git
 
 cd ./FreshRSS/
 git pull
-sudo docker pull alpine:3.8
+sudo docker pull ubuntu:18.10
 sudo docker build --tag freshrss/freshrss -f Docker/Dockerfile .
 ```