diff options
| author | Paul Okstad <pokstad@gitlab.com> | 2019-03-29 02:02:24 +0300 |
|---|---|---|
| committer | Paul Okstad <pokstad@gitlab.com> | 2019-03-29 02:02:24 +0300 |
| commit | 702be9010e4091761830ef628a729cf960cd65ed (patch) | |
| tree | a16a0bcf71e5806887e9b1516fb273c5b6a14fbf | |
| parent | b2335569444153a38e82dd8d4e9228465f9274ca (diff) | |
| parent | 86ffdab98a502e85f26259f361a81d3671a2358f (diff) | |
Merge branch '1569-use-overlay2-storage-driver-on-docker' into 'master'
Always use overlay2 storage driver on Docker build
Closes #1569
See merge request gitlab-org/gitaly!1148
| -rw-r--r-- | .gitlab-ci.yml | 4 | ||||
| -rw-r--r-- | changelogs/unreleased/1569-use-overlay2-storage-driver-on-docker.yml | 5 |
2 files changed, 6 insertions, 3 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index b0ee4d885..a9399c076 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -6,7 +6,7 @@ stages: - publish variables: - DOCKER_DRIVER: overlay + DOCKER_DRIVER: overlay2 CUSTOM_IMAGE_VERSION: ruby-2.5-golang-1.11-git-2.18 danger-review: @@ -127,8 +127,6 @@ cover: code_quality: image: docker:stable - variables: - DOCKER_DRIVER: overlay2 allow_failure: true services: - docker:stable-dind diff --git a/changelogs/unreleased/1569-use-overlay2-storage-driver-on-docker.yml b/changelogs/unreleased/1569-use-overlay2-storage-driver-on-docker.yml new file mode 100644 index 000000000..dc81046b4 --- /dev/null +++ b/changelogs/unreleased/1569-use-overlay2-storage-driver-on-docker.yml @@ -0,0 +1,5 @@ +--- +title: Always use overlay2 storage driver on Docker build +merge_request: 1148 +author: Takuya Noguchi +type: other |