From b7ca2eb2f61619066e2ef0c2d8e6f0e4377a137d Mon Sep 17 00:00:00 2001 From: nodiscc Date: Fri, 5 Jan 2018 19:41:24 +0100 Subject: doc: add armhf docker images --- doc/md/docker/shaarli-images.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/doc/md/docker/shaarli-images.md b/doc/md/docker/shaarli-images.md index 5491ee76..9a27fcc8 100644 --- a/doc/md/docker/shaarli-images.md +++ b/doc/md/docker/shaarli-images.md @@ -11,6 +11,8 @@ repository. - `latest`: latest branch (tarball release) - `master`: master branch (tarball release) - `stable`: stable branch (tarball release) +- `armhf-latest`: latest branch for ARMv7 32bit processors (tarball release) +- `armhf-master`: master branch for ARMv7 32bit processors (tarball release) The `latest` and `master` images rely on: @@ -24,6 +26,7 @@ The `stable` image relies on: - [PHP5-FPM](http://php-fpm.org/) - [Nginx](http://nginx.org/) +The `armhf-*` images rely on [Linuxserver.io Alpine armhf images](https://hub.docker.com/r/lsiobase/alpine.armhf/). ### Download from DockerHub ```bash -- cgit v1.2.3 From bf4faba9ca87ded7075cdd3c1972bda64438d420 Mon Sep 17 00:00:00 2001 From: nodiscc Date: Fri, 12 Jan 2018 23:00:20 +0100 Subject: doc: docker: remove armhf tags, add link to Dockerfiles --- doc/md/docker/shaarli-images.md | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/doc/md/docker/shaarli-images.md b/doc/md/docker/shaarli-images.md index 9a27fcc8..e6734771 100644 --- a/doc/md/docker/shaarli-images.md +++ b/doc/md/docker/shaarli-images.md @@ -11,8 +11,6 @@ repository. - `latest`: latest branch (tarball release) - `master`: master branch (tarball release) - `stable`: stable branch (tarball release) -- `armhf-latest`: latest branch for ARMv7 32bit processors (tarball release) -- `armhf-master`: master branch for ARMv7 32bit processors (tarball release) The `latest` and `master` images rely on: @@ -26,7 +24,7 @@ The `stable` image relies on: - [PHP5-FPM](http://php-fpm.org/) - [Nginx](http://nginx.org/) -The `armhf-*` images rely on [Linuxserver.io Alpine armhf images](https://hub.docker.com/r/lsiobase/alpine.armhf/). +Additional [Dockerfiles](https://github.com/shaarli/Shaarli/tree/doc-docker-arm/docker) are provided for the `arm32v7` platform, relying on [Linuxserver.io Alpine armhf images](https://hub.docker.com/r/lsiobase/alpine.armhf/). ### Download from DockerHub ```bash -- cgit v1.2.3 From a3f83c15f4296530d3ceb70adde7c1cfb3f6312e Mon Sep 17 00:00:00 2001 From: nodiscc Date: Fri, 12 Jan 2018 23:06:30 +0100 Subject: doc: docker: add links to docker build and qemu documentation --- doc/md/docker/shaarli-images.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/md/docker/shaarli-images.md b/doc/md/docker/shaarli-images.md index e6734771..123da83e 100644 --- a/doc/md/docker/shaarli-images.md +++ b/doc/md/docker/shaarli-images.md @@ -24,7 +24,7 @@ The `stable` image relies on: - [PHP5-FPM](http://php-fpm.org/) - [Nginx](http://nginx.org/) -Additional [Dockerfiles](https://github.com/shaarli/Shaarli/tree/doc-docker-arm/docker) are provided for the `arm32v7` platform, relying on [Linuxserver.io Alpine armhf images](https://hub.docker.com/r/lsiobase/alpine.armhf/). +Additional [Dockerfiles](https://github.com/shaarli/Shaarli/tree/doc-docker-arm/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/). ### Download from DockerHub ```bash -- cgit v1.2.3 From 5cb4c0d5bd0c0d2c8772864d35540765be6f6b9a Mon Sep 17 00:00:00 2001 From: nodiscc Date: Sat, 13 Jan 2018 11:48:42 +0100 Subject: doc: fix link to dockerfiles --- doc/md/docker/shaarli-images.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/md/docker/shaarli-images.md b/doc/md/docker/shaarli-images.md index 123da83e..12f7b5d1 100644 --- a/doc/md/docker/shaarli-images.md +++ b/doc/md/docker/shaarli-images.md @@ -24,7 +24,7 @@ The `stable` image relies on: - [PHP5-FPM](http://php-fpm.org/) - [Nginx](http://nginx.org/) -Additional [Dockerfiles](https://github.com/shaarli/Shaarli/tree/doc-docker-arm/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/). +Additional [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/). ### Download from DockerHub ```bash -- cgit v1.2.3