Merge branch 'patch-71' into 'master'

Fixed documentationmarkdown link in Docker compose note

Closes #63114

See merge request gitlab-org/gitlab-ce!29502
This commit is contained in:
Evan Read 2019-06-12 00:36:53 +00:00
commit c6152f3d28
1 changed files with 1 additions and 1 deletions

View File

@ -90,7 +90,7 @@ The second approach is to use the special docker-in-docker (dind)
(`docker`) and run the job script in context of that
image in privileged mode.
NOTE: **Note:** `docker-compose` is not part of docker-in-docker (dind). In case you'd like to use `docker-compose` in your CI builds, please follow the (installation instructions for docker-compose)[https://docs.docker.com/compose/install/] provided by docker.
NOTE: **Note:** `docker-compose` is not part of docker-in-docker (dind). In case you'd like to use `docker-compose` in your CI builds, please follow the [installation instructions for docker-compose](https://docs.docker.com/compose/install/) provided by docker.
In order to do that, follow the steps: