From 72539044fbe4aa6d6f7b60a8d12f51c0d00c2013 Mon Sep 17 00:00:00 2001 From: Guillaume Virlet Date: Tue, 26 Nov 2019 22:12:34 +0100 Subject: Fix #1382 - update documentation related to docker images base image and PHP version used --- doc/md/docker/shaarli-images.md | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) 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 -- cgit v1.2.3