Merge pull request #1383 from doc75/doc_docker

Fix #1382 - update documentation related to docker images
This commit is contained in:
Aurélien Tamisier 2019-11-26 23:46:39 +01:00 committed by GitHub
commit ac2214bdb5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View 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