Bump alpine to 3.11

There's a new release which appears to have no apparent down-
sides or breakages.

https://www.alpinelinux.org/posts/Alpine-3.11.2-released.html

Signed-off-by: Alex Ellis (OpenFaaS Ltd) <alexellis2@gmail.com>

sample-functions/AlpineFunction/Dockerfile

@@ -1,6 +1,6 @@
-FROM openfaas/classic-watchdog:0.14.4 as watchdog
+FROM openfaas/classic-watchdog:0.18.8 as watchdog
 
-FROM alpine:3.10
+FROM alpine:3.11
 
 COPY --from=watchdog /fwatchdog /usr/bin/fwatchdog
 RUN chmod +x /usr/bin/fwatchdog

sample-functions/AlpineFunction/Dockerfile.arm64

@@ -1,6 +1,6 @@
-FROM openfaas/classic-watchdog:0.14.4 as watchdog
+FROM openfaas/classic-watchdog:0.18.8 as watchdog
 
-FROM alpine:3.10
+FROM alpine:3.11
 
 COPY --from=watchdog /fwatchdog /usr/bin/fwatchdog
 RUN chmod +x /usr/bin/fwatchdog

sample-functions/AlpineFunction/Dockerfile.armhf

@@ -1,6 +1,6 @@
-FROM openfaas/classic-watchdog:0.14.4 as watchdog
+FROM openfaas/classic-watchdog:0.18.8 as watchdog
 
-FROM alpine:3.10
+FROM alpine:3.11
 
 COPY --from=watchdog /fwatchdog /usr/bin/fwatchdog
 RUN chmod +x /usr/bin/fwatchdog

sample-functions/BaseFunctions/R/Dockerfile

@@ -1,4 +1,4 @@
-FROM openfaas/classic-watchdog:0.14.4 as watchdog
+FROM openfaas/classic-watchdog:0.18.8 as watchdog
 
 FROM artemklevtsov/r-alpine:latest
 

sample-functions/BaseFunctions/coffee/Dockerfile

@@ -1,4 +1,4 @@
-FROM openfaas/classic-watchdog:0.14.4 as watchdog
+FROM openfaas/classic-watchdog:0.18.8 as watchdog
 
 FROM node:6.9.1-alpine
 

sample-functions/BaseFunctions/dncore/Dockerfile

@@ -1,4 +1,4 @@
-FROM openfaas/classic-watchdog:0.14.4 as watchdog
+FROM openfaas/classic-watchdog:0.18.8 as watchdog
 
 FROM mcr.microsoft.com/dotnet/core/sdk:2.1 as build
 

sample-functions/BaseFunctions/golang/Dockerfile

@@ -1,4 +1,4 @@
-FROM openfaas/classic-watchdog:0.14.4 as watchdog
+FROM openfaas/classic-watchdog:0.18.8 as watchdog
 
 FROM golang:1.11-alpine
 ENV CGO_ENABLED=0

sample-functions/BaseFunctions/java/Dockerfile

@@ -1,4 +1,4 @@
-FROM openfaas/classic-watchdog:0.14.4 as watchdog
+FROM openfaas/classic-watchdog:0.18.8 as watchdog
 
 FROM openjdk:8u121-jdk-alpine
 

sample-functions/BaseFunctions/node/Dockerfile

@@ -1,4 +1,4 @@
-FROM openfaas/classic-watchdog:0.14.4 as watchdog
+FROM openfaas/classic-watchdog:0.18.8 as watchdog
 
 FROM node:6.9.1-alpine
 

sample-functions/BaseFunctions/python/Dockerfile

@@ -1,4 +1,4 @@
-FROM openfaas/classic-watchdog:0.14.4 as watchdog
+FROM openfaas/classic-watchdog:0.18.8 as watchdog
 
 FROM python:2.7-alpine
 

sample-functions/CHelloWorld/src/Dockerfile

@@ -1,6 +1,6 @@
-FROM openfaas/classic-watchdog:0.14.4 as watchdog
+FROM openfaas/classic-watchdog:0.18.8 as watchdog
 
-FROM alpine:3.10 as builder
+FROM alpine:3.11 as builder
 COPY --from=watchdog /fwatchdog /usr/bin/fwatchdog
 RUN chmod +x /usr/bin/fwatchdog
 

sample-functions/CaptainsIntent/Dockerfile

