From c4868ce25f75d47e3ec75e6479664d8c46fc990e Mon Sep 17 00:00:00 2001 From: Hans Kristian Flaatten Date: Thu, 7 Jan 2016 08:50:44 +0100 Subject: [PATCH 1/8] Update Node to 5.4.0 PR-URL: #83 Realted: nodejs/node#4547 Signed-off-by: Hans Kristian Flaatten --- {5.3 => 5.4}/Dockerfile | 2 +- {5.3 => 5.4}/onbuild/Dockerfile | 2 +- {5.3 => 5.4}/slim/Dockerfile | 2 +- {5.3 => 5.4}/wheezy/Dockerfile | 2 +- generate-stackbrew-library.sh | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) rename {5.3 => 5.4}/Dockerfile (97%) rename {5.3 => 5.4}/onbuild/Dockerfile (91%) rename {5.3 => 5.4}/slim/Dockerfile (97%) rename {5.3 => 5.4}/wheezy/Dockerfile (97%) diff --git a/5.3/Dockerfile b/5.4/Dockerfile similarity index 97% rename from 5.3/Dockerfile rename to 5.4/Dockerfile index de0d94162b..f9a57ba5ec 100644 --- a/5.3/Dockerfile +++ b/5.4/Dockerfile @@ -14,7 +14,7 @@ RUN set -ex \ done ENV NPM_CONFIG_LOGLEVEL info -ENV NODE_VERSION 5.3.0 +ENV NODE_VERSION 5.4.0 RUN curl -SLO "https://nodejs.org/dist/v$NODE_VERSION/node-v$NODE_VERSION-linux-x64.tar.gz" \ && curl -SLO "https://nodejs.org/dist/v$NODE_VERSION/SHASUMS256.txt.asc" \ diff --git a/5.3/onbuild/Dockerfile b/5.4/onbuild/Dockerfile similarity index 91% rename from 5.3/onbuild/Dockerfile rename to 5.4/onbuild/Dockerfile index a7ed1738ef..0cd9047c0a 100644 --- a/5.3/onbuild/Dockerfile +++ b/5.4/onbuild/Dockerfile @@ -1,4 +1,4 @@ -FROM node:5.3.0 +FROM node:5.4.0 RUN mkdir -p /usr/src/app WORKDIR /usr/src/app diff --git a/5.3/slim/Dockerfile b/5.4/slim/Dockerfile similarity index 97% rename from 5.3/slim/Dockerfile rename to 5.4/slim/Dockerfile index c776cd6989..e6288d10cf 100644 --- a/5.3/slim/Dockerfile +++ b/5.4/slim/Dockerfile @@ -14,7 +14,7 @@ RUN set -ex \ done ENV NPM_CONFIG_LOGLEVEL info -ENV NODE_VERSION 5.3.0 +ENV NODE_VERSION 5.4.0 RUN curl -SLO "https://nodejs.org/dist/v$NODE_VERSION/node-v$NODE_VERSION-linux-x64.tar.gz" \ && curl -SLO "https://nodejs.org/dist/v$NODE_VERSION/SHASUMS256.txt.asc" \ diff --git a/5.3/wheezy/Dockerfile b/5.4/wheezy/Dockerfile similarity index 97% rename from 5.3/wheezy/Dockerfile rename to 5.4/wheezy/Dockerfile index 90bc23dedd..8e4a175e85 100644 --- a/5.3/wheezy/Dockerfile +++ b/5.4/wheezy/Dockerfile @@ -14,7 +14,7 @@ RUN set -ex \ done ENV NPM_CONFIG_LOGLEVEL info -ENV NODE_VERSION 5.3.0 +ENV NODE_VERSION 5.4.0 RUN curl -SLO "https://nodejs.org/dist/v$NODE_VERSION/node-v$NODE_VERSION-linux-x64.tar.gz" \ && curl -SLO "https://nodejs.org/dist/v$NODE_VERSION/SHASUMS256.txt.asc" \ diff --git a/generate-stackbrew-library.sh b/generate-stackbrew-library.sh index ae99f18022..6c2dd771c6 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_2='4 argon'; -array_5_3='5 latest'; +array_5_4='5 latest'; cd $(cd ${0%/*} && pwd -P); From 4bc77d4335b66f9c7dbc6ad791f38faabf535662 Mon Sep 17 00:00:00 2001 From: Hans Kristian Flaatten Date: Wed, 13 Jan 2016 10:41:55 +0100 Subject: [PATCH 2/8] Upgrade Node to 5.4.1 PR-URL: #86 Related: nodejs/node#4626 Signed-off-by: Hans Kristian Flaatten --- 5.4/Dockerfile | 2 +- 5.4/onbuild/Dockerfile | 2 +- 5.4/slim/Dockerfile | 2 +- 5.4/wheezy/Dockerfile | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/5.4/Dockerfile b/5.4/Dockerfile index f9a57ba5ec..afe01bd71d 100644 --- a/5.4/Dockerfile +++ b/5.4/Dockerfile @@ -14,7 +14,7 @@ RUN set -ex \ done ENV NPM_CONFIG_LOGLEVEL info -ENV NODE_VERSION 5.4.0 +ENV NODE_VERSION 5.4.1 RUN curl -SLO "https://nodejs.org/dist/v$NODE_VERSION/node-v$NODE_VERSION-linux-x64.tar.gz" \ && curl -SLO "https://nodejs.org/dist/v$NODE_VERSION/SHASUMS256.txt.asc" \ diff --git a/5.4/onbuild/Dockerfile b/5.4/onbuild/Dockerfile index 0cd9047c0a..e30d8e6969 100644 --- a/5.4/onbuild/Dockerfile +++ b/5.4/onbuild/Dockerfile @@ -1,4 +1,4 @@ -FROM node:5.4.0 +FROM node:5.4.1 RUN mkdir -p /usr/src/app WORKDIR /usr/src/app diff --git a/5.4/slim/Dockerfile b/5.4/slim/Dockerfile index e6288d10cf..d241624863 100644 --- a/5.4/slim/Dockerfile +++ b/5.4/slim/Dockerfile @@ -14,7 +14,7 @@ RUN set -ex \ done ENV NPM_CONFIG_LOGLEVEL info -ENV NODE_VERSION 5.4.0 +ENV NODE_VERSION 5.4.1 RUN curl -SLO "https://nodejs.org/dist/v$NODE_VERSION/node-v$NODE_VERSION-linux-x64.tar.gz" \ && curl -SLO "https://nodejs.org/dist/v$NODE_VERSION/SHASUMS256.txt.asc" \ diff --git a/5.4/wheezy/Dockerfile b/5.4/wheezy/Dockerfile index 8e4a175e85..fcf8e62fbe 100644 --- a/5.4/wheezy/Dockerfile +++ b/5.4/wheezy/Dockerfile @@ -14,7 +14,7 @@ RUN set -ex \ done ENV NPM_CONFIG_LOGLEVEL info -ENV NODE_VERSION 5.4.0 +ENV NODE_VERSION 5.4.1 RUN curl -SLO "https://nodejs.org/dist/v$NODE_VERSION/node-v$NODE_VERSION-linux-x64.tar.gz" \ && curl -SLO "https://nodejs.org/dist/v$NODE_VERSION/SHASUMS256.txt.asc" \ From f6691b6f7ef66d9dc0fde4598060e6d019632b17 Mon Sep 17 00:00:00 2001 From: Hans Kristian Flaatten Date: Thu, 17 Dec 2015 19:19:57 +0100 Subject: [PATCH 3/8] Update instructions in README for the `onbuild` variant --- README.md | 58 +++++++++++++++++++++++++++++++++++++++---------------- 1 file changed, 41 insertions(+), 17 deletions(-) diff --git a/README.md b/README.md index 27784827b8..88d0bdb575 100644 --- a/README.md +++ b/README.md @@ -20,30 +20,37 @@ See: http://nodejs.org # How to use this image -If you want to distribute your application on the docker registry, create a -`Dockerfile` in the root of application directory: +## Create a `Dockerfile` in your Node.js app project -```Dockerfile -FROM node:onbuild - -# Expose the ports that your app uses. For example: -EXPOSE 8080 +```dockerfile +FROM node:4-onbuild +# replace this with your application's default port +EXPOSE 8888 ``` -Then simply run: +You can then build and run the Docker image: -``` -$ docker build -t node-app . -... -$ docker run --rm -it node-app +```console +$ docker build -t my-nodejs-app . +$ docker run -it --rm --name my-running-app my-nodejs-app ``` -To run a single script, you can mount it in a volume under `/usr/src/app`. From -the root of your application directory (assuming your script is named -`index.js`): +### Notes -``` -$ docker run -v ${PWD}:/usr/src/app -w /usr/src/app -it --rm node node index.js +The image assumes that your application has a file named +[`package.json`](https://docs.npmjs.com/files/package.json) listing its +dependencies and defining its [start +script](https://docs.npmjs.com/misc/scripts#default-values). + +## Run a single Node.js script + +For many simple, single file projects, you may find it inconvenient to write a +complete `Dockerfile`. In such cases, you can run a Node.js script by using the +Node.js Docker image directly: + +```console +$ docker run -it --rm --name my-running-script -v "$PWD":/usr/src/app -w +/usr/src/app node:4 node your-daemon-or-script.js ``` # Image Variants @@ -68,6 +75,23 @@ This image makes building derivative images easier. For most use cases, creating a `Dockerfile` in the base of your project directory with the line `FROM node:onbuild` will be enough to create a stand-alone image for your project. +While the `onbuild` variant is really useful for "getting off the ground +running" (zero to Dockerized in a short period of time), it's not recommended +for long-term usage within a project due to the lack of control over *when* the +`ONBUILD` triggers fire (see also +[`docker/docker#5714`](https://github.com/docker/docker/issues/5714), +[`docker/docker#8240`](https://github.com/docker/docker/issues/8240), +[`docker/docker#11917`](https://github.com/docker/docker/issues/11917)). + +Once you've got a handle on how your project functions within Docker, you'll +probably want to adjust your `Dockerfile` to inherit from a non-`onbuild` +variant and copy the commands from the `onbuild` variant `Dockerfile` (moving +the `ONBUILD` lines to the end and removing the `ONBUILD` keywords) into your +own file so that you have tighter control over them and more transparency for +yourself and others looking at your `Dockerfile` as to what it does. This also +makes it easier to add additional requirements as time goes on (such as +installing more packages before performing the previously-`ONBUILD` steps). + ## `node:slim` This image does not contain the common packages contained in the default tag and From 667d7d795e8fc9964b65c67a2c139bcf752158d9 Mon Sep 17 00:00:00 2001 From: Hans Kristian Flaatten Date: Thu, 17 Dec 2015 19:20:26 +0100 Subject: [PATCH 4/8] Update supported Docker versions from docker-library/docs --- README.md | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 88d0bdb575..9980e603bd 100644 --- a/README.md +++ b/README.md @@ -109,9 +109,13 @@ Node.js Docker project. # Supported Docker versions -This image is officially supported on Docker version 1.8.3. +This image is officially supported on Docker version 1.9.1. -Support for older versions (down to 1.0) is provided on a best-effort basis. +Support for older versions (down to 1.6) is provided on a best-effort basis. + +Please see [the Docker installation +documentation](https://docs.docker.com/installation/) for details on how to +upgrade your Docker daemon. # People From 4d80297d88069515d5673043c2c4097d61bbfe44 Mon Sep 17 00:00:00 2001 From: Hans Kristian Flaatten Date: Wed, 13 Jan 2016 23:08:33 +0100 Subject: [PATCH 5/8] Add release key for Evan Lucas @evanlucas PR-URL: #85 Related: nodejs/node#4579 Signed-off-by: Hans Kristian Flaatten --- 0.10/Dockerfile | 1 + 0.10/slim/Dockerfile | 1 + 0.10/wheezy/Dockerfile | 1 + 0.12/Dockerfile | 1 + 0.12/slim/Dockerfile | 1 + 0.12/wheezy/Dockerfile | 1 + 4.2/Dockerfile | 1 + 4.2/slim/Dockerfile | 1 + 4.2/wheezy/Dockerfile | 1 + 5.4/Dockerfile | 1 + 5.4/slim/Dockerfile | 1 + 5.4/wheezy/Dockerfile | 1 + 12 files changed, 12 insertions(+) diff --git a/0.10/Dockerfile b/0.10/Dockerfile index 3e0dcd4901..5b2d0ac6fe 100644 --- a/0.10/Dockerfile +++ b/0.10/Dockerfile @@ -9,6 +9,7 @@ RUN set -ex \ FD3A5288F042B6850C66B31F09FE44734EB7990E \ 71DCFD284A79C3B38668286BC97EC7A07EDE3FC1 \ DD8F2338BAE7501E3DD5AC78C273792F7D83545D \ + B9AE9905FFD7803F25714661B63B535A4C206CA9 \ ; do \ gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; \ done diff --git a/0.10/slim/Dockerfile b/0.10/slim/Dockerfile index 7d9c5b8e4e..d23d20a4d6 100644 --- a/0.10/slim/Dockerfile +++ b/0.10/slim/Dockerfile @@ -9,6 +9,7 @@ RUN set -ex \ FD3A5288F042B6850C66B31F09FE44734EB7990E \ 71DCFD284A79C3B38668286BC97EC7A07EDE3FC1 \ DD8F2338BAE7501E3DD5AC78C273792F7D83545D \ + B9AE9905FFD7803F25714661B63B535A4C206CA9 \ ; do \ gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; \ done diff --git a/0.10/wheezy/Dockerfile b/0.10/wheezy/Dockerfile index bc1d46fb63..a2d8837c11 100644 --- a/0.10/wheezy/Dockerfile +++ b/0.10/wheezy/Dockerfile @@ -9,6 +9,7 @@ RUN set -ex \ FD3A5288F042B6850C66B31F09FE44734EB7990E \ 71DCFD284A79C3B38668286BC97EC7A07EDE3FC1 \ DD8F2338BAE7501E3DD5AC78C273792F7D83545D \ + B9AE9905FFD7803F25714661B63B535A4C206CA9 \ ; do \ gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; \ done diff --git a/0.12/Dockerfile b/0.12/Dockerfile index 392b3c2f48..e011884a39 100644 --- a/0.12/Dockerfile +++ b/0.12/Dockerfile @@ -9,6 +9,7 @@ RUN set -ex \ FD3A5288F042B6850C66B31F09FE44734EB7990E \ 71DCFD284A79C3B38668286BC97EC7A07EDE3FC1 \ DD8F2338BAE7501E3DD5AC78C273792F7D83545D \ + B9AE9905FFD7803F25714661B63B535A4C206CA9 \ ; do \ gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; \ done diff --git a/0.12/slim/Dockerfile b/0.12/slim/Dockerfile index 82f5bfbe25..5919a7fea1 100644 --- a/0.12/slim/Dockerfile +++ b/0.12/slim/Dockerfile @@ -9,6 +9,7 @@ RUN set -ex \ FD3A5288F042B6850C66B31F09FE44734EB7990E \ 71DCFD284A79C3B38668286BC97EC7A07EDE3FC1 \ DD8F2338BAE7501E3DD5AC78C273792F7D83545D \ + B9AE9905FFD7803F25714661B63B535A4C206CA9 \ ; do \ gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; \ done diff --git a/0.12/wheezy/Dockerfile b/0.12/wheezy/Dockerfile index a03dde2562..3885a7c9fc 100644 --- a/0.12/wheezy/Dockerfile +++ b/0.12/wheezy/Dockerfile @@ -9,6 +9,7 @@ RUN set -ex \ FD3A5288F042B6850C66B31F09FE44734EB7990E \ 71DCFD284A79C3B38668286BC97EC7A07EDE3FC1 \ DD8F2338BAE7501E3DD5AC78C273792F7D83545D \ + B9AE9905FFD7803F25714661B63B535A4C206CA9 \ ; do \ gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; \ done diff --git a/4.2/Dockerfile b/4.2/Dockerfile index d7ec14370b..4558c55fff 100644 --- a/4.2/Dockerfile +++ b/4.2/Dockerfile @@ -9,6 +9,7 @@ RUN set -ex \ FD3A5288F042B6850C66B31F09FE44734EB7990E \ 71DCFD284A79C3B38668286BC97EC7A07EDE3FC1 \ DD8F2338BAE7501E3DD5AC78C273792F7D83545D \ + B9AE9905FFD7803F25714661B63B535A4C206CA9 \ ; do \ gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; \ done diff --git a/4.2/slim/Dockerfile b/4.2/slim/Dockerfile index a17a34f420..fabac2a87d 100644 --- a/4.2/slim/Dockerfile +++ b/4.2/slim/Dockerfile @@ -9,6 +9,7 @@ RUN set -ex \ FD3A5288F042B6850C66B31F09FE44734EB7990E \ 71DCFD284A79C3B38668286BC97EC7A07EDE3FC1 \ DD8F2338BAE7501E3DD5AC78C273792F7D83545D \ + B9AE9905FFD7803F25714661B63B535A4C206CA9 \ ; do \ gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; \ done diff --git a/4.2/wheezy/Dockerfile b/4.2/wheezy/Dockerfile index 5055e4ea3a..f6e4257d64 100644 --- a/4.2/wheezy/Dockerfile +++ b/4.2/wheezy/Dockerfile @@ -9,6 +9,7 @@ RUN set -ex \ FD3A5288F042B6850C66B31F09FE44734EB7990E \ 71DCFD284A79C3B38668286BC97EC7A07EDE3FC1 \ DD8F2338BAE7501E3DD5AC78C273792F7D83545D \ + B9AE9905FFD7803F25714661B63B535A4C206CA9 \ ; do \ gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; \ done diff --git a/5.4/Dockerfile b/5.4/Dockerfile index afe01bd71d..f493088f9a 100644 --- a/5.4/Dockerfile +++ b/5.4/Dockerfile @@ -9,6 +9,7 @@ RUN set -ex \ FD3A5288F042B6850C66B31F09FE44734EB7990E \ 71DCFD284A79C3B38668286BC97EC7A07EDE3FC1 \ DD8F2338BAE7501E3DD5AC78C273792F7D83545D \ + B9AE9905FFD7803F25714661B63B535A4C206CA9 \ ; do \ gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; \ done diff --git a/5.4/slim/Dockerfile b/5.4/slim/Dockerfile index d241624863..d2fc80f14a 100644 --- a/5.4/slim/Dockerfile +++ b/5.4/slim/Dockerfile @@ -9,6 +9,7 @@ RUN set -ex \ FD3A5288F042B6850C66B31F09FE44734EB7990E \ 71DCFD284A79C3B38668286BC97EC7A07EDE3FC1 \ DD8F2338BAE7501E3DD5AC78C273792F7D83545D \ + B9AE9905FFD7803F25714661B63B535A4C206CA9 \ ; do \ gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; \ done diff --git a/5.4/wheezy/Dockerfile b/5.4/wheezy/Dockerfile index fcf8e62fbe..23eb7a2778 100644 --- a/5.4/wheezy/Dockerfile +++ b/5.4/wheezy/Dockerfile @@ -9,6 +9,7 @@ RUN set -ex \ FD3A5288F042B6850C66B31F09FE44734EB7990E \ 71DCFD284A79C3B38668286BC97EC7A07EDE3FC1 \ DD8F2338BAE7501E3DD5AC78C273792F7D83545D \ + B9AE9905FFD7803F25714661B63B535A4C206CA9 \ ; do \ gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; \ done From 4b1b5052db3d6bc462103fac2671175d447b102e Mon Sep 17 00:00:00 2001 From: Hans Kristian Flaatten Date: Wed, 13 Jan 2016 23:10:21 +0100 Subject: [PATCH 6/8] Add release key for Myles Borins @TheAlphaNerd PR-URL: #85 Related: nodejs/node#4657 Signed-off-by: Hans Kristian Flaatten --- 0.10/Dockerfile | 1 + 0.10/slim/Dockerfile | 1 + 0.10/wheezy/Dockerfile | 1 + 0.12/Dockerfile | 1 + 0.12/slim/Dockerfile | 1 + 0.12/wheezy/Dockerfile | 1 + 4.2/Dockerfile | 1 + 4.2/slim/Dockerfile | 1 + 4.2/wheezy/Dockerfile | 1 + 5.4/Dockerfile | 1 + 5.4/slim/Dockerfile | 1 + 5.4/wheezy/Dockerfile | 1 + 12 files changed, 12 insertions(+) diff --git a/0.10/Dockerfile b/0.10/Dockerfile index 5b2d0ac6fe..a908010094 100644 --- a/0.10/Dockerfile +++ b/0.10/Dockerfile @@ -10,6 +10,7 @@ RUN set -ex \ 71DCFD284A79C3B38668286BC97EC7A07EDE3FC1 \ DD8F2338BAE7501E3DD5AC78C273792F7D83545D \ B9AE9905FFD7803F25714661B63B535A4C206CA9 \ + C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \ ; do \ gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; \ done diff --git a/0.10/slim/Dockerfile b/0.10/slim/Dockerfile index d23d20a4d6..1d975d1fc5 100644 --- a/0.10/slim/Dockerfile +++ b/0.10/slim/Dockerfile @@ -10,6 +10,7 @@ RUN set -ex \ 71DCFD284A79C3B38668286BC97EC7A07EDE3FC1 \ DD8F2338BAE7501E3DD5AC78C273792F7D83545D \ B9AE9905FFD7803F25714661B63B535A4C206CA9 \ + C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \ ; do \ gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; \ done diff --git a/0.10/wheezy/Dockerfile b/0.10/wheezy/Dockerfile index a2d8837c11..291a5c4757 100644 --- a/0.10/wheezy/Dockerfile +++ b/0.10/wheezy/Dockerfile @@ -10,6 +10,7 @@ RUN set -ex \ 71DCFD284A79C3B38668286BC97EC7A07EDE3FC1 \ DD8F2338BAE7501E3DD5AC78C273792F7D83545D \ B9AE9905FFD7803F25714661B63B535A4C206CA9 \ + C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \ ; do \ gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; \ done diff --git a/0.12/Dockerfile b/0.12/Dockerfile index e011884a39..8c5b705126 100644 --- a/0.12/Dockerfile +++ b/0.12/Dockerfile @@ -10,6 +10,7 @@ RUN set -ex \ 71DCFD284A79C3B38668286BC97EC7A07EDE3FC1 \ DD8F2338BAE7501E3DD5AC78C273792F7D83545D \ B9AE9905FFD7803F25714661B63B535A4C206CA9 \ + C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \ ; do \ gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; \ done diff --git a/0.12/slim/Dockerfile b/0.12/slim/Dockerfile index 5919a7fea1..ef2f158c56 100644 --- a/0.12/slim/Dockerfile +++ b/0.12/slim/Dockerfile @@ -10,6 +10,7 @@ RUN set -ex \ 71DCFD284A79C3B38668286BC97EC7A07EDE3FC1 \ DD8F2338BAE7501E3DD5AC78C273792F7D83545D \ B9AE9905FFD7803F25714661B63B535A4C206CA9 \ + C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \ ; do \ gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; \ done diff --git a/0.12/wheezy/Dockerfile b/0.12/wheezy/Dockerfile index 3885a7c9fc..b6d6f5c5c1 100644 --- a/0.12/wheezy/Dockerfile +++ b/0.12/wheezy/Dockerfile @@ -10,6 +10,7 @@ RUN set -ex \ 71DCFD284A79C3B38668286BC97EC7A07EDE3FC1 \ DD8F2338BAE7501E3DD5AC78C273792F7D83545D \ B9AE9905FFD7803F25714661B63B535A4C206CA9 \ + C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \ ; do \ gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; \ done diff --git a/4.2/Dockerfile b/4.2/Dockerfile index 4558c55fff..080d7bc7c5 100644 --- a/4.2/Dockerfile +++ b/4.2/Dockerfile @@ -10,6 +10,7 @@ RUN set -ex \ 71DCFD284A79C3B38668286BC97EC7A07EDE3FC1 \ DD8F2338BAE7501E3DD5AC78C273792F7D83545D \ B9AE9905FFD7803F25714661B63B535A4C206CA9 \ + C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \ ; do \ gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; \ done diff --git a/4.2/slim/Dockerfile b/4.2/slim/Dockerfile index fabac2a87d..2d893ae436 100644 --- a/4.2/slim/Dockerfile +++ b/4.2/slim/Dockerfile @@ -10,6 +10,7 @@ RUN set -ex \ 71DCFD284A79C3B38668286BC97EC7A07EDE3FC1 \ DD8F2338BAE7501E3DD5AC78C273792F7D83545D \ B9AE9905FFD7803F25714661B63B535A4C206CA9 \ + C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \ ; do \ gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; \ done diff --git a/4.2/wheezy/Dockerfile b/4.2/wheezy/Dockerfile index f6e4257d64..d8acf7bafb 100644 --- a/4.2/wheezy/Dockerfile +++ b/4.2/wheezy/Dockerfile @@ -10,6 +10,7 @@ RUN set -ex \ 71DCFD284A79C3B38668286BC97EC7A07EDE3FC1 \ DD8F2338BAE7501E3DD5AC78C273792F7D83545D \ B9AE9905FFD7803F25714661B63B535A4C206CA9 \ + C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \ ; do \ gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; \ done diff --git a/5.4/Dockerfile b/5.4/Dockerfile index f493088f9a..7b535ed414 100644 --- a/5.4/Dockerfile +++ b/5.4/Dockerfile @@ -10,6 +10,7 @@ RUN set -ex \ 71DCFD284A79C3B38668286BC97EC7A07EDE3FC1 \ DD8F2338BAE7501E3DD5AC78C273792F7D83545D \ B9AE9905FFD7803F25714661B63B535A4C206CA9 \ + C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \ ; do \ gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; \ done diff --git a/5.4/slim/Dockerfile b/5.4/slim/Dockerfile index d2fc80f14a..85bffc96c1 100644 --- a/5.4/slim/Dockerfile +++ b/5.4/slim/Dockerfile @@ -10,6 +10,7 @@ RUN set -ex \ 71DCFD284A79C3B38668286BC97EC7A07EDE3FC1 \ DD8F2338BAE7501E3DD5AC78C273792F7D83545D \ B9AE9905FFD7803F25714661B63B535A4C206CA9 \ + C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \ ; do \ gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; \ done diff --git a/5.4/wheezy/Dockerfile b/5.4/wheezy/Dockerfile index 23eb7a2778..665a94faf2 100644 --- a/5.4/wheezy/Dockerfile +++ b/5.4/wheezy/Dockerfile @@ -10,6 +10,7 @@ RUN set -ex \ 71DCFD284A79C3B38668286BC97EC7A07EDE3FC1 \ DD8F2338BAE7501E3DD5AC78C273792F7D83545D \ B9AE9905FFD7803F25714661B63B535A4C206CA9 \ + C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \ ; do \ gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; \ done From ececf6c5a33c5b7a0721f1fa422cf1065355237b Mon Sep 17 00:00:00 2001 From: Hans Kristian Flaatten Date: Wed, 13 Jan 2016 23:32:04 +0100 Subject: [PATCH 7/8] Onbuild does not install according to shrinkwrap Close: nodejs/docker-node#65 --- README.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/README.md b/README.md index 9980e603bd..375755734b 100644 --- a/README.md +++ b/README.md @@ -92,6 +92,11 @@ yourself and others looking at your `Dockerfile` as to what it does. This also makes it easier to add additional requirements as time goes on (such as installing more packages before performing the previously-`ONBUILD` steps). +This `onbuild` variant will only install npm packages according to the +`package.json` and *does not* adhere to the `npm-shrinkwrap.json` (see full +discussion in +[`nodejs/docker-node#65`](https://github.com/nodejs/docker-node/issues/65). + ## `node:slim` This image does not contain the common packages contained in the default tag and From 36abbd4f4bf2e7d5f17f894b69d6c80ca876d311 Mon Sep 17 00:00:00 2001 From: Peter Petrov Date: Thu, 21 Jan 2016 01:39:09 +0200 Subject: [PATCH 8/8] Update Node to 4.2.5 --- 4.2/Dockerfile | 2 +- 4.2/onbuild/Dockerfile | 2 +- 4.2/slim/Dockerfile | 2 +- 4.2/wheezy/Dockerfile | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/4.2/Dockerfile b/4.2/Dockerfile index 080d7bc7c5..d69bb6b700 100644 --- a/4.2/Dockerfile +++ b/4.2/Dockerfile @@ -16,7 +16,7 @@ RUN set -ex \ done ENV NPM_CONFIG_LOGLEVEL info -ENV NODE_VERSION 4.2.4 +ENV NODE_VERSION 4.2.5 RUN curl -SLO "https://nodejs.org/dist/v$NODE_VERSION/node-v$NODE_VERSION-linux-x64.tar.gz" \ && curl -SLO "https://nodejs.org/dist/v$NODE_VERSION/SHASUMS256.txt.asc" \ diff --git a/4.2/onbuild/Dockerfile b/4.2/onbuild/Dockerfile index e6e59e3f4c..4dc9096c2c 100644 --- a/4.2/onbuild/Dockerfile +++ b/4.2/onbuild/Dockerfile @@ -1,4 +1,4 @@ -FROM node:4.2.4 +FROM node:4.2.5 RUN mkdir -p /usr/src/app WORKDIR /usr/src/app diff --git a/4.2/slim/Dockerfile b/4.2/slim/Dockerfile index 2d893ae436..074dcb22fc 100644 --- a/4.2/slim/Dockerfile +++ b/4.2/slim/Dockerfile @@ -16,7 +16,7 @@ RUN set -ex \ done ENV NPM_CONFIG_LOGLEVEL info -ENV NODE_VERSION 4.2.4 +ENV NODE_VERSION 4.2.5 RUN curl -SLO "https://nodejs.org/dist/v$NODE_VERSION/node-v$NODE_VERSION-linux-x64.tar.gz" \ && curl -SLO "https://nodejs.org/dist/v$NODE_VERSION/SHASUMS256.txt.asc" \ diff --git a/4.2/wheezy/Dockerfile b/4.2/wheezy/Dockerfile index d8acf7bafb..8142fe13b7 100644 --- a/4.2/wheezy/Dockerfile +++ b/4.2/wheezy/Dockerfile @@ -16,7 +16,7 @@ RUN set -ex \ done ENV NPM_CONFIG_LOGLEVEL info -ENV NODE_VERSION 4.2.4 +ENV NODE_VERSION 4.2.5 RUN curl -SLO "https://nodejs.org/dist/v$NODE_VERSION/node-v$NODE_VERSION-linux-x64.tar.gz" \ && curl -SLO "https://nodejs.org/dist/v$NODE_VERSION/SHASUMS256.txt.asc" \