docker: update image and usage documentation

Relates to https://github.com/shaarli/Shaarli/issues/1153

Signed-off-by: VirtualTam <virtualtam@flibidi.net>

diff --git a/doc/md/Unit-tests-Docker.md b/doc/md/Unit-tests-Docker.md
index c2de7cc78ada8cd1b5a87c920295fa89b8ccd0b5..59bd5b450642f67a870f22e218a828a3f7407aa1 100644 (file)
--- a/doc/md/Unit-tests-Docker.md
+++ b/doc/md/Unit-tests-Docker.md
@@ -8,7 +8,7 @@ Read first:
 
 ### Docker test images
 
 
 ### Docker test images
 

-Test Dockerfiles are located under `docker/tests/<distribution>/Dockerfile`,
+Test Dockerfiles are located under `tests/docker/<distribution>/Dockerfile`,

 and can be used to build Docker images to run Shaarli test suites under common
 Linux environments.
 
 and can be used to build Docker images to run Shaarli test suites under common
 Linux environments.
 


@@ -27,7 +27,7 @@ What's behind the curtains:
     - test PHP dependencies (OS packages)
     - Composer
 - the local workspace is mapped to the container's `/shaarli/` directory,
     - test PHP dependencies (OS packages)
     - Composer
 - the local workspace is mapped to the container's `/shaarli/` directory,

-- the files are rsync'd to so tests are run using a standard Linux user account
+- the files are rsync'd so tests are run using a standard Linux user account

   (running tests as `root` would bypass permission checks and may hide issues)
 - the tests are run inside the container.
 
   (running tests as `root` would bypass permission checks and may hide issues)
 - the tests are run inside the container.
 


@@ -36,7 +36,7 @@ What's behind the curtains:
 ```bash
 # build the Debian 9 Docker image
 $ cd /path/to/shaarli
 ```bash
 # build the Debian 9 Docker image
 $ cd /path/to/shaarli

-$ cd docker/test/debian9
+$ cd tests/docker/debian9

 $ docker build -t shaarli-test:debian9 .
 ```
 
 $ docker build -t shaarli-test:debian9 .
 ```
 

diff --git a/doc/md/docker/shaarli-images.md b/doc/md/docker/shaarli-images.md
index 12f7b5d1ffaf8672acd7b0e5c58f45c44f5132ca..e6fbff64220c61ac89c952688aa0d189b2d69320 100644 (file)
--- 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
 repository.
 
 ### Available image tags
 repository.
 
 ### Available image tags

-- `latest`: latest branch (tarball release)
-- `master`: master branch (tarball release)
-- `stable`: stable branch (tarball release)
+- `latest`: latest branch
+- `master`: master branch
+- `stable`: stable branch

 
 The `latest` and `master` images rely on:
 
 
 The `latest` and `master` images rely on:
 


@@ -24,7 +24,13 @@ The `stable` image relies on:
 - [PHP5-FPM](http://php-fpm.org/)
 - [Nginx](http://nginx.org/)
 
 - [PHP5-FPM](http://php-fpm.org/)
 - [Nginx](http://nginx.org/)
 

-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/).
+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
+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
 
 ### Download from DockerHub
 ```bash