@@ -1,6 +1,6 @@
-FROM openfaas/classic-watchdog:0.14.4 as watchdog
+FROM openfaas/classic-watchdog:0.18.8 as watchdog
 
-FROM alpine:3.10
+FROM alpine:3.11
 RUN apk --update add nodejs nodejs-npm
 
 COPY --from=watchdog /fwatchdog /usr/bin/fwatchdog

sample-functions/ChangeColorIntent/Dockerfile

@@ -1,6 +1,6 @@
-FROM openfaas/classic-watchdog:0.14.4 as watchdog
+FROM openfaas/classic-watchdog:0.18.8 as watchdog
 
-FROM alpine:3.10
+FROM alpine:3.11
 RUN apk --update add nodejs nodejs-npm
 
 COPY --from=watchdog /fwatchdog /usr/bin/fwatchdog

sample-functions/DockerHubStats/Dockerfile

@@ -1,4 +1,4 @@
-FROM openfaas/classic-watchdog:0.14.4 as watchdog
+FROM openfaas/classic-watchdog:0.18.8 as watchdog
 
 FROM golang:1.11-alpine as builder
 ENV CGO_ENABLED=0
@@ -10,7 +10,7 @@ WORKDIR /go/src/github.com/openfaas/faas/sample-functions/DockerHubStats
 COPY . /go/src/github.com/openfaas/faas/sample-functions/DockerHubStats
 RUN set -ex && apk add make && make install
 
-FROM alpine:3.10
+FROM alpine:3.11
 
 # Needed to reach the hub
 RUN apk --no-cache add ca-certificates 

sample-functions/DockerHubStats/Dockerfile.armhf

@@ -13,7 +13,7 @@ COPY . /go/src/github.com/openfaas/faas/sample-functions/DockerHubStats
 
 RUN make install
 
-FROM alpine:3.10
+FROM alpine:3.11
 
 # Needed to reach the hub
 RUN apk --no-cache add ca-certificates 

sample-functions/HostnameIntent/Dockerfile

@@ -1,4 +1,7 @@
 FROM functions/alpine:latest
+
+USER root
+
 RUN apk --update add nodejs nodejs-npm
 
 COPY package.json   .
@@ -6,5 +9,8 @@ COPY handler.js     .
 COPY sample.json    .
 
 RUN npm i
+
+USER 1000
+
 ENV fprocess="node handler.js"
 CMD ["fwatchdog"]

sample-functions/MarkdownRender/Dockerfile

@@ -1,4 +1,4 @@
-FROM openfaas/classic-watchdog:0.14.4 as watchdog
+FROM openfaas/classic-watchdog:0.18.8 as watchdog
 
 FROM golang:1.11-alpine as builder
 ENV CGO_ENABLED=0
@@ -13,7 +13,7 @@ COPY vendor vendor
 
 RUN go install
 
-FROM alpine:3.10
+FROM alpine:3.11
 
 COPY --from=watchdog /fwatchdog /usr/bin/fwatchdog
 RUN chmod +x /usr/bin/fwatchdog

sample-functions/Nmap/Dockerfile

@@ -1,6 +1,6 @@
-FROM openfaas/classic-watchdog:0.14.4 as watchdog
+FROM openfaas/classic-watchdog:0.18.8 as watchdog
 
-FROM alpine:3.10
+FROM alpine:3.11
 
 COPY --from=watchdog /fwatchdog /usr/bin/fwatchdog
 RUN chmod +x /usr/bin/fwatchdog

sample-functions/NodeInfo/Dockerfile

@@ -1,11 +1,14 @@
 FROM functions/alpine:latest
 
+USER root
+
 RUN apk --update add nodejs nodejs-npm
 
 COPY package.json .
 COPY main.js .
 
 RUN npm i
+USER 1000
 
 ENV fprocess="node main.js"
 CMD ["fwatchdog"]

sample-functions/NodeInfo/Dockerfile.arm64

@@ -1,5 +1,7 @@
 FROM functions/alpine:latest
 
+USER root
+
 RUN apk --update add nodejs nodejs-npm
 
 COPY package.json .
@@ -7,5 +9,7 @@ COPY main.js .
 
 RUN npm i
 
+USER 1000
+
 ENV fprocess="node main.js"
 CMD ["fwatchdog"]

sample-functions/NodeInfo/Dockerfile.armhf

