Add opt-in support for using Go modules.

Signed-off-by: Bruno Miguel Custódio <[email protected]>

Author: bmcustodio

template/golang-http-armhf/Dockerfile

@@ -1,22 +1,27 @@
 FROM openfaas/of-watchdog:0.7.2 as watchdog
 
-FROM golang:1.11-alpine3.10 as build
 
-ENV CGO_ENABLED=0
+FROM golang:1.13.1-alpine3.10 as build
+
+RUN apk --no-cache add git
 
 COPY --from=watchdog /fwatchdog /usr/bin/fwatchdog
 RUN chmod +x /usr/bin/fwatchdog
 
+ENV CGO_ENABLED=0
+
 RUN mkdir -p /go/src/handler
 WORKDIR /go/src/handler
 COPY . .
 
 # Run a gofmt and exclude all vendored code.
 RUN test -z "$(gofmt -l $(find . -type f -name '*.go' -not -path "./vendor/*" -not -path "./function/vendor/*"))" || { echo "Run \"gofmt -s -w\" on your Golang code"; exit 1; }
 
-RUN CGO_ENABLED=0 GOOS=linux \
-    go build --ldflags "-s -w" -a -installsuffix cgo -o handler . && \
-    go test $(go list ./... | grep -v /vendor/) -cover
+ARG GO111MODULE="off"
+ARG GOPROXY=""
+
+RUN go build --ldflags "-s -w" -a -installsuffix cgo -o handler .
+RUN go test handler/function/... -cover
 
 FROM alpine:3.10
 # Add non root user and certs

template/golang-http-armhf/Gopkg.lock

@@ -0,0 +1,7 @@
+module handler
+
+go 1.12
+
+replace handler/function => ./function
+
+require github.com/openfaas-incubator/go-function-sdk v0.0.0-20181217173454-cac4b8744921

template/golang-http-armhf/go.mod

@@ -0,0 +1,2 @@
+github.com/openfaas-incubator/go-function-sdk v0.0.0-20181217173454-cac4b8744921 h1:IGP0tlTdv6r/zy3Kw61EhiXao61krCUs5KRHWSzCdxM=
+github.com/openfaas-incubator/go-function-sdk v0.0.0-20181217173454-cac4b8744921/go.mod h1:F37Kp+hwdHP+o3UKjkGzikQg4weKiMvcegT9vCQjvjE=

template/golang-http-armhf/go.sum

@@ -0,0 +1,2 @@
+# github.com/openfaas-incubator/go-function-sdk v0.0.0-20181217173454-cac4b8744921
+github.com/openfaas-incubator/go-function-sdk

template/golang-http-armhf/vendor/github.com/openfaas-incubator/go-function-sdk/LICENSE

@@ -1,22 +1,28 @@
 FROM openfaas/of-watchdog:0.7.2 as watchdog
 
-FROM golang:1.10.4-alpine3.8 as build
+FROM golang:1.13.1-alpine3.10 as build
+
+RUN apk --no-cache add git
 
 ENV CGO_ENABLED=0
 
 COPY --from=watchdog /fwatchdog /usr/bin/fwatchdog
 RUN chmod +x /usr/bin/fwatchdog
 
+ENV CGO_ENABLED=0
+
 RUN mkdir -p /go/src/handler
 WORKDIR /go/src/handler
 COPY . .
 
 # Run a gofmt and exclude all vendored code.
 RUN test -z "$(gofmt -l $(find . -type f -name '*.go' -not -path "./vendor/*" -not -path "./function/vendor/*"))" || { echo "Run \"gofmt -s -w\" on your Golang code"; exit 1; }
 
-RUN CGO_ENABLED=0 GOOS=linux \
-    go build --ldflags "-s -w" -a -installsuffix cgo -o handler . && \
-    go test $(go list ./... | grep -v /vendor/) -cover
+ARG GO111MODULE="off"
+ARG GOPROXY=""
+
+RUN go build --ldflags "-s -w" -a -installsuffix cgo -o handler .
+RUN go test handler/function/... -cover
 
 FROM alpine:3.10
 # Add non root user and certs

template/golang-http-armhf/vendor/github.com/openfaas-incubator/go-function-sdk/README.md

@@ -0,0 +1,7 @@
+module handler
+
+go 1.12
+
+replace handler/function => ./function
+
+require github.com/openfaas-incubator/go-function-sdk v0.0.0-20181217173454-cac4b8744921

template/golang-http-armhf/vendor/modules.txt

@@ -0,0 +1,2 @@
+github.com/openfaas-incubator/go-function-sdk v0.0.0-20181217173454-cac4b8744921 h1:IGP0tlTdv6r/zy3Kw61EhiXao61krCUs5KRHWSzCdxM=
+github.com/openfaas-incubator/go-function-sdk v0.0.0-20181217173454-cac4b8744921/go.mod h1:F37Kp+hwdHP+o3UKjkGzikQg4weKiMvcegT9vCQjvjE=

template/golang-http/Dockerfile

@@ -0,0 +1,2 @@
+# github.com/openfaas-incubator/go-function-sdk v0.0.0-20181217173454-cac4b8744921
+github.com/openfaas-incubator/go-function-sdk

template/golang-http/Gopkg.lock

@@ -1,23 +1,25 @@
 FROM openfaas/of-watchdog:0.7.2 as watchdog
+FROM golang:1.13.1-alpine3.10 as build
 
-
-FROM golang:1.11-alpine3.10 as build
-
-ENV CGO_ENABLED=0
+RUN apk --no-cache add git
 
 COPY --from=watchdog /fwatchdog /usr/bin/fwatchdog
 RUN chmod +x /usr/bin/fwatchdog
 
+ENV CGO_ENABLED=0
+
 RUN mkdir -p /go/src/handler
 WORKDIR /go/src/handler
 COPY . .
 
 # Run a gofmt and exclude all vendored code.
 RUN test -z "$(gofmt -l $(find . -type f -name '*.go' -not -path "./vendor/*" -not -path "./function/vendor/*"))" || { echo "Run \"gofmt -s -w\" on your Golang code"; exit 1; }
 
-RUN CGO_ENABLED=0 GOOS=linux \
-    go build --ldflags "-s -w" -a -installsuffix cgo -o handler . && \
-    go test $(go list ./... | grep -v /vendor/) -cover
+ARG GO111MODULE="off"
+ARG GOPROXY=""
+
+RUN go build --ldflags "-s -w" -a -installsuffix cgo -o handler .
+RUN go test handler/function/... -cover
 
 FROM alpine:3.10
 # Add non root user and certs

template/golang-http/Gopkg.toml

@@ -0,0 +1,5 @@
+module handler
+
+go 1.12
+
+replace handler/function => ./function

template/golang-http/go.mod

@@ -1,22 +1,26 @@
 FROM openfaas/of-watchdog:0.7.2 as watchdog
 
-FROM golang:1.11-alpine3.10 as build
+FROM golang:1.13.1-alpine3.10 as build
 
-ENV CGO_ENABLED=0
+RUN apk --no-cache add git
 
 COPY --from=watchdog /fwatchdog /usr/bin/fwatchdog
 RUN chmod +x /usr/bin/fwatchdog
 
+ENV CGO_ENABLED=0
+
 RUN mkdir -p /go/src/handler
 WORKDIR /go/src/handler
 COPY . .
 
 # Run a gofmt and exclude all vendored code.
 RUN test -z "$(gofmt -l $(find . -type f -name '*.go' -not -path "./vendor/*" -not -path "./function/vendor/*"))" || { echo "Run \"gofmt -s -w\" on your Golang code"; exit 1; }
 
-RUN CGO_ENABLED=0 GOOS=linux \
-    go build --ldflags "-s -w" -a -installsuffix cgo -o handler . && \
-    go test $(go list ./... | grep -v /vendor/) -cover
+ARG GO111MODULE="off"
+ARG GOPROXY=""
+
+RUN go build --ldflags "-s -w" -a -installsuffix cgo -o handler .
+RUN go test handler/function/... -cover
 
 FROM alpine:3.10
 # Add non root user and certs

template/golang-http/go.sum

@@ -0,0 +1,5 @@
+module handler
+
+go 1.12
+
+replace handler/function => ./function