From 5d6075b475ec5d66cea0ce2b78d786ce68b16fea Mon Sep 17 00:00:00 2001
From: Mike Greiling <mike@pixelcog.com>
Date: Fri, 15 Sep 2017 14:13:20 -0500
Subject: [PATCH] lock yarn dependency

---
 .gitlab-ci.yml              | 4 ++--
 Dockerfile.custom           | 5 +++--
 scripts/custom-docker-build | 9 +++++++++
 scripts/install-node        | 3 ++-
 4 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index fdc45bf..df87b1c 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -58,7 +58,7 @@ ruby-2.3.3-golang-1.8-git-2.13-phantomjs-2.1-node-7.1-postgresql-9.6 test: *test
 ruby-2.3.3-golang-1.8-git-2.7-chrome-60.0-node-7.1-postgresql-9.6 test: *test_custom
 ruby-2.3.3-golang-1.8-git-2.13-chrome-60.0-node-7.1-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
-ruby-2.4.1-golang-1.8-git-2.13-chrome-61.0-node-7.1-postgresql-9.6 test: *test_custom
+ruby-2.4.1-golang-1.8-git-2.13-chrome-61.0-node-7.1-yarn-1.0-postgresql-9.6 test: *test_custom
 golang-1.8-git-2.8.4 test: *test_custom
 golang-1.8-git-2.13 test: *test_custom
 
@@ -87,7 +87,7 @@ ruby-2.3.3-golang-1.8-git-2.13-phantomjs-2.1-node-7.1-postgresql-9.6: *build_and
 ruby-2.3.3-golang-1.8-git-2.7-chrome-60.0-node-7.1-postgresql-9.6: *build_and_deploy_custom
 ruby-2.3.3-golang-1.8-git-2.13-chrome-60.0-node-7.1-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
-ruby-2.4.1-golang-1.8-git-2.13-chrome-61.0-node-7.1-postgresql-9.6: *build_and_deploy_custom
+ruby-2.4.1-golang-1.8-git-2.13-chrome-61.0-node-7.1-yarn-1.0-postgresql-9.6: *build_and_deploy_custom
 golang-1.8-git-2.8.4: *build_and_deploy_custom
 golang-1.8-git-2.13: *build_and_deploy_custom
 
diff --git a/Dockerfile.custom b/Dockerfile.custom
index d848022..2658f0a 100644
--- a/Dockerfile.custom
+++ b/Dockerfile.custom
@@ -27,9 +27,10 @@ RUN if [ -n "$CHROME_VERSION" ]; then /scripts/install-chrome $CHROME_VERSION &&
 ARG PHANTOMJS_VERSION
 RUN if [ -n "$PHANTOMJS_VERSION" ] ; then /scripts/install-phantomjs $PHANTOMJS_VERSION; fi
 
-# NodeJS
+# NodeJS and Yarn
 ARG NODE_VERSION
-RUN if [ -n "$NODE_VERSION" ] ; then /scripts/install-node $NODE_VERSION && node --version; fi
+ARG YARN_VERSION
+RUN if [ -n "$NODE_VERSION" ] ; then /scripts/install-node $NODE_VERSION $YARN_VERSION && node --version && yarn --version; fi
 
 # Golang
 ARG GOLANG_VERSION
diff --git a/scripts/custom-docker-build b/scripts/custom-docker-build
index 172129c..91c9009 100755
--- a/scripts/custom-docker-build
+++ b/scripts/custom-docker-build
@@ -64,6 +64,14 @@ function print_node_args() {
     printf -- "--build-arg NODE_VERSION=%s " "$NODE_VERSION"
 }
 
+function print_yarn_args() {
+    case "$1" in
+        1.0) YARN_VERSION=1.0.2-1 ;;
+        *) echo "Unknown yarn version $1"; exit 1;
+    esac
+    printf -- "--build-arg YARN_VERSION=%s " "$YARN_VERSION"
+}
+
 function print_postgres_args() {
     printf -- "--build-arg POSTGRES_VERSION=%s " "$1"
 }
@@ -82,6 +90,7 @@ function parse_arguments() {
             git) print_git_args $version ;;
             phantomjs) print_phantomjs_args $version ;;
             node) print_node_args $version ;;
+            yarn) print_yarn_args $version ;;
             postgresql) print_postgres_args $version ;;
             *) exit 1;;
         esac
diff --git a/scripts/install-node b/scripts/install-node
index b43a0c6..449eaa2 100755
--- a/scripts/install-node
+++ b/scripts/install-node
@@ -3,6 +3,7 @@
 set -xeo pipefail
 
 NODE_VERSION=${1:-7.x}
+YARN_VERSION=${2:-0.27.5-1}
 
 # add official debian repos for node and yarn
 curl -sS -L https://deb.nodesource.com/setup_${NODE_VERSION} | bash -
@@ -10,4 +11,4 @@ curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add -
 echo "deb https://dl.yarnpkg.com/debian/ stable main" | tee /etc/apt/sources.list.d/yarn.list
 
 apt-get update
-apt-get install -y nodejs yarn
+apt-get install -y nodejs yarn=$YARN_VERSION