Skip to content

Commit

Permalink
Update go.mod, Alpine to 3.20.0 and to Go 1.22
Browse files Browse the repository at this point in the history
Signed-off-by: Alex Ellis (OpenFaaS Ltd) <[email protected]>
  • Loading branch information
alexellis committed May 31, 2024
1 parent 65d37f2 commit 3d28083
Show file tree
Hide file tree
Showing 564 changed files with 15,889 additions and 16,045 deletions.
6 changes: 3 additions & 3 deletions gateway/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
FROM --platform=${BUILDPLATFORM:-linux/amd64} ghcr.io/openfaas/license-check:0.4.1 as license-check

FROM --platform=${BUILDPLATFORM:-linux/amd64} golang:1.21 as build
FROM --platform=${BUILDPLATFORM:-linux/amd64} golang:1.22 as build

ENV GO111MODULE=on
ENV CGO_ENABLED=0
Expand Down Expand Up @@ -44,9 +44,9 @@ RUN CGO_ENABLED=${CGO_ENABLED} GOOS=${TARGETOS} GOARCH=${TARGETARCH} go build --
-X github.com/openfaas/faas/gateway/types.Arch=${TARGETARCH}" \
-o gateway .

FROM --platform=${TARGETPLATFORM:-linux/amd64} alpine:3.19.0 as ship
FROM --platform=${TARGETPLATFORM:-linux/amd64} alpine:3.20.0 as ship

LABEL org.label-schema.license="MIT" \
LABEL org.label-schema.license="OpenFaaS CE EULA" \
org.label-schema.vcs-url="https://github.com/openfaas/faas" \
org.label-schema.vcs-type="Git" \
org.label-schema.name="openfaas/faas" \
Expand Down
41 changes: 22 additions & 19 deletions gateway/go.mod
Original file line number Diff line number Diff line change
@@ -1,35 +1,38 @@
module github.com/openfaas/faas/gateway

go 1.21
go 1.22

require (
github.com/docker/distribution v2.8.3+incompatible
github.com/gorilla/mux v1.8.0
github.com/openfaas/faas-provider v0.25.2
github.com/openfaas/nats-queue-worker v0.0.0-20231023101743-fa54e89c9db2
github.com/prometheus/client_golang v1.17.0
github.com/prometheus/client_model v0.5.0
go.uber.org/goleak v1.2.1
golang.org/x/sync v0.4.0
github.com/gorilla/mux v1.8.1
github.com/openfaas/faas-provider v0.25.3
github.com/openfaas/nats-queue-worker v0.0.0-20231219105451-b94918cb8a24
github.com/prometheus/client_golang v1.19.1
github.com/prometheus/client_model v0.6.1
go.uber.org/goleak v1.3.0
golang.org/x/sync v0.7.0
)

// replace github.com/openfaas/faas-provider => ../../faas-provider

require (
github.com/beorn7/perks v1.0.1 // indirect
github.com/cespare/xxhash/v2 v2.2.0 // indirect
github.com/cespare/xxhash/v2 v2.3.0 // indirect
github.com/distribution/reference v0.6.0 // indirect
github.com/gogo/protobuf v1.3.2 // indirect
github.com/golang/protobuf v1.5.3 // indirect
github.com/klauspost/compress v1.17.2 // indirect
github.com/golang/protobuf v1.5.4 // indirect
github.com/klauspost/compress v1.17.8 // indirect
github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
github.com/nats-io/nats.go v1.31.0 // indirect
github.com/nats-io/nkeys v0.4.5 // indirect
github.com/nats-io/nats.go v1.35.0 // indirect
github.com/nats-io/nkeys v0.4.7 // indirect
github.com/nats-io/nuid v1.0.1 // indirect
github.com/nats-io/stan.go v0.10.4 // indirect
github.com/prometheus/common v0.44.0 // indirect
github.com/prometheus/procfs v0.12.0 // indirect
github.com/stretchr/testify v1.8.2 // indirect
golang.org/x/crypto v0.14.0 // indirect
golang.org/x/sys v0.13.0 // indirect
google.golang.org/protobuf v1.31.0 // indirect
github.com/opencontainers/go-digest v1.0.0 // indirect
github.com/opencontainers/image-spec v1.1.0 // indirect
github.com/prometheus/common v0.53.0 // indirect
github.com/prometheus/procfs v0.15.1 // indirect
github.com/stretchr/testify v1.9.0 // indirect
golang.org/x/crypto v0.23.0 // indirect
golang.org/x/sys v0.20.0 // indirect
google.golang.org/protobuf v1.34.1 // indirect
)
42 changes: 42 additions & 0 deletions gateway/go.sum

Large diffs are not rendered by default.

2 changes: 2 additions & 0 deletions gateway/vendor/github.com/cespare/xxhash/v2/README.md

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

29 changes: 22 additions & 7 deletions gateway/vendor/github.com/cespare/xxhash/v2/xxhash.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion gateway/vendor/github.com/cespare/xxhash/v2/xxhash_asm.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion gateway/vendor/github.com/cespare/xxhash/v2/xxhash_safe.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 0 additions & 3 deletions gateway/vendor/github.com/golang/protobuf/AUTHORS

This file was deleted.

3 changes: 0 additions & 3 deletions gateway/vendor/github.com/golang/protobuf/CONTRIBUTORS

This file was deleted.

28 changes: 0 additions & 28 deletions gateway/vendor/github.com/golang/protobuf/LICENSE

This file was deleted.

Loading

0 comments on commit 3d28083

Please sign in to comment.