From 0e938d1f013e9f5dd6c44a0cbf782f303be5191a Mon Sep 17 00:00:00 2001 From: Hans Kristian Flaatten Date: Tue, 10 Mar 2015 20:27:30 +0100 Subject: [PATCH 1/2] Revert "Merge pull request #36 from Starefossen/patch-2" This reverts commit a72f08a8f8bb01f8a6c4db89da0c8e85598e3284, reversing changes made to 79e00fbc39c73ed2ac5f2d671a1698746149597f. --- 1.5/onbuild/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/1.5/onbuild/Dockerfile b/1.5/onbuild/Dockerfile index 5e71206..36c1de8 100644 --- a/1.5/onbuild/Dockerfile +++ b/1.5/onbuild/Dockerfile @@ -4,7 +4,7 @@ RUN mkdir -p /usr/src/app WORKDIR /usr/src/app ONBUILD COPY package.json /usr/src/app/ -ONBUILD RUN npm install --loglevel info +ONBUILD RUN npm install ONBUILD COPY . /usr/src/app CMD [ "npm", "start" ] From e6f93cf6312d4a867b88fbf368e283c57ea85d3e Mon Sep 17 00:00:00 2001 From: Hans Kristian Flaatten Date: Tue, 10 Mar 2015 20:32:05 +0100 Subject: [PATCH 2/2] Set NPM_CONFIG_LOGLEVEL env variable to info --- 1.5/Dockerfile | 1 + 1.5/slim/Dockerfile | 1 + 2 files changed, 2 insertions(+) diff --git a/1.5/Dockerfile b/1.5/Dockerfile index f6f734b..eb53276 100644 --- a/1.5/Dockerfile +++ b/1.5/Dockerfile @@ -3,6 +3,7 @@ FROM buildpack-deps:jessie # gpg keys listed at https://github.com/iojs/io.js RUN gpg --keyserver pool.sks-keyservers.net --recv-keys 9554F04D7259F04124DE6B476D5A82AC7E37093B DD8F2338BAE7501E3DD5AC78C273792F7D83545D +ENV NPM_CONFIG_LOGLEVEL info ENV IOJS_VERSION 1.5.1 RUN curl -SLO "https://iojs.org/dist/v$IOJS_VERSION/iojs-v$IOJS_VERSION-linux-x64.tar.gz" \ diff --git a/1.5/slim/Dockerfile b/1.5/slim/Dockerfile index df01f29..208ba8e 100644 --- a/1.5/slim/Dockerfile +++ b/1.5/slim/Dockerfile @@ -3,6 +3,7 @@ FROM buildpack-deps:jessie-curl # gpg keys listed at https://github.com/iojs/io.js RUN gpg --keyserver pool.sks-keyservers.net --recv-keys 9554F04D7259F04124DE6B476D5A82AC7E37093B DD8F2338BAE7501E3DD5AC78C273792F7D83545D +ENV NPM_CONFIG_LOGLEVEL info ENV IOJS_VERSION 1.5.1 RUN curl -SLO "https://iojs.org/dist/v$IOJS_VERSION/iojs-v$IOJS_VERSION-linux-x64.tar.gz" \