diff --git a/docs/configuration/advanced-configuration.md b/docs/configuration/advanced-configuration.md index 2c175e78ddc487b91495897decc9ac7333c0bb74..4bc76697e1f874806369686c4db3dba9c0fc925a 100644 --- a/docs/configuration/advanced-configuration.md +++ b/docs/configuration/advanced-configuration.md @@ -307,10 +307,16 @@ This defines the rkt parameters. | Parameter | Description | | --------- | ----------- | -| `image` | name of the default container image to run the build in if no image is specified in [`.gitlab-ci.yml`][yaml] | -| `helper_image` | name of the helper image to use for cloning the repository and down- and uploading build artifacts. This image **must** have `bash` and `git` installed | -| `insecure_image` | if disabled users must provide a gpg key fingerprint to verify their build image | -| `rkt_options` | [arbitrary options](../executors/rkt.md#configuring-arbitrary-rkt-options) to be passed to rkt commands | +| `image` | name of the default container image to run the build in if no image is specified in [`.gitlab-ci.yml`][yaml] | +| `image_pubkey_fingerprint` | fingerprint of the public key for verification of the default build image | +| `image_pubkey_uri` | URI of the gpg key-server for verification of the default build image | +| `insecure_image` | if disabled users must provide a gpg key fingerprint to verify their build image | +| `allowed_images` | list of images that can be specified in .gitlab-ci.yml. If not present all images are allowed. | +| `rkt_options` | [arbitrary options](../executors/rkt.md#configuring-arbitrary-rkt-options) to be passed to rkt commands | +| `helper_image` | [ADVANCED] Override the default helper image used to clone repos and upload artifacts. This image **must** have `bash` and `git` and gitlab-runner-helper installed | +| `helper_image_pubkey_fingerprint` | fingerprint of the public key for verification of the helper image | +| `helper_image_pubkey_uri` | URI of the gpg key-server for verification of the helper image | + ```bash [runners.rkt] diff --git a/docs/executors/rkt.md b/docs/executors/rkt.md index afc07db79538fa17f6edad0bd0b22526a8666848..ab198d6d7c1a02a2798fb752083f0c6fadd82276 100644 --- a/docs/executors/rkt.md +++ b/docs/executors/rkt.md @@ -65,5 +65,10 @@ option to be specified in [`config.toml`][toml]. along with enforcing [image verification](#image-verification) prevents all users from running any job. +## Further configuration + +See [advanced configuration][advancedconfig] + [yaml]: http://doc.gitlab.com/ce/ci/yaml/README.html [toml]: ../commands/README.md#configuration-file +[advancedconfig]: ../configuration/advanced-configuration.md#the-runnersrkt-section