Skip to content

Commit

Permalink
Merge pull request #4 from gebharra/0.10.x
Browse files Browse the repository at this point in the history
nodejs 0.10.39
  • Loading branch information
shawnzhu committed Jun 30, 2015
2 parents f797d28 + 439e0bf commit b86a4b9
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 6 deletions.
6 changes: 3 additions & 3 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@ RUN apt-get install -y python-software-properties git curl socat wget sudo
# Install Node.js
RUN \
cd /tmp && \
curl -O http://nodejs.org/dist/v0.12.5/node-v0.12.5.tar.gz && \
tar xvzf node-v0.12.5.tar.gz && \
rm -f node-v0.12.5.tar.gz && \
curl -O http://nodejs.org/dist/v0.10.39/node-v0.10.39.tar.gz && \
tar xvzf node-v0.10.39.tar.gz && \
rm -f node-v0.10.39.tar.gz && \
cd node-v* && \
./configure && \
CXX="g++ -Wno-unused-local-typedefs" make && \
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ Dockerfile that generates an image for people who use [Node.js](http://nodejs.or

## Build image

$ docker build -t=ruby-nodejs:0.12.5
$ docker build -t=ruby-nodejs:0.10.39

## What's included

Expand All @@ -15,7 +15,7 @@ Dockerfile that generates an image for people who use [Node.js](http://nodejs.or

## Pull image

$ docker pull shawnzhu/ruby-nodejs:0.12.5
$ docker pull shawnzhu/ruby-nodejs:0.10.39

## Testing

Expand Down
2 changes: 1 addition & 1 deletion spec/dockerfile_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
end

describe command('node -v') do
its(:stdout) { should match /0\.12\.5/ }
its(:stdout) { should match /0\.10\.39/ }
end

describe command('npm -v') do
Expand Down

0 comments on commit b86a4b9

Please sign in to comment.