summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPat Turner <pturner@pat-turners-computer.local>2016-03-17 15:28:55 +0000
committerPat Turner <pturner@pat-turners-computer.local>2016-03-17 15:28:55 +0000
commit0ce1f9387a0bb92b6e6656fa90e7d456f82aded1 (patch)
treead346933295f912d888e565acd6ee2f5509b909d
parent9392e1375cdd65fe4a0a53ee12691aed94e25138 (diff)
downloadgitlab-ce-0ce1f9387a0bb92b6e6656fa90e7d456f82aded1.tar.gz
Fix for https://gitlab.com/gitlab-org/gitlab-ce/issues/14366
-rw-r--r--doc/ci/yaml/README.md2
1 files changed, 2 insertions, 0 deletions
diff --git a/doc/ci/yaml/README.md b/doc/ci/yaml/README.md
index a9b79bbdb1b..4a932dfeaff 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-ci.yml) |
+| services | no | Use docker services, covered in [Use Docker - Using Docker Images](../docker/using_docker_images.md#define-image-and-services-from-.gitlab-ci.yml) |
| 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 |