From 0f7838f3ec57a02ad3795163bc35b58683f1adb2 Mon Sep 17 00:00:00 2001 From: Maria Date: Wed, 7 Dec 2016 11:56:15 -0500 Subject: [PATCH 1/4] Change node version in spec file --- spec/dockerfile_spec.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spec/dockerfile_spec.rb b/spec/dockerfile_spec.rb index 4710277..517380f 100644 --- a/spec/dockerfile_spec.rb +++ b/spec/dockerfile_spec.rb @@ -21,7 +21,7 @@ end describe command('node -v') do - its(:stdout) { should match /4\.2\.2/ } + its(:stdout) { should match /6\.9\.2/ } end describe command('npm -v') do From 70cbe06fcf9eb1fae3399867199a8af37a6abcaa Mon Sep 17 00:00:00 2001 From: Maria Date: Wed, 7 Dec 2016 13:51:47 -0500 Subject: [PATCH 2/4] Change npm version in spec file --- spec/dockerfile_spec.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spec/dockerfile_spec.rb b/spec/dockerfile_spec.rb index 517380f..4a3fd12 100644 --- a/spec/dockerfile_spec.rb +++ b/spec/dockerfile_spec.rb @@ -25,7 +25,7 @@ end describe command('npm -v') do - its(:stdout) { should match /2\.\d{1,2}\.\d{1,2}/ } + its(:stdout) { should match /3\.\10\.\9/ } end def os_version From 06a996348a51d97c7a34cb027f70655b808eb09d Mon Sep 17 00:00:00 2001 From: Maria Date: Wed, 7 Dec 2016 13:54:55 -0500 Subject: [PATCH 3/4] Upgrade to npm version 3.10.9 and node version 6.9.2 --- Dockerfile | 2 +- README.md | 4 ++-- circle.yml | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Dockerfile b/Dockerfile index 3d0c947..2192745 100644 --- a/Dockerfile +++ b/Dockerfile @@ -21,7 +21,7 @@ RUN set -ex \ done ENV NPM_CONFIG_LOGLEVEL info -ENV NODE_VERSION 4.2.2 +ENV NODE_VERSION 6.9.2 RUN \ cd /tmp && \ diff --git a/README.md b/README.md index ac06e08..00bb2b4 100644 --- a/README.md +++ b/README.md @@ -7,7 +7,7 @@ Dockerfile that generates an image for people who use [Node.js](http://nodejs.or ## Build image - $ docker build -t=ruby-nodejs:4.2.2 . + $ docker build -t=ruby-nodejs:6.9.2 . ## What's included @@ -18,7 +18,7 @@ Dockerfile that generates an image for people who use [Node.js](http://nodejs.or ## Pull image - $ docker pull shawnzhu/ruby-nodejs:4.2.2 + $ docker pull shawnzhu/ruby-nodejs:6.9.2 ## Testing diff --git a/circle.yml b/circle.yml index 0305ac7..8552834 100644 --- a/circle.yml +++ b/circle.yml @@ -4,7 +4,7 @@ machine: dependencies: override: - docker info - - docker build -t shawnzhu/ruby-nodejs:4.2.2 . + - docker build -t shawnzhu/ruby-nodejs:6.9.2 . test: override: - - node_version=$(docker run --rm shawnzhu/ruby-nodejs:4.2.2 node -v); [[ $node_version == "v4.2.2" ]] + - node_version=$(docker run --rm shawnzhu/ruby-nodejs:6.9.2 node -v); [[ $node_version == "v6.9.2" ]] From 3af5ea67af7148833f3da0e9f2b1aa2a659d8099 Mon Sep 17 00:00:00 2001 From: Maria Date: Wed, 7 Dec 2016 14:14:41 -0500 Subject: [PATCH 4/4] Fix npm version test --- spec/dockerfile_spec.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spec/dockerfile_spec.rb b/spec/dockerfile_spec.rb index 4a3fd12..82048b6 100644 --- a/spec/dockerfile_spec.rb +++ b/spec/dockerfile_spec.rb @@ -25,7 +25,7 @@ end describe command('npm -v') do - its(:stdout) { should match /3\.\10\.\9/ } + its(:stdout) { should match /3\.\d{1,2}\.\d{1,2}/ } end def os_version