@@ -1,5 +1,7 @@
 FROM functions/alpine:latest
 
+USER root
+
 RUN apk --update add nodejs nodejs-npm
 
 COPY package.json .
@@ -7,5 +9,7 @@ COPY main.js .
 
 RUN npm i
 
+USER 1000
+
 ENV fprocess="node main.js"
 CMD ["fwatchdog"]

sample-functions/Phantomjs/Dockerfile

@@ -1,4 +1,4 @@
-FROM openfaas/classic-watchdog:0.14.4 as watchdog
+FROM openfaas/classic-watchdog:0.18.8 as watchdog
 
 FROM alexellis2/phantomjs-docker:latest
 

sample-functions/ResizeImageMagick/Dockerfile

@@ -1,4 +1,4 @@
-FROM openfaas/classic-watchdog:0.14.4 as watchdog
+FROM openfaas/classic-watchdog:0.18.8 as watchdog
 
 FROM v4tech/imagemagick
 

sample-functions/ResizeImageMagick/Dockerfile.armhf

@@ -1,6 +1,6 @@
-FROM openfaas/classic-watchdog:0.14.4 as watchdog
+FROM openfaas/classic-watchdog:0.18.8 as watchdog
 
-FROM arm32v6/alpine:3.10
+FROM arm32v6/alpine:3.11
 
 RUN apk --no-cache add imagemagick
 

sample-functions/SentimentAnalysis/Dockerfile

@@ -1,4 +1,4 @@
-FROM openfaas/classic-watchdog:0.14.4 as watchdog
+FROM openfaas/classic-watchdog:0.18.8 as watchdog
 
 FROM python:2.7-alpine
 

sample-functions/SentimentAnalysis/Dockerfile.armhf

@@ -1,4 +1,4 @@
-FROM openfaas/classic-watchdog:0.14.4 as watchdog
+FROM openfaas/classic-watchdog:0.18.8 as watchdog
 
 FROM arm32v7/python:2.7-slim
 

sample-functions/WebhookStash/Dockerfile

@@ -1,4 +1,4 @@
-FROM openfaas/classic-watchdog:0.14.4 as watchdog
+FROM openfaas/classic-watchdog:0.18.8 as watchdog
 
 FROM golang:1.11-alpine as builder
 ENV CGO_ENABLED=0
@@ -12,7 +12,7 @@ COPY handler.go .
 
 RUN go install
 
-FROM alpine:3.10
+FROM alpine:3.11
 
 COPY --from=watchdog /fwatchdog /usr/bin/fwatchdog
 RUN chmod +x /usr/bin/fwatchdog

sample-functions/WordCountFunction/Dockerfile

@@ -1,5 +1,10 @@
 FROM functions/alpine:latest
 
+USER root
+
 # Populate example here
 ENV fprocess="wc"
+
+USER 1000
+
 CMD ["fwatchdog"]

sample-functions/echo/Dockerfile

@@ -1,2 +1,3 @@
 FROM functions/alpine:latest
+
 ENV fprocess "/bin/cat"

sample-functions/figlet/Dockerfile

@@ -1,8 +1,11 @@
 FROM functions/alpine:latest
 
+USER root
+
 RUN apk add --no-cache figlet
 
 ENV fprocess="figlet"
+USER 1000
 
 HEALTHCHECK --interval=5s CMD [ -e /tmp/.lock ] || exit 1
 CMD ["fwatchdog"]

sample-functions/figlet/Dockerfile.armhf

@@ -1,7 +1,9 @@
 FROM functions/alpine:latest
+USER root
 
 RUN apk add --no-cache figlet
 
+USER 1000
 ENV fprocess="figlet"
 
 HEALTHCHECK --interval=5s CMD [ -e /tmp/.lock ] || exit 1

sample-functions/gif-maker/Dockerfile

@@ -1,7 +1,12 @@
 FROM functions/alpine:latest
 
+USER root
+
 RUN apk add ffmpeg gifsicle
 WORKDIR /root/
 COPY entry.sh   .
 ENV fprocess="./entry.sh"
+
+USER 1000
+
 CMD ["fwatchdog"]

sample-functions/pwgen/Dockerfile

@@ -1,5 +1,9 @@
 FROM functions/alpine:latest
-	
+
+USER root
+
 RUN apk add --no-cache pwgen
 
+USER 1000
+
 ENV fprocess="xargs pwgen -s"