summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorAchilleas Pipinellis <axilleas@axilleas.me>2016-09-05 08:18:40 +0000
committerAchilleas Pipinellis <axilleas@axilleas.me>2016-09-05 08:18:40 +0000
commitfe3d94e8e2e3f5d54575a7f16440cc1711617d2b (patch)
treeae692e72738177dbb36651f19fe0fa470a7c6f92 /doc
parentbeb0b666dc000d51b7ed0eb264bd04ca466117d1 (diff)
parentde4c0c2e710e4511ad5781bb2d2ab2e0f85dc2f5 (diff)
downloadgitlab-ce-fe3d94e8e2e3f5d54575a7f16440cc1711617d2b.tar.gz
Merge branch 'patch-5' into 'master'
Update README.md Added a line to the SSH Key Gen section, to ensure that the `before_script` does not prompt for a passphrase. See merge request !6176
Diffstat (limited to 'doc')
-rw-r--r--doc/ci/ssh_keys/README.md3
1 files changed, 2 insertions, 1 deletions
diff --git a/doc/ci/ssh_keys/README.md b/doc/ci/ssh_keys/README.md
index 7c0fb225dac..b858029d25e 100644
--- a/doc/ci/ssh_keys/README.md
+++ b/doc/ci/ssh_keys/README.md
@@ -30,7 +30,8 @@ This is the universal solution which works with any type of executor
## SSH keys when using the Docker executor
You will first need to create an SSH key pair. For more information, follow the
-instructions to [generate an SSH key](../../ssh/README.md).
+instructions to [generate an SSH key](../../ssh/README.md). Do not add a comment
+to the SSH key, or the `before_script` will prompt for a passphrase.
Then, create a new **Secret Variable** in your project settings on GitLab
following **Settings > Variables**. As **Key** add the name `SSH_PRIVATE_KEY`