diff options
| author | VirtualTam <virtualtam+github@flibidi.net> | 2018-06-20 16:59:29 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-06-20 16:59:29 +0200 |
| commit | 6325e74caa464818000066b5112cfd293e168e50 (patch) | |
| tree | 8c452980d8c7d6f98aa61e2d814377a1efc70fb3 /doc/md/Unit-tests-Docker.md | |
| parent | 26b0b2022870a540c1a6d54e949c4bdc1486daed (diff) | |
| parent | c064d3179e0396983bdf8dee545388e4142ed842 (diff) | |
| download | Shaarli-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/Unit-tests-Docker.md')
| -rw-r--r-- | doc/md/Unit-tests-Docker.md | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/doc/md/Unit-tests-Docker.md b/doc/md/Unit-tests-Docker.md index c2de7cc7..59bd5b45 100644 --- a/doc/md/Unit-tests-Docker.md +++ b/doc/md/Unit-tests-Docker.md | |||
| @@ -8,7 +8,7 @@ Read first: | |||
| 8 | 8 | ||
| 9 | ### Docker test images | 9 | ### Docker test images |
| 10 | 10 | ||
| 11 | Test Dockerfiles are located under `docker/tests/<distribution>/Dockerfile`, | 11 | Test Dockerfiles are located under `tests/docker/<distribution>/Dockerfile`, |
| 12 | and can be used to build Docker images to run Shaarli test suites under common | 12 | and can be used to build Docker images to run Shaarli test suites under common |
| 13 | Linux environments. | 13 | Linux environments. |
| 14 | 14 | ||
| @@ -27,7 +27,7 @@ What's behind the curtains: | |||
| 27 | - test PHP dependencies (OS packages) | 27 | - test PHP dependencies (OS packages) |
| 28 | - Composer | 28 | - Composer |
| 29 | - the local workspace is mapped to the container's `/shaarli/` directory, | 29 | - the local workspace is mapped to the container's `/shaarli/` directory, |
| 30 | - the files are rsync'd to so tests are run using a standard Linux user account | 30 | - the files are rsync'd so tests are run using a standard Linux user account |
| 31 | (running tests as `root` would bypass permission checks and may hide issues) | 31 | (running tests as `root` would bypass permission checks and may hide issues) |
| 32 | - the tests are run inside the container. | 32 | - the tests are run inside the container. |
| 33 | 33 | ||
| @@ -36,7 +36,7 @@ What's behind the curtains: | |||
| 36 | ```bash | 36 | ```bash |
| 37 | # build the Debian 9 Docker image | 37 | # build the Debian 9 Docker image |
| 38 | $ cd /path/to/shaarli | 38 | $ cd /path/to/shaarli |
| 39 | $ cd docker/test/debian9 | 39 | $ cd tests/docker/debian9 |
| 40 | $ docker build -t shaarli-test:debian9 . | 40 | $ docker build -t shaarli-test:debian9 . |
| 41 | ``` | 41 | ``` |
| 42 | 42 | ||