diff options
author | Guillaume Virlet <github@virlet.org> | 2019-11-26 22:12:34 +0100 |
---|---|---|
committer | Guillaume Virlet <github@virlet.org> | 2019-11-26 22:12:34 +0100 |
commit | 72539044fbe4aa6d6f7b60a8d12f51c0d00c2013 (patch) | |
tree | 7cb58633a33670007efc394335b4e14c728935c7 /doc/md/docker | |
parent | 99c7d663847fefccc271fe1d9b379c2c366c8de6 (diff) | |
download | Shaarli-72539044fbe4aa6d6f7b60a8d12f51c0d00c2013.tar.gz Shaarli-72539044fbe4aa6d6f7b60a8d12f51c0d00c2013.tar.zst Shaarli-72539044fbe4aa6d6f7b60a8d12f51c0d00c2013.zip |
Fix #1382 - update documentation related to docker images base image and PHP version used
Diffstat (limited to 'doc/md/docker')
-rw-r--r-- | doc/md/docker/shaarli-images.md | 8 |
1 files changed, 1 insertions, 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. | |||
12 | - `master`: master branch | 12 | - `master`: master branch |
13 | - `stable`: stable branch | 13 | - `stable`: stable branch |
14 | 14 | ||
15 | The `latest` and `master` images rely on: | 15 | The `latest`, `master` and `stable` images rely on: |
16 | 16 | ||
17 | - [Alpine Linux](https://www.alpinelinux.org/) | 17 | - [Alpine Linux](https://www.alpinelinux.org/) |
18 | - [PHP7-FPM](http://php-fpm.org/) | 18 | - [PHP7-FPM](http://php-fpm.org/) |
19 | - [Nginx](http://nginx.org/) | 19 | - [Nginx](http://nginx.org/) |
20 | 20 | ||
21 | The `stable` image relies on: | ||
22 | |||
23 | - [Debian 8 Jessie](https://hub.docker.com/_/debian/) | ||
24 | - [PHP5-FPM](http://php-fpm.org/) | ||
25 | - [Nginx](http://nginx.org/) | ||
26 | |||
27 | Additional Dockerfiles are provided for the `arm32v7` platform, relying on | 21 | Additional Dockerfiles are provided for the `arm32v7` platform, relying on |
28 | [Linuxserver.io Alpine armhf | 22 | [Linuxserver.io Alpine armhf |
29 | images](https://hub.docker.com/r/lsiobase/alpine.armhf/). These images must be | 23 | images](https://hub.docker.com/r/lsiobase/alpine.armhf/). These images must be |