diff options
| author | ArthurHoaro <arthur@hoa.ro> | 2019-07-27 12:34:30 +0200 |
|---|---|---|
| committer | ArthurHoaro <arthur@hoa.ro> | 2019-07-27 12:34:30 +0200 |
| commit | 38672ba0d1c722e5d6d33a58255ceb55e9410e46 (patch) | |
| tree | dae4c7c47532380eac3ae641db99122fc77c93dc /doc/md/Unit-tests-Docker.md | |
| parent | 83faedadff76c5bdca036f39f13943f63b27e164 (diff) | |
| parent | 1e77e0448bbd25675d8c0fe4a73206ad9048904b (diff) | |
| download | Shaarli-38672ba0d1c722e5d6d33a58255ceb55e9410e46.tar.gz Shaarli-38672ba0d1c722e5d6d33a58255ceb55e9410e46.tar.zst Shaarli-38672ba0d1c722e5d6d33a58255ceb55e9410e46.zip | |
Merge tag 'v0.10.4' into stable
Release v0.10.4
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 | ||