aboutsummaryrefslogtreecommitdiffhomepage
path: root/doc/md/docker
diff options
context:
space:
mode:
authorVirtualTam <virtualtam+github@flibidi.net>2018-06-20 16:59:29 +0200
committerGitHub <noreply@github.com>2018-06-20 16:59:29 +0200
commit6325e74caa464818000066b5112cfd293e168e50 (patch)
tree8c452980d8c7d6f98aa61e2d814377a1efc70fb3 /doc/md/docker
parent26b0b2022870a540c1a6d54e949c4bdc1486daed (diff)
parentc064d3179e0396983bdf8dee545388e4142ed842 (diff)
downloadShaarli-6325e74caa464818000066b5112cfd293e168e50.tar.gz
Shaarli-6325e74caa464818000066b5112cfd293e168e50.tar.zst
Shaarli-6325e74caa464818000066b5112cfd293e168e50.zip
Merge pull request #1158 from virtualtam/master-dockerfile
Master: Build the Docker images from the local sources
Diffstat (limited to 'doc/md/docker')
-rw-r--r--doc/md/docker/shaarli-images.md14
1 files changed, 10 insertions, 4 deletions
diff --git a/doc/md/docker/shaarli-images.md b/doc/md/docker/shaarli-images.md
index 12f7b5d1..e6fbff64 100644
--- a/doc/md/docker/shaarli-images.md
+++ b/doc/md/docker/shaarli-images.md
@@ -8,9 +8,9 @@ The images can be found in the [`shaarli/shaarli`](https://hub.docker.com/r/shaa
8repository. 8repository.
9 9
10### Available image tags 10### Available image tags
11- `latest`: latest branch (tarball release) 11- `latest`: latest branch
12- `master`: master branch (tarball release) 12- `master`: master branch
13- `stable`: stable branch (tarball release) 13- `stable`: stable branch
14 14
15The `latest` and `master` images rely on: 15The `latest` and `master` images rely on:
16 16
@@ -24,7 +24,13 @@ The `stable` image relies on:
24- [PHP5-FPM](http://php-fpm.org/) 24- [PHP5-FPM](http://php-fpm.org/)
25- [Nginx](http://nginx.org/) 25- [Nginx](http://nginx.org/)
26 26
27Additional [Dockerfiles](https://github.com/shaarli/Shaarli/tree/master/docker) 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 built using [`docker build`](https://docs.docker.com/engine/reference/commandline/build/) on an `arm32v7` machine or using an emulator such as [qemu](https://resin.io/blog/building-arm-containers-on-any-x86-machine-even-dockerhub/). 27Additional Dockerfiles are provided for the `arm32v7` platform, relying on
28[Linuxserver.io Alpine armhf
29images](https://hub.docker.com/r/lsiobase/alpine.armhf/). These images must be
30built using [`docker
31build`](https://docs.docker.com/engine/reference/commandline/build/) on an
32`arm32v7` machine or using an emulator such as
33[qemu](https://resin.io/blog/building-arm-containers-on-any-x86-machine-even-dockerhub/).
28 34
29### Download from DockerHub 35### Download from DockerHub
30```bash 36```bash