From 67ec55de7f73825a64be80f5af3440d6b0317752 Mon Sep 17 00:00:00 2001 From: Christopher Horrell Date: Wed, 16 Mar 2016 21:41:10 -0400 Subject: [PATCH 1/4] Update for 5.9.0 --- generate-stackbrew-library.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/generate-stackbrew-library.sh b/generate-stackbrew-library.sh index e8dc99e091..e3044d9dc0 100755 --- a/generate-stackbrew-library.sh +++ b/generate-stackbrew-library.sh @@ -5,7 +5,7 @@ hash git 2>/dev/null || { echo >&2 "git not found, exiting."; } array_0_12='0'; array_4_4='4 argon'; -array_5_8='5 latest'; +array_5_9='5 latest'; cd $(cd ${0%/*} && pwd -P); From b38aad33fe4c434f6aec0e57c0f2d975adfd56e0 Mon Sep 17 00:00:00 2001 From: Christopher Horrell Date: Wed, 16 Mar 2016 21:57:18 -0400 Subject: [PATCH 2/4] Exclude docs directory. Fixes #126 --- generate-stackbrew-library.sh | 3 +++ test-build.sh | 3 +++ update.sh | 4 ++++ 3 files changed, 10 insertions(+) diff --git a/generate-stackbrew-library.sh b/generate-stackbrew-library.sh index e3044d9dc0..2611ec6617 100755 --- a/generate-stackbrew-library.sh +++ b/generate-stackbrew-library.sh @@ -16,6 +16,9 @@ url='git://github.com/nodejs/docker-node' echo '# maintainer: Node.js Docker Team (@nodejs)' for version in "${versions[@]}"; do + if [[ "$version" == "docs" ]]; then + continue + fi eval stub=$(echo "$version" | awk -F. '{ print "$array_" $1 "_" $2 }'); commit="$(git log -1 --format='format:%H' -- "$version")" fullVersion="$(grep -m1 'ENV NODE_VERSION ' "$version/Dockerfile" | cut -d' ' -f3)" diff --git a/test-build.sh b/test-build.sh index f2910bfe33..6a9f5b7e1e 100755 --- a/test-build.sh +++ b/test-build.sh @@ -25,6 +25,9 @@ fi versions=( "${versions[@]%/}" ) for version in "${versions[@]}"; do + if [[ "$version" == "docs" ]]; then + continue + fi tag=$(cat $version/Dockerfile | grep "ENV NODE_VERSION" | cut -d' ' -f3) diff --git a/update.sh b/update.sh index 7d9a5d73ec..47511ce40e 100755 --- a/update.sh +++ b/update.sh @@ -10,6 +10,10 @@ fi versions=( "${versions[@]%/}" ) for version in "${versions[@]}"; do + if [[ "$version" == "docs" ]]; then + continue + fi + fullVersion="$(curl -sSL --compressed 'https://nodejs.org/dist' | grep ' Date: Tue, 22 Mar 2016 20:39:05 -0400 Subject: [PATCH 3/4] Update to v4.4.1. See #128 --- 4.4/Dockerfile | 2 +- 4.4/onbuild/Dockerfile | 2 +- 4.4/slim/Dockerfile | 2 +- 4.4/wheezy/Dockerfile | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/4.4/Dockerfile b/4.4/Dockerfile index 5fa17b7827..345592b2e8 100644 --- a/4.4/Dockerfile +++ b/4.4/Dockerfile @@ -16,7 +16,7 @@ RUN set -ex \ done ENV NPM_CONFIG_LOGLEVEL info -ENV NODE_VERSION 4.4.0 +ENV NODE_VERSION 4.4.1 RUN curl -SLO "https://nodejs.org/dist/v$NODE_VERSION/node-v$NODE_VERSION-linux-x64.tar.xz" \ && curl -SLO "https://nodejs.org/dist/v$NODE_VERSION/SHASUMS256.txt.asc" \ diff --git a/4.4/onbuild/Dockerfile b/4.4/onbuild/Dockerfile index bb18c76da3..12faf8bffc 100644 --- a/4.4/onbuild/Dockerfile +++ b/4.4/onbuild/Dockerfile @@ -1,4 +1,4 @@ -FROM node:4.4.0 +FROM node:4.4.1 RUN mkdir -p /usr/src/app WORKDIR /usr/src/app diff --git a/4.4/slim/Dockerfile b/4.4/slim/Dockerfile index 9d2a213d77..7a6ef514ea 100644 --- a/4.4/slim/Dockerfile +++ b/4.4/slim/Dockerfile @@ -16,7 +16,7 @@ RUN set -ex \ done ENV NPM_CONFIG_LOGLEVEL info -ENV NODE_VERSION 4.4.0 +ENV NODE_VERSION 4.4.1 RUN buildDeps='xz-utils' \ && set -x \ diff --git a/4.4/wheezy/Dockerfile b/4.4/wheezy/Dockerfile index 1af19a9f79..4f64dcba7f 100644 --- a/4.4/wheezy/Dockerfile +++ b/4.4/wheezy/Dockerfile @@ -16,7 +16,7 @@ RUN set -ex \ done ENV NPM_CONFIG_LOGLEVEL info -ENV NODE_VERSION 4.4.0 +ENV NODE_VERSION 4.4.1 RUN curl -SLO "https://nodejs.org/dist/v$NODE_VERSION/node-v$NODE_VERSION-linux-x64.tar.xz" \ && curl -SLO "https://nodejs.org/dist/v$NODE_VERSION/SHASUMS256.txt.asc" \ From 9dfa3cbd5ca0133d3c111e4624e3452169b4fef9 Mon Sep 17 00:00:00 2001 From: Christopher Horrell Date: Wed, 23 Mar 2016 14:27:26 -0400 Subject: [PATCH 4/4] Update to v5.9.1. See #128 --- 5.9/Dockerfile | 2 +- 5.9/onbuild/Dockerfile | 2 +- 5.9/slim/Dockerfile | 2 +- 5.9/wheezy/Dockerfile | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/5.9/Dockerfile b/5.9/Dockerfile index 53d8490801..c199e076d1 100644 --- a/5.9/Dockerfile +++ b/5.9/Dockerfile @@ -16,7 +16,7 @@ RUN set -ex \ done ENV NPM_CONFIG_LOGLEVEL info -ENV NODE_VERSION 5.9.0 +ENV NODE_VERSION 5.9.1 RUN curl -SLO "https://nodejs.org/dist/v$NODE_VERSION/node-v$NODE_VERSION-linux-x64.tar.xz" \ && curl -SLO "https://nodejs.org/dist/v$NODE_VERSION/SHASUMS256.txt.asc" \ diff --git a/5.9/onbuild/Dockerfile b/5.9/onbuild/Dockerfile index 99d4f3a04a..c4030ab5dc 100644 --- a/5.9/onbuild/Dockerfile +++ b/5.9/onbuild/Dockerfile @@ -1,4 +1,4 @@ -FROM node:5.9.0 +FROM node:5.9.1 RUN mkdir -p /usr/src/app WORKDIR /usr/src/app diff --git a/5.9/slim/Dockerfile b/5.9/slim/Dockerfile index de3b114809..5978f3e32a 100644 --- a/5.9/slim/Dockerfile +++ b/5.9/slim/Dockerfile @@ -16,7 +16,7 @@ RUN set -ex \ done ENV NPM_CONFIG_LOGLEVEL info -ENV NODE_VERSION 5.9.0 +ENV NODE_VERSION 5.9.1 RUN buildDeps='xz-utils' \ && set -x \ diff --git a/5.9/wheezy/Dockerfile b/5.9/wheezy/Dockerfile index 6f4d705c82..5cf1b9322e 100644 --- a/5.9/wheezy/Dockerfile +++ b/5.9/wheezy/Dockerfile @@ -16,7 +16,7 @@ RUN set -ex \ done ENV NPM_CONFIG_LOGLEVEL info -ENV NODE_VERSION 5.9.0 +ENV NODE_VERSION 5.9.1 RUN curl -SLO "https://nodejs.org/dist/v$NODE_VERSION/node-v$NODE_VERSION-linux-x64.tar.xz" \ && curl -SLO "https://nodejs.org/dist/v$NODE_VERSION/SHASUMS256.txt.asc" \