Merge branch 'docs/change-text-from-examples' into 'master'

Fix text based on example

See merge request gitlab-org/gitlab-ce!27787
This commit is contained in:
Marcia Ramos 2019-04-29 11:43:27 +00:00
commit d232137aa7

View file

@ -2065,8 +2065,8 @@ include:
file: /templates/docker-workflow.yml file: /templates/docker-workflow.yml
``` ```
The `/templates/docker-workflow.yml` present in `/group/my-project` includes two local files The `/templates/docker-workflow.yml` present in `group/my-project` includes two local files
of the `/group/my-project`: of the `group/my-project`:
```yaml ```yaml
include: include:
@ -2074,14 +2074,14 @@ include:
- local: : /templates/docker-testing.yml - local: : /templates/docker-testing.yml
``` ```
Our `/templates/docker-build.yml` present in `/group/my-project` adds a `docker-build` job: Our `/templates/docker-build.yml` present in `group/my-project` adds a `docker-build` job:
```yaml ```yaml
docker-build: docker-build:
script: docker build -t my-image . script: docker build -t my-image .
``` ```
Our second `/templates/docker-test.yml` present in `/group/my-project` adds a `docker-test` job: Our second `/templates/docker-test.yml` present in `group/my-project` adds a `docker-test` job:
```yaml ```yaml
docker-test: docker-test:
@ -2479,9 +2479,9 @@ This can only be used when `custom_build_dir` is enabled in the [Runner's
configuration](https://docs.gitlab.com/runner/configuration/advanced-configuration.html#the-runnerscustom_build_dir-section). configuration](https://docs.gitlab.com/runner/configuration/advanced-configuration.html#the-runnerscustom_build_dir-section).
This is the default configuration for `docker` and `kubernetes` executor. This is the default configuration for `docker` and `kubernetes` executor.
By default, GitLab Runner clones the repository in a unique subpath of the By default, GitLab Runner clones the repository in a unique subpath of the
`$CI_BUILDS_DIR` directory. However, your project might require the code in a `$CI_BUILDS_DIR` directory. However, your project might require the code in a
specific directory (Go projects, for example). In that case, you can specify specific directory (Go projects, for example). In that case, you can specify
the `GIT_CLONE_PATH` variable to tell the Runner in which directory to clone the the `GIT_CLONE_PATH` variable to tell the Runner in which directory to clone the
repository: repository: