diff options
| author | Sven Gerlach <sven.gerlach@gmail.com> | 2019-06-06 02:09:03 +0000 |
|---|---|---|
| committer | Evan Read <eread@gitlab.com> | 2019-06-06 02:09:03 +0000 |
| commit | 27c5fc2b64b18631f4f0dec5d0bb83def3826f5c (patch) | |
| tree | 073ba6dd65219c4902524e3637f65aff988e2c40 | |
| parent | bf6eb21e110896d5c0bdc7a51f9a5467e315365d (diff) | |
| download | gitlab-ce-27c5fc2b64b18631f4f0dec5d0bb83def3826f5c.tar.gz | |
Clarified the availability of docker-compose in documentation using_docker_build.md
| -rw-r--r-- | doc/ci/docker/using_docker_build.md | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/doc/ci/docker/using_docker_build.md b/doc/ci/docker/using_docker_build.md index dd112dadc40..6920ce17b46 100644 --- a/doc/ci/docker/using_docker_build.md +++ b/doc/ci/docker/using_docker_build.md @@ -2,8 +2,6 @@ GitLab CI/CD allows you to use Docker Engine to build and test docker-based projects. -TIP: **Tip:** -This also allows to you to use `docker-compose` and other docker-enabled tools. One of the new trends in Continuous Integration/Deployment is to: @@ -75,7 +73,7 @@ GitLab Runner then executes job scripts as the `gitlab-runner` user. - docker run my-docker-image /script/to/run/tests ``` -1. You can now use `docker` command and install `docker-compose` if needed. +1. You can now use `docker` command (and **install** `docker-compose` if needed). NOTE: **Note:** By adding `gitlab-runner` to the `docker` group you are effectively granting `gitlab-runner` full root permissions. @@ -85,8 +83,10 @@ For more information please read [On Docker security: `docker` group considered The second approach is to use the special docker-in-docker (dind) [Docker image](https://hub.docker.com/_/docker/) with all tools installed -(`docker` and `docker-compose`) and run the job script in context of that -image in privileged mode. +(`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. In order to do that, follow the steps: |