diff options
| author | Achilleas Pipinellis <axilleas@axilleas.me> | 2016-03-19 08:27:05 +0000 |
|---|---|---|
| committer | Achilleas Pipinellis <axilleas@axilleas.me> | 2016-03-19 08:27:05 +0000 |
| commit | 4f0302f00ef0c51b67b73429ace0a632971b7f1b (patch) | |
| tree | d6b330a0083bc62e3c1027ba5cc13e13ca3bd4fc | |
| parent | 18fc7c66f4455e757593a60e02a6306decef5a47 (diff) | |
| parent | 280d9dc23fb30bfc31f11c75c9c22251dde4b995 (diff) | |
| download | gitlab-ce-4f0302f00ef0c51b67b73429ace0a632971b7f1b.tar.gz | |
Merge branch 'master' into 'master'
Add information about `image` and `services` field at `job` level in the `.gitlab-ci.yml` documentation
Fixes #14366
/cc @tmaczukin @ayufan @axil
See merge request !3277
| -rw-r--r-- | doc/ci/yaml/README.md | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/doc/ci/yaml/README.md b/doc/ci/yaml/README.md index a9b79bbdb1b..762b35859b9 100644 --- a/doc/ci/yaml/README.md +++ b/doc/ci/yaml/README.md @@ -279,6 +279,8 @@ job_name: | Keyword | Required | Description | |---------------|----------|-------------| | script | yes | Defines a shell script which is executed by runner | +| image | no | Use docker image, covered in [Using Docker Images](../docker/using_docker_images.md#define-image-and-services-from-gitlab-ciyml) | +| services | no | Use docker services, covered in [Using Docker Images](../docker/using_docker_images.md#define-image-and-services-from-gitlab-ciyml) | | stage | no | Defines a build stage (default: `test`) | | type | no | Alias for `stage` | | only | no | Defines a list of git refs for which build is created | |