From 56eb58a39e9792acc627f40a67987fce4c53b3c2 Mon Sep 17 00:00:00 2001 From: Jesse Rosenberger Date: Mon, 3 Jul 2017 19:25:10 +0300 Subject: [PATCH 1/3] Node 4.8.3 --- base/Dockerfile | 4 ++-- binbuild/Dockerfile | 2 +- circle.yml | 2 +- devbuild/Dockerfile | 2 +- onbuild/Dockerfile | 4 ++-- tests/run_tests.sh | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/base/Dockerfile b/base/Dockerfile index 3d77421c..37562c39 100644 --- 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.3} +ONBUILD ENV NODE_VERSION ${NODE_VERSION:-4.8.3} RUN bash $METEORD_DIR/lib/install_base.sh RUN bash $METEORD_DIR/lib/install_node.sh diff --git a/binbuild/Dockerfile b/binbuild/Dockerfile index 3c6f4e1a..50bbaead 100644 --- 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.3} 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 index 159eef7a..1b717165 100644 --- a/circle.yml +++ b/circle.yml @@ -1,6 +1,6 @@ machine: node: - version: 4.8.0 + version: 4.8.3 services: - docker diff --git a/devbuild/Dockerfile b/devbuild/Dockerfile index 99081656..aa708d9b 100644 --- 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.3} ONBUILD RUN bash $METEORD_DIR/lib/install_meteor.sh ONBUILD COPY ./ /app diff --git a/onbuild/Dockerfile b/onbuild/Dockerfile index c84f8f96..be72695f 100644 --- 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.3} +ONBUILD ENV NODE_VERSION ${NODE_VERSION:-4.8.3} ONBUILD COPY ./ /app ONBUILD RUN bash $METEORD_DIR/lib/install_meteor.sh diff --git a/tests/run_tests.sh b/tests/run_tests.sh index 6ad919ad..ef9b5ab7 100644 --- 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.3} bash ./build_it.sh From 8beca34be128d3ce2a8e17ab455ca2db644b42cf Mon Sep 17 00:00:00 2001 From: Jesse Rosenberger Date: Mon, 17 Jul 2017 13:36:32 -0700 Subject: [PATCH 2/3] Node 4.8.4 --- base/Dockerfile | 4 ++-- binbuild/Dockerfile | 2 +- circle.yml | 2 +- devbuild/Dockerfile | 2 +- onbuild/Dockerfile | 4 ++-- tests/run_tests.sh | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/base/Dockerfile b/base/Dockerfile index 37562c39..b6fd333f 100644 --- 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.3} -ONBUILD ENV NODE_VERSION ${NODE_VERSION:-4.8.3} +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/binbuild/Dockerfile b/binbuild/Dockerfile index 50bbaead..456c281b 100644 --- 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.3} +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 index 1b717165..07240681 100644 --- a/circle.yml +++ b/circle.yml @@ -1,6 +1,6 @@ machine: node: - version: 4.8.3 + version: 4.8.4 services: - docker diff --git a/devbuild/Dockerfile b/devbuild/Dockerfile index aa708d9b..9d9276e8 100644 --- 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.3} +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 index be72695f..f8f24afb 100644 --- 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.3} -ONBUILD ENV NODE_VERSION ${NODE_VERSION:-4.8.3} +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 index ef9b5ab7..da6ddef9 100644 --- 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.3} +export NODE_VERSION=${NODE_VERSION:-4.8.4} bash ./build_it.sh From c196d4d8105163f4e3c959dd5efc06690ab67d4b Mon Sep 17 00:00:00 2001 From: Jesse Rosenberger Date: Mon, 17 Jul 2017 13:43:35 -0700 Subject: [PATCH 3/3] Update npm to 4.6.1. Not going to npm@5 yet because Meteor hasn't made that jump and won't fully make that jump until Meteor 1.6. --- base/scripts/lib/install_node.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/base/scripts/lib/install_node.sh b/base/scripts/lib/install_node.sh index 7b4d89df..2339d73e 100644 --- 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