Merge pull request kadirahq#19 from abernix/node-4.8.4

Node 4.8.4
birdage · Jul 17, 2017 · c25e14f · c25e14f
2 parents 775ce30 + c196d4d
commit c25e14f
Show file tree

Hide file tree

Showing 7 changed files with 9 additions and 9 deletions.
diff --git a/base/Dockerfile b/base/Dockerfile
@@ -5,8 +5,8 @@ ENV METEORD_DIR /opt/meteord
 COPY scripts $METEORD_DIR
 
 ARG NODE_VERSION
-ENV NODE_VERSION ${NODE_VERSION:-4.8.0}
-ONBUILD ENV NODE_VERSION ${NODE_VERSION:-4.8.0}
+ENV NODE_VERSION ${NODE_VERSION:-4.8.4}
+ONBUILD ENV NODE_VERSION ${NODE_VERSION:-4.8.4}
 
 RUN bash $METEORD_DIR/lib/install_base.sh
 RUN bash $METEORD_DIR/lib/install_node.sh

diff --git a/base/scripts/lib/install_node.sh b/base/scripts/lib/install_node.sh
@@ -20,4 +20,4 @@ mv ${NODE_DIST} /opt/nodejs
 ln -sf /opt/nodejs/bin/node /usr/bin/node
 ln -sf /opt/nodejs/bin/npm /usr/bin/npm
 
-npm install --global npm@3
+npm install --global npm@4.6.1
diff --git a/binbuild/Dockerfile b/binbuild/Dockerfile
@@ -2,7 +2,7 @@ FROM abernix/meteord:base
 MAINTAINER Jesse Rosenberger
 
 ARG NODE_VERSION
-ENV NODE_VERSION ${NODE_VERSION:-4.8.0}
+ENV NODE_VERSION ${NODE_VERSION:-4.8.4}
 
 COPY scripts/install_binbuild_tools.sh $METEORD_DIR/install_binbuild_tools.sh
 COPY scripts/rebuild_npm_modules.sh $METEORD_DIR/rebuild_npm_modules.sh

diff --git a/circle.yml b/circle.yml
@@ -1,6 +1,6 @@
 machine:
   node:
-    version: 4.8.0
+    version: 4.8.4
   services:
     - docker
 

diff --git a/devbuild/Dockerfile b/devbuild/Dockerfile
@@ -2,7 +2,7 @@ FROM abernix/meteord:base
 MAINTAINER Jesse Rosenberger
 
 ARG NODE_VERSION
-ENV NODE_VERSION ${NODE_VERSION:-4.8.0}
+ENV NODE_VERSION ${NODE_VERSION:-4.8.4}
 
 ONBUILD RUN bash $METEORD_DIR/lib/install_meteor.sh
 ONBUILD COPY ./ /app

diff --git a/onbuild/Dockerfile b/onbuild/Dockerfile
@@ -2,8 +2,8 @@ FROM abernix/meteord:base
 MAINTAINER MeteorHacks Pvt Ltd.
 
 ARG NODE_VERSION
-ENV NODE_VERSION ${NODE_VERSION:-4.8.0}
-ONBUILD ENV NODE_VERSION ${NODE_VERSION:-4.8.0}
+ENV NODE_VERSION ${NODE_VERSION:-4.8.4}
+ONBUILD ENV NODE_VERSION ${NODE_VERSION:-4.8.4}
 
 ONBUILD COPY ./ /app
 ONBUILD RUN bash $METEORD_DIR/lib/install_meteor.sh

diff --git a/tests/run_tests.sh b/tests/run_tests.sh
@@ -2,7 +2,7 @@
 set -e
 set -x
 
-export NODE_VERSION=${NODE_VERSION:-4.8.0}
+export NODE_VERSION=${NODE_VERSION:-4.8.4}
 
 bash ./build_it.sh
-Original file line number
+Diff line change
@@ Expand Up / @@ -2,7 +2,7 @@ @@
     set -e
     set -x
-    export NODE_VERSION=${NODE_VERSION:-4.8.0}
+    export NODE_VERSION=${NODE_VERSION:-4.8.4}
     bash ./build_it.sh
@@ Expand Down @@