From: Aurélien Tamisier <virtualtam+github@flibidi.net>
Date: Tue, 26 Nov 2019 22:46:39 +0000 (+0100)
Subject: Merge pull request #1383 from doc75/doc_docker
X-Git-Tag: v0.12.0-beta~32
X-Git-Url: https://git.immae.eu/?a=commitdiff_plain;h=ac2214bdb5f0c5fc352bd72e1077a25321ac2a1b;hp=99c7d663847fefccc271fe1d9b379c2c366c8de6;p=github%2Fshaarli%2FShaarli.git

Merge pull request #1383 from doc75/doc_docker

Fix #1382 - update documentation related to docker images
---

diff --git a/doc/md/docker/shaarli-images.md b/doc/md/docker/shaarli-images.md
index 5948949a..14971d54 100644
--- a/doc/md/docker/shaarli-images.md
+++ b/doc/md/docker/shaarli-images.md
@@ -12,18 +12,12 @@ repository.
 - `master`: master branch
 - `stable`: stable branch
 
-The `latest` and `master` images rely on:
+The `latest`, `master` and `stable` images rely on:
 
 - [Alpine Linux](https://www.alpinelinux.org/)
 - [PHP7-FPM](http://php-fpm.org/)
 - [Nginx](http://nginx.org/)
 
-The `stable` image relies on:
-
-- [Debian 8 Jessie](https://hub.docker.com/_/debian/)
-- [PHP5-FPM](http://php-fpm.org/)
-- [Nginx](http://nginx.org/)
-
 Additional Dockerfiles are provided for the `arm32v7` platform, relying on
 [Linuxserver.io Alpine armhf
 images](https://hub.docker.com/r/lsiobase/alpine.armhf/). These images must be