Merge pull request #274 from chorrell/node-user-home

chorrell · web-flow · commit 02fb483ac31b · 2016-11-23T07:09:16.000-08:00
Update for Node.js v7.2.0
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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.2/Dockerfile b/7.2/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 \
@@ -18,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.2/alpine/Dockerfile b/7.2/alpine/Dockerfile
@@ -1,10 +1,9 @@
 FROM alpine:3.4
 
 ENV NPM_CONFIG_LOGLEVEL info
-ENV NODE_VERSION 7.1.0
+ENV NODE_VERSION 7.2.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.2/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.2/slim/Dockerfile b/7.2/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 \
@@ -18,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.2/wheezy/Dockerfile b/7.2/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 \
@@ -18,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" \
