diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-04-08 15:09:29 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-04-08 15:09:29 +0000 |
| commit | 5372e109c0660e4670aa987568a51082beca1b3c (patch) | |
| tree | 76f8f1178d5f304f0aea8c0c610729f695c9e18e /.gitlab-ci.yml | |
| parent | 403678e00406edc8094f087ec70e00aa29e49bef (diff) | |
| download | gitlab-ce-5372e109c0660e4670aa987568a51082beca1b3c.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to '.gitlab-ci.yml')
| -rw-r--r-- | .gitlab-ci.yml | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 4f91bdd27b1..9e808cc7a9b 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -12,7 +12,9 @@ stages: - post-qa - pages -# always use `gitlab-org` runners +# always use `gitlab-org` runners, however +# in cases where jobs require Docker-in-Docker, the job +# definition must be extended with `.use-docker-in-docker` default: tags: - gitlab-org @@ -49,6 +51,7 @@ variables: BUILD_ASSETS_IMAGE: "false" ES_JAVA_OPTS: "-Xms256m -Xmx256m" ELASTIC_URL: "http://elastic:changeme@elasticsearch:9200" + DOCKER_VERSION: "19.03.0" include: - local: .gitlab/ci/cache-repo.gitlab-ci.yml |