Merge pull request #41 from Starefossen/iojs-1-6-0

Update Dockerfiles to io.js v1.6.0
nodejs · Mar 20, 2015 · 7f8c324 · 7f8c324
2 parents 8c35508 + 9767d9a
commit 7f8c324
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 6 deletions.
diff --git a/1.5/Dockerfile → 1.6/Dockerfile b/1.5/Dockerfile → 1.6/Dockerfile
@@ -4,7 +4,7 @@ FROM buildpack-deps:jessie
 RUN gpg --keyserver pool.sks-keyservers.net --recv-keys 9554F04D7259F04124DE6B476D5A82AC7E37093B DD8F2338BAE7501E3DD5AC78C273792F7D83545D
 
 ENV NPM_CONFIG_LOGLEVEL info
-ENV IOJS_VERSION 1.5.1
+ENV IOJS_VERSION 1.6.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 → 1.6/README.md b/1.5/README.md → 1.6/README.md
diff --git a/1.5/onbuild/Dockerfile → 1.6/onbuild/Dockerfile b/1.5/onbuild/Dockerfile → 1.6/onbuild/Dockerfile
@@ -1,4 +1,4 @@
-FROM iojs:1.5.1
+FROM iojs:1.6.0
 
 RUN mkdir -p /usr/src/app
 WORKDIR /usr/src/app

diff --git a/1.5/slim/Dockerfile → 1.6/slim/Dockerfile b/1.5/slim/Dockerfile → 1.6/slim/Dockerfile
@@ -4,7 +4,7 @@ FROM buildpack-deps:jessie-curl
 RUN gpg --keyserver pool.sks-keyservers.net --recv-keys 9554F04D7259F04124DE6B476D5A82AC7E37093B DD8F2338BAE7501E3DD5AC78C273792F7D83545D
 
 ENV NPM_CONFIG_LOGLEVEL info
-ENV IOJS_VERSION 1.5.1
+ENV IOJS_VERSION 1.6.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.5]='1 latest'
+	[1.6]='1 latest'
 )
 
 cd "$(dirname "$(readlink -f "$BASH_SOURCE")")"
@@ -18,12 +18,12 @@ for version in "${versions[@]}"; do
 	commit="$(git log -1 --format='format:%H' -- "$version")"
 	fullVersion="$(grep -m1 'ENV IOJS_VERSION ' "$version/Dockerfile" | cut -d' ' -f3)"
 	versionAliases=( $fullVersion $version ${aliases[$version]} )
-	
+
 	echo
 	for va in "${versionAliases[@]}"; do
 		echo "$va: ${url}@${commit} $version"
 	done
-	
+
 	for variant in onbuild slim; do
 		commit="$(git log -1 --format='format:%H' -- "$version/$variant")"
 		echo