Commit 4f0302f0 authored by Achilleas Pipinellis's avatar Achilleas Pipinellis

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
parents 18fc7c66 280d9dc2
...@@ -279,6 +279,8 @@ job_name: ...@@ -279,6 +279,8 @@ job_name:
| Keyword | Required | Description | | Keyword | Required | Description |
|---------------|----------|-------------| |---------------|----------|-------------|
| script | yes | Defines a shell script which is executed by runner | | 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`) | | stage | no | Defines a build stage (default: `test`) |
| type | no | Alias for `stage` | | type | no | Alias for `stage` |
| only | no | Defines a list of git refs for which build is created | | only | no | Defines a list of git refs for which build is created |
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment