diff options
| author | Kamil Trzciński <ayufan@ayufan.eu> | 2016-12-22 15:04:23 +0000 |
|---|---|---|
| committer | Kamil Trzciński <ayufan@ayufan.eu> | 2016-12-22 15:04:23 +0000 |
| commit | 96822b6933e9af3f003e82c71d03bf5a49bd22ee (patch) | |
| tree | 2bfcd8ff756f0e608110473a66618fecc133cb73 | |
| parent | 256a5e3ab1863e9d41cb0dee7bb52fe53c52c963 (diff) | |
| parent | 0fab1b7fe3e7fd09ff5de429bb91d762d53f2b97 (diff) | |
| download | gitlab-ce-96822b6933e9af3f003e82c71d03bf5a49bd22ee.tar.gz | |
Merge branch 'autodeploy-docs-tweaks' into 'master'
Improve autodeploy docs
See merge request !8242
| -rw-r--r-- | doc/ci/autodeploy/img/autodeploy_dropdown.png | bin | 46761 -> 51420 bytes | |||
| -rw-r--r-- | doc/ci/autodeploy/index.md | 7 |
2 files changed, 4 insertions, 3 deletions
diff --git a/doc/ci/autodeploy/img/autodeploy_dropdown.png b/doc/ci/autodeploy/img/autodeploy_dropdown.png Binary files differindex 1486a8ec0ea..d2733de83df 100644 --- a/doc/ci/autodeploy/img/autodeploy_dropdown.png +++ b/doc/ci/autodeploy/img/autodeploy_dropdown.png diff --git a/doc/ci/autodeploy/index.md b/doc/ci/autodeploy/index.md index 503a00969d5..9c79d8c457e 100644 --- a/doc/ci/autodeploy/index.md +++ b/doc/ci/autodeploy/index.md @@ -20,9 +20,10 @@ The list of supported autodeploy templates is available [here][autodeploy-templa ## Configuration 1. Enable a deployment [project service][project-services] to store your -credentials. For example, if you want to deploy to a Kubernetes cluster -you have to enable [Kubernetes service][kubernetes-service]. -1. Configure GitLab Runner to use [docker-in-docker executor][docker-in-docker]. +credentials. For example, if you want to deploy to OpenShift you have to +enable [Kubernetes service][kubernetes-service]. +1. Configure GitLab Runner to use Docker or Kubernetes executor with +[privileged mode enabled][docker-in-docker]. 1. Navigate to the "Project" tab and click "Set up autodeploy" button.  1. Select a template. |
