Update versions

- both templates should use the latest of-watchdog and the same
Go version for the SDK and the same version of Alpine Linux for
the runtime i.e. 3.8

Tested both variants with Docker Swarm locally.

Signed-off-by: Alex Ellis (VMware) <[email protected]>

Author: alexellis

.gitignore

@@ -1,3 +1,5 @@
 build
 test
 test.yml
+
+template

template/golang-http/Dockerfile

@@ -1,6 +1,5 @@
-FROM golang:1.9.2-alpine3.6
+FROM golang:1.10.4-alpine3.8 as build
 
-# 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 -sSLf https://github.com/openfaas-incubator/of-watchdog/releases/download/0.4.0/of-watchdog > /usr/bin/fwatchdog \
@@ -18,19 +17,18 @@ RUN CGO_ENABLED=0 GOOS=linux \
     go build --ldflags "-s -w" -a -installsuffix cgo -o handler . && \
     go test $(go list ./... | grep -v /vendor/) -cover
 
-FROM alpine:3.6
-RUN apk --no-cache add ca-certificates
-
-# Add non root user
-RUN addgroup -S app && adduser -S -g app app
-RUN mkdir -p /home/app
-RUN chown app /home/app
+FROM alpine:3.8
+# Add non root user and certs
+RUN apk --no-cache add ca-certificates \
+    && addgroup -S app && adduser -S -g app app \
+    && mkdir -p /home/app \
+    && chown app /home/app
 
 WORKDIR /home/app
 
-COPY --from=0 /go/src/handler/handler    .
-COPY --from=0 /usr/bin/fwatchdog         .
-# RUN apk add --no-cache curl
+COPY --from=build /go/src/handler/handler    .
+COPY --from=build /usr/bin/fwatchdog         .
+
 USER app
 
 ENV fprocess="./handler"

template/golang-middleware/Dockerfile

@@ -1,9 +1,8 @@
-FROM golang:1.10.4-alpine3.8
+FROM golang:1.10.4-alpine3.8 as build
 
-# 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 -sSLf https://github.com/openfaas-incubator/of-watchdog/releases/download/0.2.7/of-watchdog > /usr/bin/fwatchdog \
+    && curl -sSLf https://github.com/openfaas-incubator/of-watchdog/releases/download/0.4.0/of-watchdog > /usr/bin/fwatchdog \
     && chmod +x /usr/bin/fwatchdog \
     && apk del curl --no-cache
 
@@ -19,18 +18,17 @@ RUN CGO_ENABLED=0 GOOS=linux \
     go test $(go list ./... | grep -v /vendor/) -cover
 
 FROM alpine:3.8
-RUN apk --no-cache add ca-certificates
-
-# Add non root user
-RUN addgroup -S app && adduser -S -g app app
-RUN mkdir -p /home/app
-RUN chown app /home/app
+# Add non root user and certs
+RUN apk --no-cache add ca-certificates \
+    && addgroup -S app && adduser -S -g app app \
+    && mkdir -p /home/app \
+    && chown app /home/app
 
 WORKDIR /home/app
 
-COPY --from=0 /go/src/handler/handler    .
-COPY --from=0 /usr/bin/fwatchdog         .
-# RUN apk add --no-cache curl
+COPY --from=build /go/src/handler/handler    .
+COPY --from=build /usr/bin/fwatchdog         .
+
 USER app
 
 ENV fprocess="./handler"