]> git.immae.eu Git - github/shaarli/Shaarli.git/commitdiff
Merge pull request #1383 from doc75/doc_docker
authorAurélien Tamisier <virtualtam+github@flibidi.net>
Tue, 26 Nov 2019 22:46:39 +0000 (23:46 +0100)
committerGitHub <noreply@github.com>
Tue, 26 Nov 2019 22:46:39 +0000 (23:46 +0100)
Fix #1382 - update documentation related to docker images

doc/md/docker/shaarli-images.md

index 5948949ae6bda0308dfe58efbf3e7ae2ecb868c6..14971d544f2fcd84b9a431d306e72aabfbc4b196 100644 (file)
@@ -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