aboutsummaryrefslogtreecommitdiffhomepage
path: root/doc
diff options
context:
space:
mode:
authorVirtualTam <virtualtam+github@flibidi.net>2017-10-22 13:00:47 +0200
committerGitHub <noreply@github.com>2017-10-22 13:00:47 +0200
commitefd3a6405a381501b070b8805ae37d1313969784 (patch)
tree805c8e0624db6b5154d2cd4e4464816c22a4512a /doc
parent72cfe44436f4316112fc4aabfe8940aa7b4adcab (diff)
parentfab0f4e5766d519a37b497927812c6b5b38e51ed (diff)
downloadShaarli-efd3a6405a381501b070b8805ae37d1313969784.tar.gz
Shaarli-efd3a6405a381501b070b8805ae37d1313969784.tar.zst
Shaarli-efd3a6405a381501b070b8805ae37d1313969784.zip
Merge pull request #1001 from virtualtam/docker/latest
docker: add 'latest' image
Diffstat (limited to 'doc')
-rw-r--r--doc/md/docker/shaarli-images.md13
1 files changed, 11 insertions, 2 deletions
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
5repository. 5repository.
6 6
7### Available image tags 7### Available image tags
8- `latest`: master branch (tarball release) 8- `latest`: latest branch (tarball release)
9- `master`: master branch (tarball release)
9- `stable`: stable branch (tarball release) 10- `stable`: stable branch (tarball release)
10 11
11All images rely on: 12The `latest` and `master` images rely on:
13
14- [Alpine Linux](https://www.alpinelinux.org/)
15- [PHP7-FPM](http://php-fpm.org/)
16- [Nginx](http://nginx.org/)
17
18The `stable` image relies on:
19
12- [Debian 8 Jessie](https://hub.docker.com/_/debian/) 20- [Debian 8 Jessie](https://hub.docker.com/_/debian/)
13- [PHP5-FPM](http://php-fpm.org/) 21- [PHP5-FPM](http://php-fpm.org/)
14- [Nginx](http://nginx.org/) 22- [Nginx](http://nginx.org/)
15 23
24
16### Download from DockerHub 25### Download from DockerHub
17```bash 26```bash
18$ docker pull shaarli/shaarli 27$ docker pull shaarli/shaarli