Merge pull request #4 from GetMagicVision/nodejs-update

Bump nodejs

Author: cybertk

Dockerfile

@@ -2,21 +2,24 @@ FROM ubuntu:14.04
 
 MAINTAINER MagicVision Team
 
+ENV NVM_VERSION v0.29.0
+ENV NODEJS_VERSION v5.0.0
+
 RUN apt-get update -y
 
 # Add a normal user with sudo permission
 RUN adduser --disabled-password --gecos "" ubuntu && echo "ubuntu ALL=(ALL) NOPASSWD:ALL" > /etc/sudoers.d/ubuntu
 
 # Install nvm
 RUN apt-get install -y curl build-essential libssl-dev man && \
-    curl https://raw.githubusercontent.com/creationix/nvm/v0.16.1/install.sh | su - ubuntu -c sh && \
+    curl https://raw.githubusercontent.com/creationix/nvm/$NVM_VERSION/install.sh | su - ubuntu -c sh && \
     echo 'export NVM_DIR="$HOME/.nvm"' >> /etc/profile && \
     echo '[ -s "$NVM_DIR/nvm.sh" ] && . "$NVM_DIR/nvm.sh"' >> /etc/profile
 
-# Install node.js 4.1.0
-RUN su - ubuntu -c "nvm install 4.1.0" && \
-    su - ubuntu -c "nvm alias default 4.1.0" && \
-    su - ubuntu -c "nvm use 4.1.0"
+# Install node.js
+RUN su - ubuntu -c "nvm install $NODEJS_VERSION" && \
+    su - ubuntu -c "nvm alias default $NODEJS_VERSION" && \
+    su - ubuntu -c "nvm use $NODEJS_VERSION"
 
 # Use Taobao node mirror and npm registry
 ENV NVM_NODEJS_ORG_MIRROR=http://npm.taobao.org/mirrors/node
@@ -55,6 +58,9 @@ RUN echo "deb http://mirrors.tuna.tsinghua.edu.cn/ubuntu/ trusty main restricted
     echo "deb http://mirrors.tuna.tsinghua.edu.cn/ubuntu/ trusty-backports main restricted universe multiverse" >> /etc/apt/sources.list && \
     apt-get update -y
 
+# Use 114 DNS
+RUN echo "nameserver 114.114.114.114" > /etc/resolv.conf
+
 # Create builds dir for CI
 RUN mkdir /builds && chmod 777 /builds
 

README.md

@@ -9,13 +9,17 @@
 ## Features
 
 - Docker support with [docker:dind][]
-- node.js 4.1.0 with npm
+- nvm 0.29.0
+- node.js 5.0.0 with npm 3.3.6
 - Ruby 1.9.1 with gem 1.8.23
 - [Saas][] 3.4.18
 - git 1.9.1
 - python 2.7.6
 - bower 1.6.5
 - Run commands as a normal user named *ubuntu* with sudo permission
+- Provisioning 114 DNS
+- Tsinghua Ubuntu mirror
+- Taobao nodejs and npm mirror
 
 [docker:dind]: https://hub.docker.com/_/docker/#
 [Saas]: https://github.com/sass/sass