kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Correct YAML indentation

Browse source
This commit is contained in:
Cam 2018-09-10 01:05:51 +00:00
parent 30227f8e8c
commit 207642fb71
1 changed files with 13 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
doc/ci/docker/using_docker_build.md
View file

@ -151,16 +151,16 @@ In order to do that, follow the steps:
DOCKER_DRIVER: overlay2 DOCKER_DRIVER: overlay2
services: services:
- docker:dind - docker:dind
before_script: before_script:
- docker info - docker info
build: build:
stage: build stage: build
script: script:
- docker build -t my-docker-image . - docker build -t my-docker-image .
- docker run my-docker-image /script/to/run/tests - docker run my-docker-image /script/to/run/tests
``` ```
Docker-in-Docker works well, and is the recommended configuration, but it is 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 image: docker:stable
before_script: before_script:
- docker info - docker info
build: build:
stage: build stage: build
script: script:
- docker build -t my-docker-image . - docker build -t my-docker-image .
- docker run my-docker-image /script/to/run/tests - docker run my-docker-image /script/to/run/tests
``` ```
While the above method avoids using Docker in privileged mode, you should be While the above method avoids using Docker in privileged mode, you should be
@ -403,7 +403,7 @@ could look like:
build: build:
image: docker:stable image: docker:stable
services: services:
- docker:dind - docker:dind
variables: variables:
DOCKER_HOST: tcp://docker:2375 DOCKER_HOST: tcp://docker:2375
DOCKER_DRIVER: overlay2 DOCKER_DRIVER: overlay2
@ -456,13 +456,13 @@ an application-specific deploy script:
```yaml ```yaml
image: docker:stable image: docker:stable
services: services:
- docker:dind - docker:dind
stages: stages:
- build - build
- test - test
- release - release
- deploy - deploy
variables: variables:
DOCKER_HOST: tcp://docker:2375 DOCKER_HOST: tcp://docker:2375