summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAdam Niedzielski <adamsunday@gmail.com>2016-12-22 00:23:26 +0100
committerAdam Niedzielski <adamsunday@gmail.com>2016-12-22 00:23:26 +0100
commit0fab1b7fe3e7fd09ff5de429bb91d762d53f2b97 (patch)
tree2705a0331558e100f790b74c8fe5be5111262e93
parentc7ee5742337c799e7a2bda0d74756b7e51770fca (diff)
downloadgitlab-ce-0fab1b7fe3e7fd09ff5de429bb91d762d53f2b97.tar.gz
Improve autodeploy docs [CI skip]autodeploy-docs-tweaks
-rw-r--r--doc/ci/autodeploy/img/autodeploy_dropdown.pngbin46761 -> 51420 bytes
-rw-r--r--doc/ci/autodeploy/index.md7
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
index 1486a8ec0ea..d2733de83df 100644
--- a/doc/ci/autodeploy/img/autodeploy_dropdown.png
+++ b/doc/ci/autodeploy/img/autodeploy_dropdown.png
Binary files differ
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.
![Autodeploy button](img/autodeploy_button.png)
1. Select a template.