diff options
| author | Rémy Coutable <remy@rymai.me> | 2018-09-10 14:05:05 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2018-09-10 14:05:05 +0000 |
| commit | 9e40fb9f74b161363f8e4e9bffee21309e6b5734 (patch) | |
| tree | 697d36fe525ce9a28bdf62572d9265aaadad84ac /doc/ci | |
| parent | 5d6ada8cf86aedc7582d9f8fd0694d3c5f4b3762 (diff) | |
| parent | 207642fb7129162cf3570cff1425fc9440a8a7e3 (diff) | |
| download | gitlab-ce-9e40fb9f74b161363f8e4e9bffee21309e6b5734.tar.gz | |
Merge branch 'master' into 'master'
docs: Correct YAML indentation
See merge request gitlab-org/gitlab-ce!21631
Diffstat (limited to 'doc/ci')
| -rw-r--r-- | doc/ci/docker/using_docker_build.md | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/doc/ci/docker/using_docker_build.md b/doc/ci/docker/using_docker_build.md index 54a8cfe7fd8..aa997d15b64 100644 --- a/doc/ci/docker/using_docker_build.md +++ b/doc/ci/docker/using_docker_build.md @@ -151,16 +151,16 @@ In order to do that, follow the steps: DOCKER_DRIVER: overlay2 services: - - docker:dind + - docker:dind before_script: - - docker info + - docker info build: stage: build script: - - docker build -t my-docker-image . - - docker run my-docker-image /script/to/run/tests + - docker build -t my-docker-image . + - docker run my-docker-image /script/to/run/tests ``` Docker-in-Docker works well, and is the recommended configuration, but it is @@ -246,13 +246,13 @@ In order to do that, follow the steps: image: docker:stable before_script: - - docker info + - docker info build: stage: build script: - - docker build -t my-docker-image . - - docker run my-docker-image /script/to/run/tests + - docker build -t my-docker-image . + - docker run my-docker-image /script/to/run/tests ``` While the above method avoids using Docker in privileged mode, you should be @@ -403,7 +403,7 @@ could look like: build: image: docker:stable services: - - docker:dind + - docker:dind variables: DOCKER_HOST: tcp://docker:2375 DOCKER_DRIVER: overlay2 @@ -456,13 +456,13 @@ an application-specific deploy script: ```yaml image: docker:stable services: -- docker:dind + - docker:dind stages: -- build -- test -- release -- deploy + - build + - test + - release + - deploy variables: DOCKER_HOST: tcp://docker:2375 |