summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Greiling <mike@pixelcog.com>2019-06-14 19:08:59 +0000
committerMike Greiling <mike@pixelcog.com>2019-06-14 19:08:59 +0000
commit754ac402e7dbbb9f977b1187903e7cfda003c7d2 (patch)
tree67f84145c98c2e31fa983c5da5e35fa60c2154a7
parent89a221dcc977270b96c44742c03ee94a223a0c0b (diff)
parent7c50e997dcb163437c4ebf4ea040de0e560eefc9 (diff)
downloadgitlab-ce-754ac402e7dbbb9f977b1187903e7cfda003c7d2.tar.gz
Merge branch 'leipert-default-image-node-12' into 'master'
Update default CI image to use node@12 See merge request gitlab-org/gitlab-ce!29703
-rw-r--r--.gitlab-ci.yml2
1 files changed, 1 insertions, 1 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index d49b620f22c..059b181bb1c 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,4 +1,4 @@
-image: "dev.gitlab.org:5005/gitlab/gitlab-build-images:ruby-2.6.3-golang-1.11-git-2.21-chrome-73.0-node-10.x-yarn-1.12-postgresql-9.6-graphicsmagick-1.3.29"
+image: "dev.gitlab.org:5005/gitlab/gitlab-build-images:ruby-2.6.3-golang-1.11-git-2.21-chrome-73.0-node-12.x-yarn-1.16-postgresql-9.6-graphicsmagick-1.3.29"
variables:
MYSQL_ALLOW_EMPTY_PASSWORD: "1"