diff options
| author | Achilleas Pipinellis <axilleas@axilleas.me> | 2016-06-14 10:54:36 +0000 |
|---|---|---|
| committer | Achilleas Pipinellis <axilleas@axilleas.me> | 2016-06-14 10:54:36 +0000 |
| commit | ab3fb00c429133ac4aa98887314dba3a167b919c (patch) | |
| tree | d0fb7e0f3077b3e3b2447144e88108a1862548e2 /doc/ci/examples/php.md | |
| parent | 47cdb6992129f97756bba6bb174d9928da6c573c (diff) | |
| parent | 6ed7fcad29d0b96b4513c2961c342d0309eda07e (diff) | |
| download | gitlab-ce-ab3fb00c429133ac4aa98887314dba3a167b919c.tar.gz | |
Merge branch 'registry-example' into 'master'
Update CI Docker docs
## What does this MR do?
Updates documentation with:
* instructions for bind-mounting for docker runners (fixes #17769 and #13898)
* examples of using the GitLab Container Registry in docker-based builds (fixes #17968 and #17967)
* update runner instructions for `gitlab-ci-multi-runner` (fixes https://gitlab.com/gitlab-org/gitlab-ci-multi-runner/issues/1337)
* some grammar fixes
## Are there points in the code the reviewer needs to double check?
The markdown in general. The runner commands. I haven't been able to verify the socket version works yet.
## Why was this MR needed?
Better documentation for users.
## What are the relevant issue numbers?
#17769, #13898, #17968, #17967
## Screenshots (if relevant)
See merge request !4524
Diffstat (limited to 'doc/ci/examples/php.md')
| -rw-r--r-- | doc/ci/examples/php.md | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/doc/ci/examples/php.md b/doc/ci/examples/php.md index 26953014502..17e1c64bb8a 100644 --- a/doc/ci/examples/php.md +++ b/doc/ci/examples/php.md @@ -263,10 +263,10 @@ terminal execute: ```bash # Check using docker executor -gitlab-runner exec docker test:app +gitlab-ci-multi-runner exec docker test:app # Check using shell executor -gitlab-runner exec shell test:app +gitlab-ci-multi-runner exec shell test:app ``` ## Example project |