From fab0f4e5766d519a37b497927812c6b5b38e51ed Mon Sep 17 00:00:00 2001 From: VirtualTam Date: Sat, 21 Oct 2017 18:15:52 +0200 Subject: docker: add 'latest' image This implies the following changes: - `shaarli/shaarli:latest` will now point to the `latest` release - `shaarli/shaarli:master` will point to the `master` branch Signed-off-by: VirtualTam --- doc/md/docker/shaarli-images.md | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) (limited to 'doc/md/docker') diff --git a/doc/md/docker/shaarli-images.md b/doc/md/docker/shaarli-images.md index 6d108d21..1d19510a 100644 --- a/doc/md/docker/shaarli-images.md +++ b/doc/md/docker/shaarli-images.md @@ -5,14 +5,23 @@ The images can be found in the [`shaarli/shaarli`](https://hub.docker.com/r/shaa repository. ### Available image tags -- `latest`: master branch (tarball release) +- `latest`: latest branch (tarball release) +- `master`: master branch (tarball release) - `stable`: stable branch (tarball release) -All images rely on: +The `latest` and `master` 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/) + ### Download from DockerHub ```bash $ docker pull shaarli/shaarli -- cgit v1.2.3