summaryrefslogtreecommitdiff
path: root/doc/ci/docker
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-04-15 06:09:49 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2020-04-15 06:09:49 +0000
commit00a8c64ffd18e74df4b1cdeda7776b5221fddafe (patch)
tree3a5262df3df89455384809bbd45dfb696c48ecde /doc/ci/docker
parentb71a496c7a3e109f7c85ad7ac453e6f7bf7cda45 (diff)
downloadgitlab-ce-00a8c64ffd18e74df4b1cdeda7776b5221fddafe.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'doc/ci/docker')
-rw-r--r--doc/ci/docker/using_docker_build.md7
1 files changed, 6 insertions, 1 deletions
diff --git a/doc/ci/docker/using_docker_build.md b/doc/ci/docker/using_docker_build.md
index acdc61d008f..0ae7a10a290 100644
--- a/doc/ci/docker/using_docker_build.md
+++ b/doc/ci/docker/using_docker_build.md
@@ -147,7 +147,12 @@ released.
#### TLS enabled
NOTE: **Note**
-This requires GitLab Runner 11.11 or higher.
+Requires GitLab Runner 11.11 or later, but is not supported if GitLab
+Runner is installed using the [Helm
+chart](https://docs.gitlab.com/runner/install/kubernetes.html). See the
+[related
+issue](https://gitlab.com/gitlab-org/charts/gitlab-runner/issues/83) for
+details.
The Docker daemon supports connection over TLS and it's done by default
for Docker 19.03.8 or higher. This is the **suggested** way to use the