Skip to content

Commit d94600d

Browse files
committed
Move to Go 1.17 and fix license-check
Signed-off-by: Alex Ellis (OpenFaaS Ltd) <[email protected]>
1 parent ad610f1 commit d94600d

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

Dockerfile

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
FROM teamserverless/license-check:0.3.9 as license-check
22

33
# Build stage
4-
FROM --platform=${BUILDPLATFORM:-linux/amd64} golang:1.15 as builder
4+
FROM --platform=${BUILDPLATFORM:-linux/amd64} golang:1.17 as builder
55

66
ARG TARGETPLATFORM
77
ARG BUILDPLATFORM
@@ -78,4 +78,4 @@ USER app
7878

7979
ENV PATH=$PATH:/usr/bin/
8080

81-
ENTRYPOINT ["faas-cli"]
81+
ENTRYPOINT ["faas-cli"]

Dockerfile.redist

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
FROM teamserverless/license-check:0.3.6 as license-check
22

33
# Build stage
4-
FROM golang:1.15 as builder
4+
FROM golang:1.17 as builder
55

66
ARG GIT_COMMIT
77
ARG VERSION
@@ -23,7 +23,7 @@ RUN test -z "$(gofmt -l $(find . -type f -name '*.go' -not -path "./vendor/*"))"
2323
# ldflags "-s -w" strips binary
2424
# ldflags -X injects commit version into binary
2525

26-
RUN /usr/bin/license-check -path ./ --verbose=false "Alex Ellis" "OpenFaaS Author(s)" \
26+
RUN /usr/bin/license-check -path ./ --verbose=false "Alex Ellis" "OpenFaaS Author(s)" "OpenFaaS Ltd" \
2727
&& go test $(go list ./... | grep -v /vendor/ | grep -v /template/|grep -v /build/) -cover
2828

2929
FROM builder as linux

0 commit comments

Comments
 (0)