diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-03 15:08:08 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-03 15:08:08 +0300 |
| commit | f1e2fca19a90a6992c2020cf8c2159cfb0b61bca (patch) | |
| tree | c084a29873f0fe6ff42555c590da6a9d8527df91 /doc/ci/docker | |
| parent | 87ef501eacd66d7166183d20d84e33de022f7002 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'doc/ci/docker')
| -rw-r--r-- | doc/ci/docker/using_docker_build.md | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/doc/ci/docker/using_docker_build.md b/doc/ci/docker/using_docker_build.md index dca8d030820..11a672fe1c6 100644 --- a/doc/ci/docker/using_docker_build.md +++ b/doc/ci/docker/using_docker_build.md @@ -114,9 +114,9 @@ Docker-in-Docker works well, and is the recommended configuration, but it is not without its own challenges: - When using docker-in-docker, each job is in a clean environment without the past - history. Concurrent jobs work fine because every build gets it's own + history. Concurrent jobs work fine because every build gets its own instance of Docker engine so they won't conflict with each other. But this - also means jobs can be slower because there's no caching of layers. + also means that jobs can be slower because there's no caching of layers. - By default, Docker 17.09 and higher uses `--storage-driver overlay2` which is the recommended storage driver. See [Using the overlayfs driver](#using-the-overlayfs-driver) for details. |