Merge pull request nodejs#66 from pesho/master

Update to v2.2.0
Starefossen · May 31, 2015 · c1f4e15 · c1f4e15
2 parents 58bb074 + 1c2b06e
commit c1f4e15
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 4 deletions.
diff --git a/2.1/Dockerfile → 2.2/Dockerfile b/2.1/Dockerfile → 2.2/Dockerfile
@@ -7,7 +7,7 @@ RUN gpg --keyserver pool.sks-keyservers.net --recv-keys \
   FD3A5288F042B6850C66B31F09FE44734EB7990E
 
 ENV NPM_CONFIG_LOGLEVEL info
-ENV IOJS_VERSION 2.1.0
+ENV IOJS_VERSION 2.2.0
 
 RUN curl -SLO "https://iojs.org/dist/v$IOJS_VERSION/iojs-v$IOJS_VERSION-linux-x64.tar.gz" \
   && curl -SLO "https://iojs.org/dist/v$IOJS_VERSION/SHASUMS256.txt.asc" \

diff --git a/2.1/README.md → 2.2/README.md b/2.1/README.md → 2.2/README.md
diff --git a/2.1/onbuild/Dockerfile → 2.2/onbuild/Dockerfile b/2.1/onbuild/Dockerfile → 2.2/onbuild/Dockerfile
@@ -1,4 +1,4 @@
-FROM iojs:2.1.0
+FROM iojs:2.2.0
 
 RUN mkdir -p /usr/src/app
 WORKDIR /usr/src/app

diff --git a/2.1/slim/Dockerfile → 2.2/slim/Dockerfile b/2.1/slim/Dockerfile → 2.2/slim/Dockerfile
@@ -7,7 +7,7 @@ RUN gpg --keyserver pool.sks-keyservers.net --recv-keys \
   FD3A5288F042B6850C66B31F09FE44734EB7990E
 
 ENV NPM_CONFIG_LOGLEVEL info
-ENV IOJS_VERSION 2.1.0
+ENV IOJS_VERSION 2.2.0
 
 RUN curl -SLO "https://iojs.org/dist/v$IOJS_VERSION/iojs-v$IOJS_VERSION-linux-x64.tar.gz" \
   && curl -SLO "https://iojs.org/dist/v$IOJS_VERSION/SHASUMS256.txt.asc" \

diff --git a/generate-stackbrew-library.sh b/generate-stackbrew-library.sh
@@ -4,7 +4,7 @@ set -e
 declare -A aliases
 aliases=(
 	[1.8]='1'
-	[2.1]='2 latest'
+	[2.2]='2 latest'
 )
 
 cd "$(dirname "$(readlink -f "$BASH_SOURCE")")"