Commit c6152f3d authored by Evan Read's avatar Evan Read

Merge branch 'patch-71' into 'master'

Fixed documentationmarkdown link in Docker compose note

Closes #63114

See merge request gitlab-org/gitlab-ce!29502
parents b59da27c e5a84b27
...@@ -90,7 +90,7 @@ The second approach is to use the special docker-in-docker (dind) ...@@ -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 (`docker`) and run the job script in context of that
image in privileged mode. 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: In order to do that, follow the steps:
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment