Add user to groups, bump watchdog version

Signed-off-by: Eric Stoekl <ems5311@gmail.com>
openfaas · Nov 27, 2017 · 345fd09 · 345fd09
1 parent d905bda
commit 345fd09
Show file tree

Hide file tree

Showing 5 changed files with 25 additions and 16 deletions.
diff --git a/template/csharp/Dockerfile b/template/csharp/Dockerfile
@@ -18,12 +18,12 @@ COPY .  .
 RUN dotnet publish -c release -o published
 
 FROM microsoft/dotnet:2.0-runtime
-RUN useradd app
+RUN addgroup -S app && adduser -S -g app app
 
 RUN apt-get update -qy \
     && apt-get install -qy curl ca-certificates --no-install-recommends \ 
     && echo "Pulling watchdog binary from Github." \
-    && curl -sSL https://github.com/openfaas/faas/releases/download/0.6.9/fwatchdog > /usr/bin/fwatchdog \
+    && curl -sSL https://github.com/openfaas/faas/releases/download/0.6.12/fwatchdog > /usr/bin/fwatchdog \
     && chmod +x /usr/bin/fwatchdog \
     && apt-get -qy remove curl \
     && apt-get clean \
@@ -32,7 +32,10 @@ RUN apt-get update -qy \
 WORKDIR /home/app/
 COPY --from=builder /home/app/src/published .
 
-RUN chown -R app ./
+# chmod for tmp is for a buildkit issue (@alexellis)
+RUN chown app:app -R /home/app \
+    && chmod 777 /tmp
+
 USER app
 
 ENV fprocess="dotnet ./root.dll"

diff --git a/template/node/Dockerfile b/template/node/Dockerfile
@@ -5,7 +5,7 @@ RUN addgroup -S app && adduser -S -g app app
 # Alternatively use ADD https:// (which will not be cached by Docker builder)
 RUN apk --no-cache add curl \
     && echo "Pulling watchdog binary from Github." \
-    && curl -sSL https://github.com/openfaas/faas/releases/download/0.6.9/fwatchdog > /usr/bin/fwatchdog \
+    && curl -sSL https://github.com/openfaas/faas/releases/download/0.6.12/fwatchdog > /usr/bin/fwatchdog \
     && chmod +x /usr/bin/fwatchdog \
     && apk del curl --no-cache
 

diff --git a/template/python/Dockerfile b/template/python/Dockerfile
@@ -1,16 +1,14 @@
 FROM python:2.7-alpine
 
-RUN adduser app -D
+RUN addgroup -S app && adduser -S -g app app
 
 # Alternatively use ADD https:// (which will not be cached by Docker builder)
 RUN apk --no-cache add curl \ 
     && echo "Pulling watchdog binary from Github." \
-    && curl -sSL https://github.com/openfaas/faas/releases/download/0.6.9/fwatchdog > /usr/bin/fwatchdog \
+    && curl -sSL https://github.com/openfaas/faas/releases/download/0.6.12/fwatchdog > /usr/bin/fwatchdog \
     && chmod +x /usr/bin/fwatchdog \
     && apk del curl --no-cache
 
-RUN mkdir -p /home/app/function
-
 COPY index.py           /home/app
 COPY requirements.txt   /home/app
 
@@ -26,7 +24,10 @@ RUN pip install -r requirements.txt
 WORKDIR /home/app
 COPY function           function
 
-RUN chown -R app ./
+# chmod for tmp is for a buildkit issue (@alexellis)
+RUN chown app:app -R /home/app \
+    && chmod 777 /tmp
+
 USER app
 
 ENV fprocess="python index.py"

diff --git a/template/python3/Dockerfile b/template/python3/Dockerfile
@@ -1,11 +1,11 @@
 FROM python:3-alpine
 
-RUN adduser app -D
+RUN addgroup -S app && adduser -S -g app app
 
 # Alternatively use ADD https:// (which will not be cached by Docker builder)
 RUN apk --no-cache add curl \ 
     && echo "Pulling watchdog binary from Github." \
-    && curl -sSL https://github.com/openfaas/faas/releases/download/0.6.9/fwatchdog > /usr/bin/fwatchdog \
+    && curl -sSL https://github.com/openfaas/faas/releases/download/0.6.12/fwatchdog > /usr/bin/fwatchdog \
     && chmod +x /usr/bin/fwatchdog \
     && apk del curl --no-cache
 
@@ -26,7 +26,10 @@ RUN pip install -r requirements.txt
 
 WORKDIR /home/app
 
-RUN chown -R app ./
+# chmod for tmp is for a buildkit issue (@alexellis)
+RUN chown app:app -R /home/app \
+    && chmod 777 /tmp
+
 USER app
 
 ENV fprocess="python3 index.py"

diff --git a/template/ruby/Dockerfile b/template/ruby/Dockerfile
@@ -1,15 +1,14 @@
 FROM ruby:2.4-alpine3.6
 
-RUN adduser app -D
+RUN addgroup -S app && adduser -S -g app app
 
 # Alternatively use ADD https:// (which will not be cached by Docker builder)
 RUN apk --no-cache add curl \ 
     && echo "Pulling watchdog binary from Github." \
-    && curl -sSL https://github.com/openfaas/faas/releases/download/0.6.9/fwatchdog > /usr/bin/fwatchdog \
+    && curl -sSL https://github.com/openfaas/faas/releases/download/0.6.12/fwatchdog > /usr/bin/fwatchdog \
     && chmod +x /usr/bin/fwatchdog \
     && apk del curl --no-cache
 
-RUN mkdir -p /home/app/
 WORKDIR /home/app/
 
 COPY Gemfile		.
@@ -22,7 +21,10 @@ RUN bundle install
 
 WORKDIR /home/app/
 
-RUN chown -R app ./
+# chmod for tmp is for a buildkit issue (@alexellis)
+RUN chown app:app -R /home/app \
+    && chmod 777 /tmp
+
 USER app
 
 ENV fprocess="ruby index.rb"