From 37677d8165166e97734be4334dcde6ee2bf921e5 Mon Sep 17 00:00:00 2001
From: Mike Greiling <mike@pixelcog.com>
Date: Tue, 31 Oct 2017 14:14:50 -0500
Subject: [PATCH] upgrade yarn to v1.2 in chrome build images

---
 .gitlab-ci.yml              | 4 ++--
 scripts/custom-docker-build | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 7e4e75b..bbade6e 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -56,7 +56,7 @@ ruby-2.3.3-golang-1.8-git-2.7-phantomjs-2.1-node-7.1 test: *test_custom
 ruby-2.3.3-golang-1.8-git-2.7-phantomjs-2.1-node-7.1-postgresql-9.6 test: *test_custom
 ruby-2.3.3-golang-1.8-git-2.13-phantomjs-2.1-node-7.1-postgresql-9.6 test: *test_custom
 ruby-2.3.3-golang-1.8-git-2.13-phantomjs-2.1-node-8.x-yarn-1.0-postgresql-9.6 test: *test_custom
-ruby-2.3.5-golang-1.8-git-2.13-chrome-62.0-node-8.x-yarn-1.0-postgresql-9.6 test: *test_custom
+ruby-2.3.5-golang-1.8-git-2.13-chrome-62.0-node-8.x-yarn-1.2-postgresql-9.6 test: *test_custom
 ruby-2.3.5-golang-1.8-git-2.13-phantomjs-2.1-node-8.x-yarn-1.0-postgresql-9.6 test: *test_custom
 ruby-2.4.1-golang-1.8-git-2.7-phantomjs-2.1-node-7.1-postgresql-9.6 test: *test_custom
 golang-1.8-git-2.8.4 test: *test_custom
@@ -84,7 +84,7 @@ ruby-2.3.3-golang-1.8-git-2.7-phantomjs-2.1-node-7.1: *build_and_deploy_custom
 ruby-2.3.3-golang-1.8-git-2.7-phantomjs-2.1-node-7.1-postgresql-9.6: *build_and_deploy_custom
 ruby-2.3.3-golang-1.8-git-2.13-phantomjs-2.1-node-7.1-postgresql-9.6: *build_and_deploy_custom
 ruby-2.3.3-golang-1.8-git-2.13-phantomjs-2.1-node-8.x-yarn-1.0-postgresql-9.6: *build_and_deploy_custom
-ruby-2.3.5-golang-1.8-git-2.13-chrome-62.0-node-8.x-yarn-1.0-postgresql-9.6: *build_and_deploy_custom
+ruby-2.3.5-golang-1.8-git-2.13-chrome-62.0-node-8.x-yarn-1.2-postgresql-9.6: *build_and_deploy_custom
 ruby-2.3.5-golang-1.8-git-2.13-phantomjs-2.1-node-8.x-yarn-1.0-postgresql-9.6: *build_and_deploy_custom
 ruby-2.4.1-golang-1.8-git-2.7-phantomjs-2.1-node-7.1-postgresql-9.6: *build_and_deploy_custom
 golang-1.8-git-2.8.4: *build_and_deploy_custom
diff --git a/scripts/custom-docker-build b/scripts/custom-docker-build
index 71caba7..fe651d4 100755
--- a/scripts/custom-docker-build
+++ b/scripts/custom-docker-build
@@ -69,6 +69,7 @@ function print_node_args() {
 function print_yarn_args() {
     case "$1" in
         1.0) YARN_VERSION=1.0.2-1 ;;
+        1.2) YARN_VERSION=1.2.1-1 ;;
         *) echo "Unknown yarn version $1"; exit 1;
     esac
     printf -- "--build-arg YARN_VERSION=%s " "$YARN_VERSION"