summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEvan Read <eread@gitlab.com>2019-09-09 06:03:00 +0000
committerEvan Read <eread@gitlab.com>2019-09-09 06:03:00 +0000
commitbb2e7d3c98e781b940e544379416ec999ceaa6f6 (patch)
treed35ee3041ab81ecb15058bc3925aed943ee5274f
parent23e7875f0a91c938d291d7521bece84584ce8370 (diff)
parent7b03af0dc3a2add3721320670cb2242634f922a7 (diff)
downloadgitlab-ce-bb2e7d3c98e781b940e544379416ec999ceaa6f6.tar.gz
Merge branch 'dind-example-doc' into 'master'
Add DinD example note for k8s executors See merge request gitlab-org/gitlab-ce!32160
-rw-r--r--doc/ci/docker/using_docker_build.md7
1 files changed, 7 insertions, 0 deletions
diff --git a/doc/ci/docker/using_docker_build.md b/doc/ci/docker/using_docker_build.md
index a48da557e09..fc0125fcc18 100644
--- a/doc/ci/docker/using_docker_build.md
+++ b/doc/ci/docker/using_docker_build.md
@@ -721,6 +721,13 @@ deploy:
- master
```
+NOTE: **Note:**
+This example explicitly calls `docker pull`. If you prefer to implicitly pull the
+built image using `image:`, and use either the [Docker](https://docs.gitlab.com/runner/executors/docker.html)
+or [Kubernetes](https://docs.gitlab.com/runner/executors/kubernetes.html) executor,
+make sure that [`pull_policy`](https://docs.gitlab.com/runner/executors/docker.html#how-pull-policies-work)
+is set to `always`.
+
[docker-in-docker]: https://blog.docker.com/2013/09/docker-can-now-run-within-docker/
[docker-cap]: https://docs.docker.com/engine/reference/run/#runtime-privilege-and-linux-capabilities
[2fa]: ../../user/profile/account/two_factor_authentication.md