Merge pull request #56 from pesho/master

pesho · pesho · commit e20949636a2f · 2015-05-05T03:09:37.000+03:00
Update to v2.0.0
diff --git a/2.0/Dockerfile b/2.0/Dockerfile
@@ -7,12 +7,13 @@ RUN gpg --keyserver pool.sks-keyservers.net --recv-keys \
   FD3A5288F042B6850C66B31F09FE44734EB7990E
 
 ENV NPM_CONFIG_LOGLEVEL info
-ENV IOJS_VERSION 2.0.0-nightly20150504f34b105ccd
+ENV IOJS_VERSION 2.0.0
 
-RUN curl -SLO "https://iojs.org/download/nightly/v$IOJS_VERSION/iojs-v$IOJS_VERSION-linux-x64.tar.gz" \
-  && curl -SLO "https://iojs.org/download/nightly/v$IOJS_VERSION/SHASUMS256.txt" \
-  && grep " iojs-v$IOJS_VERSION-linux-x64.tar.gz\$" SHASUMS256.txt | sha256sum -c - \
+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" \
+  && gpg --verify SHASUMS256.txt.asc \
+  && grep " iojs-v$IOJS_VERSION-linux-x64.tar.gz\$" SHASUMS256.txt.asc | sha256sum -c - \
   && tar -xzf "iojs-v$IOJS_VERSION-linux-x64.tar.gz" -C /usr/local --strip-components=1 \
-  && rm "iojs-v$IOJS_VERSION-linux-x64.tar.gz" SHASUMS256.txt
+  && rm "iojs-v$IOJS_VERSION-linux-x64.tar.gz" SHASUMS256.txt.asc
 
 CMD [ "iojs" ]
diff --git a/2.0/slim/Dockerfile b/2.0/slim/Dockerfile
@@ -7,12 +7,13 @@ RUN gpg --keyserver pool.sks-keyservers.net --recv-keys \
   FD3A5288F042B6850C66B31F09FE44734EB7990E
 
 ENV NPM_CONFIG_LOGLEVEL info
-ENV IOJS_VERSION 2.0.0-nightly20150504f34b105ccd
+ENV IOJS_VERSION 2.0.0
 
-RUN curl -SLO "https://iojs.org/download/nightly/v$IOJS_VERSION/iojs-v$IOJS_VERSION-linux-x64.tar.gz" \
-  && curl -SLO "https://iojs.org/download/nightly/v$IOJS_VERSION/SHASUMS256.txt" \
-  && grep " iojs-v$IOJS_VERSION-linux-x64.tar.gz\$" SHASUMS256.txt | sha256sum -c - \
+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" \
+  && gpg --verify SHASUMS256.txt.asc \
+  && grep " iojs-v$IOJS_VERSION-linux-x64.tar.gz\$" SHASUMS256.txt.asc | sha256sum -c - \
   && tar -xzf "iojs-v$IOJS_VERSION-linux-x64.tar.gz" -C /usr/local --strip-components=1 \
-  && rm "iojs-v$IOJS_VERSION-linux-x64.tar.gz" SHASUMS256.txt
+  && rm "iojs-v$IOJS_VERSION-linux-x64.tar.gz" SHASUMS256.txt.asc
 
 CMD [ "iojs" ]
diff --git a/generate-stackbrew-library.sh b/generate-stackbrew-library.sh
@@ -3,7 +3,8 @@ set -e
 
 declare -A aliases
 aliases=(
-	[1.8]='1 latest'
+	[1.8]='1'
+	[2.0]='2 latest'
 )
 
 cd "$(dirname "$(readlink -f "$BASH_SOURCE")")"

Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,8 @@ set -e`
`3`	`3`
`4`	`4`	`declare -A aliases`
`5`	`5`	`aliases=(`
`6`		`- [1.8]='1 latest'`
	`6`	`+ [1.8]='1'`
	`7`	`+ [2.0]='2 latest'`
`7`	`8`	`)`
`8`	`9`
`9`	`10`	`cd "$(dirname "$(readlink -f "$BASH_SOURCE")")"`