From 5e6d1e950a50f59c74ba7e53357d97e2ff5449d5 Mon Sep 17 00:00:00 2001 From: Christopher Horrell Date: Thu, 21 Apr 2016 19:00:03 -0400 Subject: [PATCH] Update for v5.11.0 Also formatting tweaks to make 0.10 and 0.12 consistent with the other images --- 0.10/Dockerfile | 10 +++++----- 0.10/slim/Dockerfile | 20 ++++++++++---------- 0.10/wheezy/Dockerfile | 10 +++++----- 0.12/Dockerfile | 10 +++++----- 0.12/slim/Dockerfile | 20 ++++++++++---------- 0.12/wheezy/Dockerfile | 10 +++++----- {5.10 => 5.11}/Dockerfile | 2 +- {5.10 => 5.11}/onbuild/Dockerfile | 2 +- {5.10 => 5.11}/slim/Dockerfile | 2 +- {5.10 => 5.11}/wheezy/Dockerfile | 2 +- 10 files changed, 44 insertions(+), 44 deletions(-) rename {5.10 => 5.11}/Dockerfile (97%) rename {5.10 => 5.11}/onbuild/Dockerfile (90%) rename {5.10 => 5.11}/slim/Dockerfile (98%) rename {5.10 => 5.11}/wheezy/Dockerfile (97%) diff --git a/0.10/Dockerfile b/0.10/Dockerfile index ff9b0015..111debc4 100644 --- a/0.10/Dockerfile +++ b/0.10/Dockerfile @@ -18,10 +18,10 @@ RUN set -ex \ ENV NODE_VERSION 0.10.44 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" \ - && gpg --batch --decrypt --output SHASUMS256.txt SHASUMS256.txt.asc \ - && grep " node-v$NODE_VERSION-linux-x64.tar.xz\$" SHASUMS256.txt | sha256sum -c - \ - && tar -xJf "node-v$NODE_VERSION-linux-x64.tar.xz" -C /usr/local --strip-components=1 \ - && rm "node-v$NODE_VERSION-linux-x64.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt + && curl -SLO "https://nodejs.org/dist/v$NODE_VERSION/SHASUMS256.txt.asc" \ + && gpg --batch --decrypt --output SHASUMS256.txt SHASUMS256.txt.asc \ + && grep " node-v$NODE_VERSION-linux-x64.tar.xz\$" SHASUMS256.txt | sha256sum -c - \ + && tar -xJf "node-v$NODE_VERSION-linux-x64.tar.xz" -C /usr/local --strip-components=1 \ + && rm "node-v$NODE_VERSION-linux-x64.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt CMD [ "node" ] diff --git a/0.10/slim/Dockerfile b/0.10/slim/Dockerfile index 09e463e7..91ceab07 100644 --- a/0.10/slim/Dockerfile +++ b/0.10/slim/Dockerfile @@ -18,15 +18,15 @@ RUN set -ex \ ENV NODE_VERSION 0.10.44 RUN buildDeps='xz-utils' \ - && set -x \ - && apt-get update && apt-get install -y $buildDeps --no-install-recommends \ - && rm -rf /var/lib/apt/lists/* \ - && 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" \ - && gpg --batch --decrypt --output SHASUMS256.txt SHASUMS256.txt.asc \ - && grep " node-v$NODE_VERSION-linux-x64.tar.xz\$" SHASUMS256.txt | sha256sum -c - \ - && tar -xJf "node-v$NODE_VERSION-linux-x64.tar.xz" -C /usr/local --strip-components=1 \ - && rm "node-v$NODE_VERSION-linux-x64.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt \ - && apt-get purge -y --auto-remove $buildDeps + && set -x \ + && apt-get update && apt-get install -y $buildDeps --no-install-recommends \ + && rm -rf /var/lib/apt/lists/* \ + && 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" \ + && gpg --batch --decrypt --output SHASUMS256.txt SHASUMS256.txt.asc \ + && grep " node-v$NODE_VERSION-linux-x64.tar.xz\$" SHASUMS256.txt | sha256sum -c - \ + && tar -xJf "node-v$NODE_VERSION-linux-x64.tar.xz" -C /usr/local --strip-components=1 \ + && rm "node-v$NODE_VERSION-linux-x64.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt \ + && apt-get purge -y --auto-remove $buildDeps CMD [ "node" ] diff --git a/0.10/wheezy/Dockerfile b/0.10/wheezy/Dockerfile index f50c3bea..ebf8140e 100644 --- a/0.10/wheezy/Dockerfile +++ b/0.10/wheezy/Dockerfile @@ -18,10 +18,10 @@ RUN set -ex \ ENV NODE_VERSION 0.10.44 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" \ - && gpg --batch --decrypt --output SHASUMS256.txt SHASUMS256.txt.asc \ - && grep " node-v$NODE_VERSION-linux-x64.tar.xz\$" SHASUMS256.txt | sha256sum -c - \ - && tar -xJf "node-v$NODE_VERSION-linux-x64.tar.xz" -C /usr/local --strip-components=1 \ - && rm "node-v$NODE_VERSION-linux-x64.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt + && curl -SLO "https://nodejs.org/dist/v$NODE_VERSION/SHASUMS256.txt.asc" \ + && gpg --batch --decrypt --output SHASUMS256.txt SHASUMS256.txt.asc \ + && grep " node-v$NODE_VERSION-linux-x64.tar.xz\$" SHASUMS256.txt | sha256sum -c - \ + && tar -xJf "node-v$NODE_VERSION-linux-x64.tar.xz" -C /usr/local --strip-components=1 \ + && rm "node-v$NODE_VERSION-linux-x64.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt CMD [ "node" ] diff --git a/0.12/Dockerfile b/0.12/Dockerfile index b668c69c..fa96dc53 100644 --- a/0.12/Dockerfile +++ b/0.12/Dockerfile @@ -18,10 +18,10 @@ RUN set -ex \ ENV NODE_VERSION 0.12.13 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" \ - && gpg --batch --decrypt --output SHASUMS256.txt SHASUMS256.txt.asc \ - && grep " node-v$NODE_VERSION-linux-x64.tar.xz\$" SHASUMS256.txt | sha256sum -c - \ - && tar -xJf "node-v$NODE_VERSION-linux-x64.tar.xz" -C /usr/local --strip-components=1 \ - && rm "node-v$NODE_VERSION-linux-x64.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt + && curl -SLO "https://nodejs.org/dist/v$NODE_VERSION/SHASUMS256.txt.asc" \ + && gpg --batch --decrypt --output SHASUMS256.txt SHASUMS256.txt.asc \ + && grep " node-v$NODE_VERSION-linux-x64.tar.xz\$" SHASUMS256.txt | sha256sum -c - \ + && tar -xJf "node-v$NODE_VERSION-linux-x64.tar.xz" -C /usr/local --strip-components=1 \ + && rm "node-v$NODE_VERSION-linux-x64.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt CMD [ "node" ] diff --git a/0.12/slim/Dockerfile b/0.12/slim/Dockerfile index cc819011..e49292b1 100644 --- a/0.12/slim/Dockerfile +++ b/0.12/slim/Dockerfile @@ -18,15 +18,15 @@ RUN set -ex \ ENV NODE_VERSION 0.12.13 RUN buildDeps='xz-utils' \ - && set -x \ - && apt-get update && apt-get install -y $buildDeps --no-install-recommends \ - && rm -rf /var/lib/apt/lists/* \ - && 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" \ - && gpg --batch --decrypt --output SHASUMS256.txt SHASUMS256.txt.asc \ - && grep " node-v$NODE_VERSION-linux-x64.tar.xz\$" SHASUMS256.txt | sha256sum -c - \ - && tar -xJf "node-v$NODE_VERSION-linux-x64.tar.xz" -C /usr/local --strip-components=1 \ - && rm "node-v$NODE_VERSION-linux-x64.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt \ - && apt-get purge -y --auto-remove $buildDeps + && set -x \ + && apt-get update && apt-get install -y $buildDeps --no-install-recommends \ + && rm -rf /var/lib/apt/lists/* \ + && 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" \ + && gpg --batch --decrypt --output SHASUMS256.txt SHASUMS256.txt.asc \ + && grep " node-v$NODE_VERSION-linux-x64.tar.xz\$" SHASUMS256.txt | sha256sum -c - \ + && tar -xJf "node-v$NODE_VERSION-linux-x64.tar.xz" -C /usr/local --strip-components=1 \ + && rm "node-v$NODE_VERSION-linux-x64.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt \ + && apt-get purge -y --auto-remove $buildDeps CMD [ "node" ] diff --git a/0.12/wheezy/Dockerfile b/0.12/wheezy/Dockerfile index b8772a1c..11ff6d75 100644 --- a/0.12/wheezy/Dockerfile +++ b/0.12/wheezy/Dockerfile @@ -18,10 +18,10 @@ RUN set -ex \ ENV NODE_VERSION 0.12.13 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" \ - && gpg --batch --decrypt --output SHASUMS256.txt SHASUMS256.txt.asc \ - && grep " node-v$NODE_VERSION-linux-x64.tar.xz\$" SHASUMS256.txt | sha256sum -c - \ - && tar -xJf "node-v$NODE_VERSION-linux-x64.tar.xz" -C /usr/local --strip-components=1 \ - && rm "node-v$NODE_VERSION-linux-x64.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt + && curl -SLO "https://nodejs.org/dist/v$NODE_VERSION/SHASUMS256.txt.asc" \ + && gpg --batch --decrypt --output SHASUMS256.txt SHASUMS256.txt.asc \ + && grep " node-v$NODE_VERSION-linux-x64.tar.xz\$" SHASUMS256.txt | sha256sum -c - \ + && tar -xJf "node-v$NODE_VERSION-linux-x64.tar.xz" -C /usr/local --strip-components=1 \ + && rm "node-v$NODE_VERSION-linux-x64.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt CMD [ "node" ] diff --git a/5.10/Dockerfile b/5.11/Dockerfile similarity index 97% rename from 5.10/Dockerfile rename to 5.11/Dockerfile index f9089f22..a3b445ba 100644 --- a/5.10/Dockerfile +++ b/5.11/Dockerfile @@ -16,7 +16,7 @@ RUN set -ex \ done ENV NPM_CONFIG_LOGLEVEL info -ENV NODE_VERSION 5.10.1 +ENV NODE_VERSION 5.11.0 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.10/onbuild/Dockerfile b/5.11/onbuild/Dockerfile similarity index 90% rename from 5.10/onbuild/Dockerfile rename to 5.11/onbuild/Dockerfile index 8e4819c0..65c92455 100644 --- a/5.10/onbuild/Dockerfile +++ b/5.11/onbuild/Dockerfile @@ -1,4 +1,4 @@ -FROM node:5.10.1 +FROM node:5.11.0 RUN mkdir -p /usr/src/app WORKDIR /usr/src/app diff --git a/5.10/slim/Dockerfile b/5.11/slim/Dockerfile similarity index 98% rename from 5.10/slim/Dockerfile rename to 5.11/slim/Dockerfile index ba1c9361..5bfbda23 100644 --- a/5.10/slim/Dockerfile +++ b/5.11/slim/Dockerfile @@ -16,7 +16,7 @@ RUN set -ex \ done ENV NPM_CONFIG_LOGLEVEL info -ENV NODE_VERSION 5.10.1 +ENV NODE_VERSION 5.11.0 RUN buildDeps='xz-utils' \ && set -x \ diff --git a/5.10/wheezy/Dockerfile b/5.11/wheezy/Dockerfile similarity index 97% rename from 5.10/wheezy/Dockerfile rename to 5.11/wheezy/Dockerfile index 217ca03e..0f8c82e2 100644 --- a/5.10/wheezy/Dockerfile +++ b/5.11/wheezy/Dockerfile @@ -16,7 +16,7 @@ RUN set -ex \ done ENV NPM_CONFIG_LOGLEVEL info -ENV NODE_VERSION 5.10.1 +ENV NODE_VERSION 5.11.0 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" \