Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

npm and node upgrade #14

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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 && \
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand All @@ -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

Expand Down
4 changes: 2 additions & 2 deletions circle.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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" ]]
4 changes: 2 additions & 2 deletions spec/dockerfile_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,11 @@
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
its(:stdout) { should match /2\.\d{1,2}\.\d{1,2}/ }
its(:stdout) { should match /3\.\d{1,2}\.\d{1,2}/ }
end

def os_version
Expand Down