From 4a722c29c0e52624af8b72b4711ebeba8ea39463 Mon Sep 17 00:00:00 2001 From: Christopher Horrell Date: Wed, 23 Nov 2016 09:08:02 -0500 Subject: [PATCH 1/2] Add node group/user with gid/uid 1000 and a home directory. --- 0.12/Dockerfile | 3 ++- 0.12/slim/Dockerfile | 3 ++- 0.12/wheezy/Dockerfile | 3 ++- 4.6/Dockerfile | 3 ++- 4.6/alpine/Dockerfile | 3 +-- 4.6/slim/Dockerfile | 3 ++- 4.6/wheezy/Dockerfile | 3 ++- 6.9/Dockerfile | 3 ++- 6.9/alpine/Dockerfile | 3 +-- 6.9/slim/Dockerfile | 3 ++- 6.9/wheezy/Dockerfile | 3 ++- 7.1/Dockerfile | 3 ++- 7.1/alpine/Dockerfile | 3 +-- 7.1/slim/Dockerfile | 3 ++- 7.1/wheezy/Dockerfile | 3 ++- 15 files changed, 27 insertions(+), 18 deletions(-) diff --git a/0.12/Dockerfile b/0.12/Dockerfile index 62f5dbf2..32cb7e48 100644 --- a/0.12/Dockerfile +++ b/0.12/Dockerfile @@ -1,6 +1,7 @@ FROM buildpack-deps:jessie -RUN groupadd -r node && useradd -r -g node node +RUN groupadd --gid 1000 node \ + && useradd --uid 1000 --gid node --shell /bin/bash --create-home node # gpg keys listed at https://github.com/nodejs/node RUN set -ex \ diff --git a/0.12/slim/Dockerfile b/0.12/slim/Dockerfile index 2159a5cc..ba568415 100644 --- a/0.12/slim/Dockerfile +++ b/0.12/slim/Dockerfile @@ -1,6 +1,7 @@ FROM buildpack-deps:jessie-curl -RUN groupadd -r node && useradd -r -g node node +RUN groupadd --gid 1000 node \ + && useradd --uid 1000 --gid node --shell /bin/bash --create-home node # gpg keys listed at https://github.com/nodejs/node RUN set -ex \ diff --git a/0.12/wheezy/Dockerfile b/0.12/wheezy/Dockerfile index 0a75fb56..d00c6734 100644 --- a/0.12/wheezy/Dockerfile +++ b/0.12/wheezy/Dockerfile @@ -1,6 +1,7 @@ FROM buildpack-deps:wheezy -RUN groupadd -r node && useradd -r -g node node +RUN groupadd --gid 1000 node \ + && useradd --uid 1000 --gid node --shell /bin/bash --create-home node # gpg keys listed at https://github.com/nodejs/node RUN set -ex \ diff --git a/4.6/Dockerfile b/4.6/Dockerfile index f104a4a0..0b71e75a 100644 --- a/4.6/Dockerfile +++ b/4.6/Dockerfile @@ -1,6 +1,7 @@ FROM buildpack-deps:jessie -RUN groupadd -r node && useradd -r -g node node +RUN groupadd --gid 1000 node \ + && useradd --uid 1000 --gid node --shell /bin/bash --create-home node # gpg keys listed at https://github.com/nodejs/node RUN set -ex \ diff --git a/4.6/alpine/Dockerfile b/4.6/alpine/Dockerfile index 7b9bdecf..822357c3 100644 --- a/4.6/alpine/Dockerfile +++ b/4.6/alpine/Dockerfile @@ -3,8 +3,7 @@ FROM alpine:3.4 ENV NPM_CONFIG_LOGLEVEL info ENV NODE_VERSION 4.6.2 -RUN addgroup -S node \ - && adduser -D -S -h /var/cache/node -s /sbin/nologin -G node node \ +RUN adduser -D -u 1000 node \ && apk add --no-cache \ libstdc++ \ && apk add --no-cache --virtual .build-deps \ diff --git a/4.6/slim/Dockerfile b/4.6/slim/Dockerfile index 23257565..373a8f65 100644 --- a/4.6/slim/Dockerfile +++ b/4.6/slim/Dockerfile @@ -1,6 +1,7 @@ FROM buildpack-deps:jessie-curl -RUN groupadd -r node && useradd -r -g node node +RUN groupadd --gid 1000 node \ + && useradd --uid 1000 --gid node --shell /bin/bash --create-home node # gpg keys listed at https://github.com/nodejs/node RUN set -ex \ diff --git a/4.6/wheezy/Dockerfile b/4.6/wheezy/Dockerfile index a8a28e50..e6218610 100644 --- a/4.6/wheezy/Dockerfile +++ b/4.6/wheezy/Dockerfile @@ -1,6 +1,7 @@ FROM buildpack-deps:wheezy -RUN groupadd -r node && useradd -r -g node node +RUN groupadd --gid 1000 node \ + && useradd --uid 1000 --gid node --shell /bin/bash --create-home node # gpg keys listed at https://github.com/nodejs/node RUN set -ex \ diff --git a/6.9/Dockerfile b/6.9/Dockerfile index 164d1666..eff25468 100644 --- a/6.9/Dockerfile +++ b/6.9/Dockerfile @@ -1,6 +1,7 @@ FROM buildpack-deps:jessie -RUN groupadd -r node && useradd -r -g node node +RUN groupadd --gid 1000 node \ + && useradd --uid 1000 --gid node --shell /bin/bash --create-home node # gpg keys listed at https://github.com/nodejs/node RUN set -ex \ diff --git a/6.9/alpine/Dockerfile b/6.9/alpine/Dockerfile index 28e332e8..552ff793 100644 --- a/6.9/alpine/Dockerfile +++ b/6.9/alpine/Dockerfile @@ -3,8 +3,7 @@ FROM alpine:3.4 ENV NPM_CONFIG_LOGLEVEL info ENV NODE_VERSION 6.9.1 -RUN addgroup -S node \ - && adduser -D -S -h /var/cache/node -s /sbin/nologin -G node node \ +RUN adduser -D -u 1000 node \ && apk add --no-cache \ libstdc++ \ && apk add --no-cache --virtual .build-deps \ diff --git a/6.9/slim/Dockerfile b/6.9/slim/Dockerfile index 80d53fd6..1b7c7a4f 100644 --- a/6.9/slim/Dockerfile +++ b/6.9/slim/Dockerfile @@ -1,6 +1,7 @@ FROM buildpack-deps:jessie-curl -RUN groupadd -r node && useradd -r -g node node +RUN groupadd --gid 1000 node \ + && useradd --uid 1000 --gid node --shell /bin/bash --create-home node # gpg keys listed at https://github.com/nodejs/node RUN set -ex \ diff --git a/6.9/wheezy/Dockerfile b/6.9/wheezy/Dockerfile index 2761b486..e7109710 100644 --- a/6.9/wheezy/Dockerfile +++ b/6.9/wheezy/Dockerfile @@ -1,6 +1,7 @@ FROM buildpack-deps:wheezy -RUN groupadd -r node && useradd -r -g node node +RUN groupadd --gid 1000 node \ + && useradd --uid 1000 --gid node --shell /bin/bash --create-home node # gpg keys listed at https://github.com/nodejs/node RUN set -ex \ diff --git a/7.1/Dockerfile b/7.1/Dockerfile index d61f9291..f9f7ba2e 100644 --- a/7.1/Dockerfile +++ b/7.1/Dockerfile @@ -1,6 +1,7 @@ FROM buildpack-deps:jessie -RUN groupadd -r node && useradd -r -g node node +RUN groupadd --gid 1000 node \ + && useradd --uid 1000 --gid node --shell /bin/bash --create-home node # gpg keys listed at https://github.com/nodejs/node RUN set -ex \ diff --git a/7.1/alpine/Dockerfile b/7.1/alpine/Dockerfile index f90bafc9..991a9bcb 100644 --- a/7.1/alpine/Dockerfile +++ b/7.1/alpine/Dockerfile @@ -3,8 +3,7 @@ FROM alpine:3.4 ENV NPM_CONFIG_LOGLEVEL info ENV NODE_VERSION 7.1.0 -RUN addgroup -S node \ - && adduser -D -S -h /var/cache/node -s /sbin/nologin -G node node \ +RUN adduser -D -u 1000 node \ && apk add --no-cache \ libstdc++ \ && apk add --no-cache --virtual .build-deps \ diff --git a/7.1/slim/Dockerfile b/7.1/slim/Dockerfile index b6cfe0cf..c4afd80c 100644 --- a/7.1/slim/Dockerfile +++ b/7.1/slim/Dockerfile @@ -1,6 +1,7 @@ FROM buildpack-deps:jessie-curl -RUN groupadd -r node && useradd -r -g node node +RUN groupadd --gid 1000 node \ + && useradd --uid 1000 --gid node --shell /bin/bash --create-home node # gpg keys listed at https://github.com/nodejs/node RUN set -ex \ diff --git a/7.1/wheezy/Dockerfile b/7.1/wheezy/Dockerfile index 1bc25c18..da3beedc 100644 --- a/7.1/wheezy/Dockerfile +++ b/7.1/wheezy/Dockerfile @@ -1,6 +1,7 @@ FROM buildpack-deps:wheezy -RUN groupadd -r node && useradd -r -g node node +RUN groupadd --gid 1000 node \ + && useradd --uid 1000 --gid node --shell /bin/bash --create-home node # gpg keys listed at https://github.com/nodejs/node RUN set -ex \ From 718102a587e7f02748402551b51407332384c1b3 Mon Sep 17 00:00:00 2001 From: Christopher Horrell Date: Wed, 23 Nov 2016 09:10:36 -0500 Subject: [PATCH 2/2] Update for Node.js v7.2.0 --- {7.1 => 7.2}/Dockerfile | 2 +- {7.1 => 7.2}/alpine/Dockerfile | 2 +- {7.1 => 7.2}/onbuild/Dockerfile | 2 +- {7.1 => 7.2}/slim/Dockerfile | 2 +- {7.1 => 7.2}/wheezy/Dockerfile | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) rename {7.1 => 7.2}/Dockerfile (98%) rename {7.1 => 7.2}/alpine/Dockerfile (98%) rename {7.1 => 7.2}/onbuild/Dockerfile (93%) rename {7.1 => 7.2}/slim/Dockerfile (98%) rename {7.1 => 7.2}/wheezy/Dockerfile (98%) diff --git a/7.1/Dockerfile b/7.2/Dockerfile similarity index 98% rename from 7.1/Dockerfile rename to 7.2/Dockerfile index f9f7ba2e..4fb229a1 100644 --- a/7.1/Dockerfile +++ b/7.2/Dockerfile @@ -19,7 +19,7 @@ RUN set -ex \ done ENV NPM_CONFIG_LOGLEVEL info -ENV NODE_VERSION 7.1.0 +ENV NODE_VERSION 7.2.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/7.1/alpine/Dockerfile b/7.2/alpine/Dockerfile similarity index 98% rename from 7.1/alpine/Dockerfile rename to 7.2/alpine/Dockerfile index 991a9bcb..de6ec3a3 100644 --- a/7.1/alpine/Dockerfile +++ b/7.2/alpine/Dockerfile @@ -1,7 +1,7 @@ FROM alpine:3.4 ENV NPM_CONFIG_LOGLEVEL info -ENV NODE_VERSION 7.1.0 +ENV NODE_VERSION 7.2.0 RUN adduser -D -u 1000 node \ && apk add --no-cache \ diff --git a/7.1/onbuild/Dockerfile b/7.2/onbuild/Dockerfile similarity index 93% rename from 7.1/onbuild/Dockerfile rename to 7.2/onbuild/Dockerfile index 50273d78..6cb2d56d 100644 --- a/7.1/onbuild/Dockerfile +++ b/7.2/onbuild/Dockerfile @@ -1,4 +1,4 @@ -FROM node:7.1.0 +FROM node:7.2.0 RUN mkdir -p /usr/src/app WORKDIR /usr/src/app diff --git a/7.1/slim/Dockerfile b/7.2/slim/Dockerfile similarity index 98% rename from 7.1/slim/Dockerfile rename to 7.2/slim/Dockerfile index c4afd80c..1a977e17 100644 --- a/7.1/slim/Dockerfile +++ b/7.2/slim/Dockerfile @@ -19,7 +19,7 @@ RUN set -ex \ done ENV NPM_CONFIG_LOGLEVEL info -ENV NODE_VERSION 7.1.0 +ENV NODE_VERSION 7.2.0 RUN buildDeps='xz-utils' \ && set -x \ diff --git a/7.1/wheezy/Dockerfile b/7.2/wheezy/Dockerfile similarity index 98% rename from 7.1/wheezy/Dockerfile rename to 7.2/wheezy/Dockerfile index da3beedc..6d24bcf4 100644 --- a/7.1/wheezy/Dockerfile +++ b/7.2/wheezy/Dockerfile @@ -19,7 +19,7 @@ RUN set -ex \ done ENV NPM_CONFIG_LOGLEVEL info -ENV NODE_VERSION 7.1.0 +ENV NODE_VERSION 7.2.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" \