Install node 6 in the base image and make it the default.

Install also additional base packages like Elm and Yarn.

Signed-off-by: David Calavera <david.calavera@gmail.com>

Dockerfile

@@ -108,12 +108,10 @@ USER root
 USER buildbot
 RUN git clone https://github.com/creationix/nvm.git ~/.nvm
 
-RUN /bin/bash -c '. ~/.nvm/nvm.sh && nvm install 4 && nvm use 4 && \
-    npm install -g sm && \
-    npm install -g grunt-cli && \
-    npm install -g bower && \
-    npm install -g elm && \
-    npm install -g yarn'
+RUN /bin/bash -c ". ~/.nvm/nvm.sh && \
+		  nvm install 4 && nvm use 4 && npm install -g sm grunt-cli bower elm yarn && \
+		  nvm install 6 && nvm use 6 && npm install -g sm grunt-cli bower elm yarn && \
+		  nvm alias default node && nvm cache clear"
 
 USER root
 

run-build.sh

@@ -31,7 +31,7 @@ fi
 
 # Node version
 source $HOME/.nvm/nvm.sh
-export NODE_VERSION=4
+export NODE_VERSION=6
 if [ -f .nvmrc ]; then
   nvm install $(cat .nvmrc)
   if [ $? -ne 0 ]; then
@@ -84,18 +84,25 @@ fi
 # NPM Dependencies
 if [ -f package.json ]
 then
-  echo "Installing npm modules"
-  if npm install; then
-  	export PATH=$(npm bin):$PATH
-		echo "NPM modules installed"
+	echo "Installing npm modules"
+	if [ -f yarn.lock ]; then
+		if yarn install; then
+			export PATH=$(yarn bin):$PATH
+			echo "NPM modules installed"
+		fi
+	else
+		if npm install; then
+			export PATH=$(npm bin):$PATH
+			echo "NPM modules installed"
+		fi
 	fi
 fi
 
 # Bower Dependencies
 if [ -f bower.json ]
 then
-  echo "Installing bower components"
-  if bower install --config.interactive=false; then
+	echo "Installing bower components"
+	if bower install --config.interactive=false; then
 		echo "Bower components installed"
 	fi
 fi