From 56f1b9d833c8fae8549f6234046cdcf0096f22bb Mon Sep 17 00:00:00 2001 From: "Alex Ellis (OpenFaaS Ltd)" Date: Thu, 22 Aug 2019 10:41:35 +0100 Subject: [PATCH] Update go to 1.11 Ref: https://github.com/openfaas/faas/issues/1291 Tested with local build on Linux. Image was able to be pulled for armhf, which implies armhf is supported in this version too. Signed-off-by: Alex Ellis (OpenFaaS Ltd) --- template/go-armhf/Dockerfile | 5 ++--- template/go/Dockerfile | 4 ++-- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/template/go-armhf/Dockerfile b/template/go-armhf/Dockerfile index 8b26793b..d3347a91 100644 --- a/template/go-armhf/Dockerfile +++ b/template/go-armhf/Dockerfile @@ -1,6 +1,6 @@ FROM openfaas/classic-watchdog:0.15.4 as watchdog -FROM golang:1.10.8-alpine3.9 as builder +FROM golang:1.11-alpine3.10 as builder # Allows you to add additional packages via build-arg ARG ADDITIONAL_PACKAGE @@ -19,7 +19,7 @@ RUN CGO_ENABLED=${CGO_ENABLED} GOOS=linux \ go build --ldflags "-s -w" -a -installsuffix cgo -o handler . && \ go test $(go list ./... | grep -v /vendor/) -cover -FROM alpine:3.9 +FROM alpine:3.10 RUN apk --no-cache add \ ca-certificates @@ -30,7 +30,6 @@ RUN mkdir -p /home/app WORKDIR /home/app COPY --from=builder /usr/bin/fwatchdog . - COPY --from=builder /go/src/handler/function/ . COPY --from=builder /go/src/handler/handler . diff --git a/template/go/Dockerfile b/template/go/Dockerfile index 3bd83360..0fe95c24 100644 --- a/template/go/Dockerfile +++ b/template/go/Dockerfile @@ -1,6 +1,6 @@ FROM openfaas/classic-watchdog:0.15.4 as watchdog -FROM golang:1.10.8-alpine3.9 as builder +FROM golang:1.11-alpine3.10 as builder # Allows you to add additional packages via build-arg ARG ADDITIONAL_PACKAGE @@ -19,7 +19,7 @@ RUN CGO_ENABLED=${CGO_ENABLED} GOOS=linux \ go build --ldflags "-s -w" -a -installsuffix cgo -o handler . && \ go test $(go list ./... | grep -v /vendor/) -cover -FROM alpine:3.9 +FROM alpine:3.10 RUN apk --no-cache add \ ca-certificates