Commit 93a33556 authored by Achilleas Pipinellis's avatar Achilleas Pipinellis

Merge branch 'master' into 'master'

Document the usage of the Docker OverlayFS driver for every build

See merge request gitlab-org/gitlab-ce!14478
parents 9e3d1f86 bf5c2ff8
...@@ -250,6 +250,8 @@ By default, when using `docker:dind`, Docker uses the `vfs` storage driver which ...@@ -250,6 +250,8 @@ 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 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 `overlay2`. which can be avoided if a different driver is used, for example `overlay2`.
### Requirements
1. Make sure a recent kernel is used, preferably `>= 4.2`. 1. Make sure a recent kernel is used, preferably `>= 4.2`.
1. Check whether the `overlay` module is loaded: 1. Check whether the `overlay` module is loaded:
...@@ -271,14 +273,27 @@ which can be avoided if a different driver is used, for example `overlay2`. ...@@ -271,14 +273,27 @@ which can be avoided if a different driver is used, for example `overlay2`.
overlay overlay
``` ```
1. Use the driver by defining a variable at the top of your `.gitlab-ci.yml`: ### Use driver per project
``` You can enable the driver for each project individually by editing the project's `.gitlab-ci.yml`:
variables:
```
variables:
DOCKER_DRIVER: overlay2 DOCKER_DRIVER: overlay2
``` ```
> **Note:** ### Use driver for every project
To enable the driver for every project, you can set the environment variable for every build by adding `environment` in the `[[runners]]` section of `config.toml`:
```toml
environment = ["DOCKER_DRIVER=overlay2"]
```
If you're running multiple Runners you will have to modify all configuration files.
> **Notes:**
- More information about the Runner configuration is available in the [Runner documentation](https://docs.gitlab.com/runner/configuration/).
- For more information about using OverlayFS with Docker, you can read - 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/). [Use the OverlayFS storage driver](https://docs.docker.com/engine/userguide/storagedriver/overlayfs-driver/).
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment