From 5ee94c9921dbc6aa8742864300bdc2c91f5b702a Mon Sep 17 00:00:00 2001
From: Jose Ivan Vargas <jvargas@gitlab.com>
Date: Tue, 7 Nov 2017 10:43:40 -0600
Subject: [PATCH] renamed node and yarn variables

---
 Dockerfile.custom           |  6 +++---
 scripts/custom-docker-build | 12 ++++++------
 scripts/install-node        | 12 ++++++------
 3 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/Dockerfile.custom b/Dockerfile.custom
index 2658f0a..e4177c7 100644
--- a/Dockerfile.custom
+++ b/Dockerfile.custom
@@ -28,9 +28,9 @@ ARG PHANTOMJS_VERSION
 RUN if [ -n "$PHANTOMJS_VERSION" ] ; then /scripts/install-phantomjs $PHANTOMJS_VERSION; fi
 
 # NodeJS and Yarn
-ARG NODE_VERSION
-ARG YARN_VERSION
-RUN if [ -n "$NODE_VERSION" ] ; then /scripts/install-node $NODE_VERSION $YARN_VERSION && node --version && yarn --version; fi
+ARG NODE_INSTALL_VERSION
+ARG YARN_INSTALL_VERSION
+RUN if [ -n "$NODE_INSTALL_VERSION" ] ; then /scripts/install-node $NODE_INSTALL_VERSION $YARN_INSTALL_VERSION && node --version && yarn --version; fi
 
 # Golang
 ARG GOLANG_VERSION
diff --git a/scripts/custom-docker-build b/scripts/custom-docker-build
index fe651d4..4eaab71 100755
--- a/scripts/custom-docker-build
+++ b/scripts/custom-docker-build
@@ -59,20 +59,20 @@ function print_phantomjs_args() {
 
 function print_node_args() {
     case "$1" in
-        7.x|7.1) NODE_VERSION=7.x ;;
-        8.x) NODE_VERSION=8.x ;;
+        7.x|7.1) NODE_INSTALL_VERSION=7.x ;;
+        8.x) NODE_INSTALL_VERSION=8.x ;;
         *) echo "Unknown node version $1"; exit 1;
     esac
-    printf -- "--build-arg NODE_VERSION=%s " "$NODE_VERSION"
+    printf -- "--build-arg NODE_INSTALL_VERSION=%s " "$NODE_INSTALL_VERSION"
 }
 
 function print_yarn_args() {
     case "$1" in
-        1.0) YARN_VERSION=1.0.2-1 ;;
-        1.2) YARN_VERSION=1.2.1-1 ;;
+        1.0) YARN_INSTALL_VERSION=1.0.2-1 ;;
+        1.2) YARN_INSTALL_VERSION=1.2.1-1 ;;
         *) echo "Unknown yarn version $1"; exit 1;
     esac
-    printf -- "--build-arg YARN_VERSION=%s " "$YARN_VERSION"
+    printf -- "--build-arg YARN_INSTALL_VERSION=%s " "$YARN_INSTALL_VERSION"
 }
 
 function print_postgres_args() {
diff --git a/scripts/install-node b/scripts/install-node
index 06e9b84..7eb9a78 100755
--- a/scripts/install-node
+++ b/scripts/install-node
@@ -2,18 +2,18 @@
 
 set -xeo pipefail
 
-NODE_VERSION=${1:-7.x}
-YARN_VERSION=${2:-0.27.5-1}
+NODE_INSTALL_VERSION=${1:-7.x}
+YARN_INSTALL_VERSION=${2:-0.27.5-1}
 
 # Map MAJOR.MINOR.patch -> MAJOR.x
 #
-# NODE_VERSION may resolve to the full version if inside a node container image.
-NODE_VERSION=`echo $NODE_VERSION | sed -r -e "s/([0-9]+)\.[0-9]+.*/\1\.x/g"`
+# NODE_INSTALL_VERSION may resolve to the full version if inside a node container image.
+NODE_INSTALL_VERSION=`echo $NODE_INSTALL_VERSION | sed -r -e "s/([0-9]+)\.[0-9]+.*/\1\.x/g"`
 
 # add official debian repos for node and yarn
-curl -sS -L https://deb.nodesource.com/setup_${NODE_VERSION} | bash -
+curl -sS -L https://deb.nodesource.com/setup_${NODE_INSTALL_VERSION} | bash -
 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=$YARN_VERSION
+apt-get install -y nodejs yarn=$YARN_INSTALL_VERSION