Revert "Moved the environment variables to the top of the Dockerfile"

chorrell · chorrell · commit b3367b8845a0 · 2016-04-26T15:38:38.000-04:00
diff --git a/0.10/Dockerfile b/0.10/Dockerfile
@@ -1,7 +1,5 @@
 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 \
@@ -17,6 +15,8 @@ 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
@@ -1,7 +1,5 @@
 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 \
@@ -17,6 +15,8 @@ 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
@@ -1,7 +1,5 @@
 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 \
@@ -17,6 +15,8 @@ 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
@@ -1,7 +1,5 @@
 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 \
@@ -17,6 +15,8 @@ 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
@@ -1,7 +1,5 @@
 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 \
@@ -17,6 +15,8 @@ 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
@@ -1,7 +1,5 @@
 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 \
@@ -17,6 +15,8 @@ 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
@@ -1,8 +1,5 @@
 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 \
@@ -18,6 +15,9 @@ 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
@@ -1,8 +1,5 @@
 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 \
@@ -18,6 +15,9 @@ 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
@@ -1,8 +1,5 @@
 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 \
@@ -18,6 +15,9 @@ 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
@@ -1,8 +1,5 @@
 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 \
@@ -18,6 +15,9 @@ 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
@@ -1,8 +1,5 @@
 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 \
@@ -18,6 +15,9 @@ 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
@@ -1,8 +1,5 @@
 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 \
@@ -18,6 +15,9 @@ 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
@@ -1,8 +1,5 @@
 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 \
@@ -18,6 +15,9 @@ 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
@@ -1,8 +1,5 @@
 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 \
@@ -18,6 +15,9 @@ 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
@@ -1,8 +1,5 @@
 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 \
@@ -18,6 +15,9 @@ 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 \
