diff options
author | Achilleas Pipinellis <axil@gitlab.com> | 2017-08-29 08:45:05 +0000 |
---|---|---|
committer | Achilleas Pipinellis <axil@gitlab.com> | 2017-08-29 08:45:05 +0000 |
commit | 9e7e0496ff639d1eec65dcbf1b51edb2262456e2 (patch) | |
tree | 60b5e6bd3ed34db759b49a71e73eb612ad45d578 | |
parent | 3c25806ae0e427344d3ba6a2c1fc1bedae133a65 (diff) | |
parent | bb1a72c9cbb02eabeafed42c0ac5be992e26ae95 (diff) | |
download | gitlab-ce-9e7e0496ff639d1eec65dcbf1b51edb2262456e2.tar.gz |
Merge branch 'docs-update-dind-overlay2' into 'master'
Update doc for dind using overlay2
See merge request !13885
-rw-r--r-- | doc/ci/docker/using_docker_build.md | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/doc/ci/docker/using_docker_build.md b/doc/ci/docker/using_docker_build.md index f7c2a0ef0ca..f28c9791bee 100644 --- a/doc/ci/docker/using_docker_build.md +++ b/doc/ci/docker/using_docker_build.md @@ -134,7 +134,7 @@ In order to do that, follow the steps: # When using dind, it's wise to use the overlayfs driver for # improved performance. variables: - DOCKER_DRIVER: overlay + DOCKER_DRIVER: overlay2 services: - docker:dind @@ -248,7 +248,7 @@ aware of the following implications: By default, when using `docker:dind`, Docker uses the `vfs` storage driver which copies the filesystem on every run. This is a very disk-intensive operation -which can be avoided if a different driver is used, for example `overlay`. +which can be avoided if a different driver is used, for example `overlay2`. 1. Make sure a recent kernel is used, preferably `>= 4.2`. 1. Check whether the `overlay` module is loaded: @@ -275,8 +275,12 @@ which can be avoided if a different driver is used, for example `overlay`. ``` variables: - DOCKER_DRIVER: overlay + DOCKER_DRIVER: overlay2 ``` + +> **Note:** +- For more information about using OverlayFS with Docker, you can read + [Use the OverlayFS storage driver](https://docs.docker.com/engine/userguide/storagedriver/overlayfs-driver/). ## Using the GitLab Container Registry |