diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-12-13 21:07:41 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-12-13 21:07:41 +0000 |
| commit | 0e2fc1701bd0c87cc458cbbb34c618b0e0dc5a14 (patch) | |
| tree | 5f08f2602120b0555e5c0dc0061d7c8eea054c22 /.gitlab/ci | |
| parent | 7cc6c10c68915f5019ab8c2029eeb462c8fed4ef (diff) | |
| download | gitlab-ce-0e2fc1701bd0c87cc458cbbb34c618b0e0dc5a14.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to '.gitlab/ci')
| -rw-r--r-- | .gitlab/ci/global.gitlab-ci.yml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/.gitlab/ci/global.gitlab-ci.yml b/.gitlab/ci/global.gitlab-ci.yml index 3c24ce4f24d..9ebd28c7258 100644 --- a/.gitlab/ci/global.gitlab-ci.yml +++ b/.gitlab/ci/global.gitlab-ci.yml @@ -213,7 +213,7 @@ - name: postgres:9.6 command: ["postgres", "-c", "fsync=off", "-c", "synchronous_commit=off", "-c", "full_page_writes=off"] - name: redis:alpine - - name: docker.elastic.co/elasticsearch/elasticsearch:5.6.12 + - name: elasticsearch:5.6.12 .use-pg10-ee: image: "registry.gitlab.com/gitlab-org/gitlab-build-images:ruby-2.6.3-golang-1.12-git-2.24-lfs-2.9-chrome-73.0-node-12.x-yarn-1.16-postgresql-10-graphicsmagick-1.3.33" @@ -221,7 +221,7 @@ - name: postgres:10.9 command: ["postgres", "-c", "fsync=off", "-c", "synchronous_commit=off", "-c", "full_page_writes=off"] - name: redis:alpine - - name: docker.elastic.co/elasticsearch/elasticsearch:5.6.12 + - name: elasticsearch:5.6.12 .only-ee: only: |