File tree Expand file tree Collapse file tree 12 files changed +35
-322
lines changed Expand file tree Collapse file tree 12 files changed +35
-322
lines changed Original file line number Diff line number Diff line change 11build
22test
33test.yml
4- .DS_STORE
4+ .DS_STORE
5+ .vscode
Original file line number Diff line number Diff line change 1+ go 1.18
2+
3+ use (
4+ ./template/golang-http
5+ ./template/golang-middleware
6+ )
Original file line number Diff line number Diff line change 11FROM --platform=${TARGETPLATFORM:-linux/amd64} ghcr.io/openfaas/of-watchdog:0.9.3 as watchdog
2- FROM --platform=${BUILDPLATFORM:-linux/amd64} golang:1.17 -alpine3.15 as build
2+ FROM --platform=${BUILDPLATFORM:-linux/amd64} golang:1.18 -alpine3.15 as build
33
44ARG TARGETPLATFORM
55ARG BUILDPLATFORM
@@ -11,7 +11,6 @@ RUN apk --no-cache add git
1111COPY --from=watchdog /fwatchdog /usr/bin/fwatchdog
1212RUN chmod +x /usr/bin/fwatchdog
1313
14- ENV CGO_ENABLED=0
1514
1615RUN mkdir -p /go/src/handler
1716WORKDIR /go/src/handler
@@ -20,10 +19,9 @@ COPY . .
2019ARG GO111MODULE="on"
2120ARG GOPROXY=""
2221ARG GOFLAGS=""
23- ARG DEBUG=0
22+ ARG CGO_ENABLED=0
23+ ENV CGO_ENABLED=${CGO_ENABLED}
2424
25- # Lift the vendor and go.mod to the main package, cleanup any relative references
26- RUN sh modules-cleanup.sh
2725
2826# Run a gofmt and exclude all vendored code.
2927RUN 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; }
Original file line number Diff line number Diff line change 1+ module handler/function
2+
3+ go 1.18
Original file line number Diff line number Diff line change 11module handler
22
3- go 1.16
4-
5- replace handler/function => ./function
3+ go 1.18
64
75require github.com/openfaas/templates-sdk v0.0.0-20200723092016-0ebf61253625
Original file line number Diff line number Diff line change 1+ go 1.18
2+
3+ use (
4+ .
5+ ./function
6+ )
Load Diff This file was deleted.
Original file line number Diff line number Diff line change 11FROM --platform=${TARGETPLATFORM:-linux/amd64} ghcr.io/openfaas/of-watchdog:0.9.3 as watchdog
2- FROM --platform=${BUILDPLATFORM:-linux/amd64} golang:1.17 -alpine3.15 as build
2+ FROM --platform=${BUILDPLATFORM:-linux/amd64} golang:1.18 -alpine3.15 as build
33
44ARG TARGETPLATFORM
55ARG BUILDPLATFORM
@@ -11,7 +11,6 @@ RUN apk --no-cache add git
1111COPY --from=watchdog /fwatchdog /usr/bin/fwatchdog
1212RUN chmod +x /usr/bin/fwatchdog
1313
14- ENV CGO_ENABLED=0
1514
1615RUN mkdir -p /go/src/handler
1716WORKDIR /go/src/handler
@@ -20,10 +19,8 @@ COPY . .
2019ARG GO111MODULE="on"
2120ARG GOPROXY=""
2221ARG GOFLAGS=""
23- ARG DEBUG=0
24-
25- # Lift the vendor and go.mod to the main package, cleanup any relative references
26- RUN sh modules-cleanup.sh
22+ ARG CGO_ENABLED=0
23+ ENV CGO_ENABLED=${CGO_ENABLED}
2724
2825# Run a gofmt and exclude all vendored code.
2926RUN 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; }
@@ -33,7 +30,7 @@ WORKDIR /go/src/handler/function
3330RUN GOOS=${TARGETOS} GOARCH=${TARGETARCH} go test ./... -cover
3431
3532WORKDIR /go/src/handler
36- RUN CGO_ENABLED=${CGO_ENABLED} GOOS=${TARGETOS} GOARCH=${TARGETARCH} \
33+ RUN GOOS=${TARGETOS} GOARCH=${TARGETARCH} \
3734 go build --ldflags "-s -w" -a -installsuffix cgo -o handler .
3835
3936FROM --platform=${TARGETPLATFORM:-linux/amd64} alpine:3.14
Original file line number Diff line number Diff line change 1+ module handler/function
2+
3+ go 1.18
Original file line number Diff line number Diff line change 11module handler
22
3- go 1.16
4-
5- replace handler/function => ./function
3+ go 1.18
You can’t perform that action at this time.
0 commit comments