From 174b81e7ece1726d2d417dfab0f655ad177f6718 Mon Sep 17 00:00:00 2001
From: Fabian Jakobs <fabian@c9.io>
Date: Mon, 8 Feb 2016 14:03:28 +0000
Subject: [PATCH] only run npm in docker if user is ubuntu

---
 b9/lib/_npm.sh | 31 ++++++++++++++++++-------------
 1 file changed, 18 insertions(+), 13 deletions(-)

diff --git a/b9/lib/_npm.sh b/b9/lib/_npm.sh
index 565f23c8..f4c31182 100644
--- a/b9/lib/_npm.sh
+++ b/b9/lib/_npm.sh
@@ -3,19 +3,24 @@
 _b9_npm() {
     local WORKDIR=$1
     shift
-    docker run \
-        --rm \
-        -w /home/ubuntu/newclient \
-        -v $WORKDIR:/home/ubuntu/newclient \
-        --sig-proxy -a STDIN -a STDOUT -a STDERR \
-        $(_b9_get_newclient_image) bash -c "
-            echo \"$(_b9_npm_get_github_ssh)\" >> /home/ubuntu/.ssh/id_rsa_deploy
-            chmod 600 /home/ubuntu/.ssh/id_rsa_deploy
-            npm "$@"
-        "
-    # pushd $WORKDIR
-    # npm "$@"
-    # popd
+
+    # TODO run all build steps in a container
+    if [ $(id -u) == "1000" ]; then
+        docker run \
+            --rm \
+            -w /home/ubuntu/newclient \
+            -v $WORKDIR:/home/ubuntu/newclient \
+            --sig-proxy -a STDIN -a STDOUT -a STDERR \
+            $(_b9_get_newclient_image) bash -c "
+                echo \"$(_b9_npm_get_github_ssh)\" >> /home/ubuntu/.ssh/id_rsa_deploy
+                chmod 600 /home/ubuntu/.ssh/id_rsa_deploy
+                npm "$@"
+            "
+    else
+        pushd $WORKDIR &> /dev/null
+        npm "$@"
+        popd &> /dev/null
+    fi
 }
 
 _b9_npm_get_github_ssh() {