summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEvan Read <eread@gitlab.com>2019-08-20 07:02:31 +0000
committerEvan Read <eread@gitlab.com>2019-08-20 07:02:31 +0000
commit63ab3cf44376c1672c3af1940ff52f8bb88590e7 (patch)
tree18e590b6b3bc2b9c48967cbd3423c9812bb0cbc9
parentda9606512846aca61fb52f8afd6e9742426f8e3a (diff)
parent41e6c51613fc2bb97c22185cb5a231e0b6a7a38e (diff)
downloadgitlab-ce-63ab3cf44376c1672c3af1940ff52f8bb88590e7.tar.gz
Merge branch 'docs/add-docker-auth-config-notice' into 'master'
Docs DOCKER_AUTH_CONFIG not available for k8s See merge request gitlab-org/gitlab-ce!31961
-rw-r--r--doc/ci/docker/using_docker_images.md19
1 files changed, 11 insertions, 8 deletions
diff --git a/doc/ci/docker/using_docker_images.md b/doc/ci/docker/using_docker_images.md
index d5056568dff..489791141ed 100644
--- a/doc/ci/docker/using_docker_images.md
+++ b/doc/ci/docker/using_docker_images.md
@@ -495,14 +495,6 @@ that runner.
## Define an image from a private Container Registry
-> **Notes:**
->
-> - This feature requires GitLab Runner **1.8** or higher
-> - For GitLab Runner versions **>= 0.6, <1.8** there was a partial
-> support for using private registries, which required manual configuration
-> of credentials on runner's host. We recommend to upgrade your Runner to
-> at least version **1.8** if you want to use private registries.
-
To access private container registries, the GitLab Runner process can use:
- [Statically defined credentials](#using-statically-defined-credentials). That is, a username and password for a specific registry.
@@ -525,6 +517,17 @@ it's provided as an environment variable. This is because GitLab Runnner uses **
`config.toml` configuration and doesn't interpolate **ANY** environment variables at
runtime.
+### Requirements and limitations
+
+- This feature requires GitLab Runner **1.8** or higher.
+- For GitLab Runner versions **>= 0.6, <1.8** there was a partial
+ support for using private registries, which required manual configuration
+ of credentials on runner's host. We recommend to upgrade your Runner to
+ at least version **1.8** if you want to use private registries.
+- Not available for [Kubernetes executor](https://docs.gitlab.com/runner/executors/kubernetes.html),
+ follow <https://gitlab.com/gitlab-org/gitlab-runner/issues/2673> for
+ details.
+
### Using statically-defined credentials
There are two approaches that you can take in order to access a