From 8f4f83a54acb8595f52b7310dc077a00e3293a4d Mon Sep 17 00:00:00 2001 From: Laurent Goderre Date: Mon, 25 Apr 2016 09:22:43 -0400 Subject: [PATCH] Moved the environment variables to the top of the Dockerfile --- 0.10/Dockerfile | 4 ++-- 0.10/slim/Dockerfile | 4 ++-- 0.10/wheezy/Dockerfile | 4 ++-- 0.12/Dockerfile | 4 ++-- 0.12/slim/Dockerfile | 4 ++-- 0.12/wheezy/Dockerfile | 4 ++-- 4.4/Dockerfile | 6 +++--- 4.4/slim/Dockerfile | 6 +++--- 4.4/wheezy/Dockerfile | 6 +++--- 5.11/Dockerfile | 6 +++--- 5.11/slim/Dockerfile | 6 +++--- 5.11/wheezy/Dockerfile | 6 +++--- Dockerfile-slim.template | 6 +++--- Dockerfile-wheezy.template | 6 +++--- Dockerfile.template | 6 +++--- 15 files changed, 39 insertions(+), 39 deletions(-) diff --git a/0.10/Dockerfile b/0.10/Dockerfile index 111debc4..2fdbf696 100644 --- a/0.10/Dockerfile +++ b/0.10/Dockerfile @@ -1,5 +1,7 @@ FROM buildpack-deps:jessie +ENV NODE_VERSION 0.10.44 + # gpg keys listed at https://github.com/nodejs/node RUN set -ex \ && for key in \ @@ -15,8 +17,6 @@ RUN set -ex \ gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; \ done -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 \ diff --git a/0.10/slim/Dockerfile b/0.10/slim/Dockerfile index 91ceab07..f0ccd178 100644 --- a/0.10/slim/Dockerfile +++ b/0.10/slim/Dockerfile @@ -1,5 +1,7 @@ FROM buildpack-deps:jessie-curl +ENV NODE_VERSION 0.10.44 + # gpg keys listed at https://github.com/nodejs/node RUN set -ex \ && for key in \ @@ -15,8 +17,6 @@ RUN set -ex \ gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; \ done -ENV NODE_VERSION 0.10.44 - RUN buildDeps='xz-utils' \ && set -x \ && apt-get update && apt-get install -y $buildDeps --no-install-recommends \ diff --git a/0.10/wheezy/Dockerfile b/0.10/wheezy/Dockerfile index ebf8140e..50673935 100644 --- a/0.10/wheezy/Dockerfile +++ b/0.10/wheezy/Dockerfile @@ -1,5 +1,7 @@ FROM buildpack-deps:wheezy +ENV NODE_VERSION 0.10.44 + # gpg keys listed at https://github.com/nodejs/node RUN set -ex \ && for key in \ @@ -15,8 +17,6 @@ RUN set -ex \ gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; \ done -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 \ diff --git a/0.12/Dockerfile b/0.12/Dockerfile index fa96dc53..cb37da1e 100644 --- a/0.12/Dockerfile +++ b/0.12/Dockerfile @@ -1,5 +1,7 @@ FROM buildpack-deps:jessie +ENV NODE_VERSION 0.12.13 + # gpg keys listed at https://github.com/nodejs/node RUN set -ex \ && for key in \ @@ -15,8 +17,6 @@ RUN set -ex \ gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; \ done -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 \ diff --git a/0.12/slim/Dockerfile b/0.12/slim/Dockerfile index e49292b1..f95ef50e 100644 --- a/0.12/slim/Dockerfile +++ b/0.12/slim/Dockerfile @@ -1,5 +1,7 @@ FROM buildpack-deps:jessie-curl +ENV NODE_VERSION 0.12.13 + # gpg keys listed at https://github.com/nodejs/node RUN set -ex \ && for key in \ @@ -15,8 +17,6 @@ RUN set -ex \ gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; \ done -ENV NODE_VERSION 0.12.13 - RUN buildDeps='xz-utils' \ && set -x \ && apt-get update && apt-get install -y $buildDeps --no-install-recommends \ diff --git a/0.12/wheezy/Dockerfile b/0.12/wheezy/Dockerfile index 11ff6d75..f1904db8 100644 --- a/0.12/wheezy/Dockerfile +++ b/0.12/wheezy/Dockerfile @@ -1,5 +1,7 @@ FROM buildpack-deps:wheezy +ENV NODE_VERSION 0.12.13 + # gpg keys listed at https://github.com/nodejs/node RUN set -ex \ && for key in \ @@ -15,8 +17,6 @@ RUN set -ex \ gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; \ done -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 \ diff --git a/4.4/Dockerfile b/4.4/Dockerfile index 9884729c..37770c45 100644 --- a/4.4/Dockerfile +++ b/4.4/Dockerfile @@ -1,5 +1,8 @@ FROM buildpack-deps:jessie +ENV NPM_CONFIG_LOGLEVEL info +ENV NODE_VERSION 4.4.3 + # gpg keys listed at https://github.com/nodejs/node RUN set -ex \ && for key in \ @@ -15,9 +18,6 @@ RUN set -ex \ gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; \ done -ENV NPM_CONFIG_LOGLEVEL info -ENV NODE_VERSION 4.4.3 - 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 \ diff --git a/4.4/slim/Dockerfile b/4.4/slim/Dockerfile index 2624a530..e7fea290 100644 --- a/4.4/slim/Dockerfile +++ b/4.4/slim/Dockerfile @@ -1,5 +1,8 @@ FROM buildpack-deps:jessie-curl +ENV NPM_CONFIG_LOGLEVEL info +ENV NODE_VERSION 4.4.3 + # gpg keys listed at https://github.com/nodejs/node RUN set -ex \ && for key in \ @@ -15,9 +18,6 @@ RUN set -ex \ gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; \ done -ENV NPM_CONFIG_LOGLEVEL info -ENV NODE_VERSION 4.4.3 - RUN buildDeps='xz-utils' \ && set -x \ && apt-get update && apt-get install -y $buildDeps --no-install-recommends \ diff --git a/4.4/wheezy/Dockerfile b/4.4/wheezy/Dockerfile index cecd06cc..d23808fb 100644 --- a/4.4/wheezy/Dockerfile +++ b/4.4/wheezy/Dockerfile @@ -1,5 +1,8 @@ FROM buildpack-deps:wheezy +ENV NPM_CONFIG_LOGLEVEL info +ENV NODE_VERSION 4.4.3 + # gpg keys listed at https://github.com/nodejs/node RUN set -ex \ && for key in \ @@ -15,9 +18,6 @@ RUN set -ex \ gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; \ done -ENV NPM_CONFIG_LOGLEVEL info -ENV NODE_VERSION 4.4.3 - 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 \ diff --git a/5.11/Dockerfile b/5.11/Dockerfile index a3b445ba..0295acf5 100644 --- a/5.11/Dockerfile +++ b/5.11/Dockerfile @@ -1,5 +1,8 @@ FROM buildpack-deps:jessie +ENV NPM_CONFIG_LOGLEVEL info +ENV NODE_VERSION 5.11.0 + # gpg keys listed at https://github.com/nodejs/node RUN set -ex \ && for key in \ @@ -15,9 +18,6 @@ RUN set -ex \ gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; \ done -ENV NPM_CONFIG_LOGLEVEL info -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" \ && gpg --batch --decrypt --output SHASUMS256.txt SHASUMS256.txt.asc \ diff --git a/5.11/slim/Dockerfile b/5.11/slim/Dockerfile index 5bfbda23..8b211dae 100644 --- a/5.11/slim/Dockerfile +++ b/5.11/slim/Dockerfile @@ -1,5 +1,8 @@ FROM buildpack-deps:jessie-curl +ENV NPM_CONFIG_LOGLEVEL info +ENV NODE_VERSION 5.11.0 + # gpg keys listed at https://github.com/nodejs/node RUN set -ex \ && for key in \ @@ -15,9 +18,6 @@ RUN set -ex \ gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; \ done -ENV NPM_CONFIG_LOGLEVEL info -ENV NODE_VERSION 5.11.0 - RUN buildDeps='xz-utils' \ && set -x \ && apt-get update && apt-get install -y $buildDeps --no-install-recommends \ diff --git a/5.11/wheezy/Dockerfile b/5.11/wheezy/Dockerfile index 0f8c82e2..85806b8b 100644 --- a/5.11/wheezy/Dockerfile +++ b/5.11/wheezy/Dockerfile @@ -1,5 +1,8 @@ FROM buildpack-deps:wheezy +ENV NPM_CONFIG_LOGLEVEL info +ENV NODE_VERSION 5.11.0 + # gpg keys listed at https://github.com/nodejs/node RUN set -ex \ && for key in \ @@ -15,9 +18,6 @@ RUN set -ex \ gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; \ done -ENV NPM_CONFIG_LOGLEVEL info -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" \ && gpg --batch --decrypt --output SHASUMS256.txt SHASUMS256.txt.asc \ diff --git a/Dockerfile-slim.template b/Dockerfile-slim.template index 6a3cafed..661d110b 100644 --- a/Dockerfile-slim.template +++ b/Dockerfile-slim.template @@ -1,5 +1,8 @@ FROM buildpack-deps:jessie-curl +ENV NPM_CONFIG_LOGLEVEL info +ENV NODE_VERSION 0.0.0 + # gpg keys listed at https://github.com/nodejs/node RUN set -ex \ && for key in \ @@ -15,9 +18,6 @@ RUN set -ex \ gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; \ done -ENV NPM_CONFIG_LOGLEVEL info -ENV NODE_VERSION 0.0.0 - RUN buildDeps='xz-utils' \ && set -x \ && apt-get update && apt-get install -y $buildDeps --no-install-recommends \ diff --git a/Dockerfile-wheezy.template b/Dockerfile-wheezy.template index 2582c498..c7291b17 100644 --- a/Dockerfile-wheezy.template +++ b/Dockerfile-wheezy.template @@ -1,5 +1,8 @@ FROM buildpack-deps:wheezy +ENV NPM_CONFIG_LOGLEVEL info +ENV NODE_VERSION 0.0.0 + # gpg keys listed at https://github.com/nodejs/node RUN set -ex \ && for key in \ @@ -15,9 +18,6 @@ RUN set -ex \ gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; \ done -ENV NPM_CONFIG_LOGLEVEL info -ENV NODE_VERSION 0.0.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" \ && gpg --batch --decrypt --output SHASUMS256.txt SHASUMS256.txt.asc \ diff --git a/Dockerfile.template b/Dockerfile.template index 748585dd..8ba74ffe 100644 --- a/Dockerfile.template +++ b/Dockerfile.template @@ -1,5 +1,8 @@ FROM buildpack-deps:jessie +ENV NPM_CONFIG_LOGLEVEL info +ENV NODE_VERSION 0.0.0 + # gpg keys listed at https://github.com/nodejs/node RUN set -ex \ && for key in \ @@ -15,9 +18,6 @@ RUN set -ex \ gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; \ done -ENV NPM_CONFIG_LOGLEVEL info -ENV NODE_VERSION 0.0.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" \ && gpg --batch --decrypt --output SHASUMS256.txt SHASUMS256.txt.asc \