Merge pull request nodejs#35 from iojs/v1.5.0

pesho · pesho · commit 79e00fbc39c7 · 2015-03-07T01:00:40.000+02:00
Update to v1.5.0
diff --git a/1.5/Dockerfile b/1.5/Dockerfile
@@ -3,7 +3,7 @@ FROM buildpack-deps:jessie
 # gpg keys listed at https://github.com/iojs/io.js
 RUN gpg --keyserver pool.sks-keyservers.net --recv-keys 9554F04D7259F04124DE6B476D5A82AC7E37093B DD8F2338BAE7501E3DD5AC78C273792F7D83545D
 
-ENV IOJS_VERSION 1.4.3
+ENV IOJS_VERSION 1.5.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/1.5/README.md b/1.5/README.md
diff --git a/1.5/onbuild/Dockerfile b/1.5/onbuild/Dockerfile
@@ -1,4 +1,4 @@
-FROM iojs:1.4.3
+FROM iojs:1.5.0
 
 RUN mkdir -p /usr/src/app
 WORKDIR /usr/src/app
diff --git a/1.5/slim/Dockerfile b/1.5/slim/Dockerfile
@@ -3,7 +3,7 @@ FROM buildpack-deps:jessie-curl
 # gpg keys listed at https://github.com/iojs/io.js
 RUN gpg --keyserver pool.sks-keyservers.net --recv-keys 9554F04D7259F04124DE6B476D5A82AC7E37093B DD8F2338BAE7501E3DD5AC78C273792F7D83545D
 
-ENV IOJS_VERSION 1.4.3
+ENV IOJS_VERSION 1.5.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
@@ -3,7 +3,7 @@ set -e
 
 declare -A aliases
 aliases=(
-	[1.4]='1 latest'
+	[1.5]='1 latest'
 )
 
 cd "$(dirname "$(readlink -f "$BASH_SOURCE")")"

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-FROM iojs:1.4.3`
	`1`	`+FROM iojs:1.5.0`
`2`	`2`
`3`	`3`	`RUN mkdir -p /usr/src/app`
`4`	`4`	`WORKDIR /usr/src/app`
Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@ set -e`
`3`	`3`
`4`	`4`	`declare -A aliases`
`5`	`5`	`aliases=(`
`6`		`- [1.4]='1 latest'`
	`6`	`+ [1.5]='1 latest'`
`7`	`7`	`)`
`8`	`8`
`9`	`9`	`cd "$(dirname "$(readlink -f "$BASH_SOURCE")")"`