Skip to content

Commit

Permalink
Upgrade dependencies and Go docker images (#1153)
Browse files Browse the repository at this point in the history
  • Loading branch information
@sesposito
sesposito authored Dec 14, 2023
1 parent 9c13253 commit c8d7676
Show file tree
Hide file tree
Showing 723 changed files with 11,753 additions and 12,457 deletions.
2 changes: 1 addition & 1 deletion build/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
# docker build "$PWD" --build-arg commit="$(git rev-parse --short HEAD)" --build-arg version=v2.1.1 -t heroiclabs/nakama:2.1.1
# docker build "$PWD" --build-arg commit="$(git rev-parse --short HEAD)" --build-arg version="$(git rev-parse --short HEAD)" -t heroiclabs/nakama-prerelease:"$(git rev-parse --short HEAD)"

FROM golang:1.21.4-bookworm as builder
FROM golang:1.21.5-bookworm as builder

ARG commit
ARG version
Expand Down
2 changes: 1 addition & 1 deletion build/Dockerfile.arm64
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
# docker build "$PWD" --build-arg commit="$(git rev-parse --short HEAD)" --build-arg version=v2.1.1 -t heroiclabs/nakama:2.1.1
# docker build "$PWD" --build-arg commit="$(git rev-parse --short HEAD)" --build-arg version="$(git rev-parse --short HEAD)" -t heroiclabs/nakama-prerelease:"$(git rev-parse --short HEAD)"

FROM arm64v8/golang:1.21.4-bookworm as builder
FROM arm64v8/golang:1.21.5-bookworm as builder

ARG commit
ARG version
Expand Down
2 changes: 1 addition & 1 deletion build/Dockerfile.dsym
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
# docker build "$PWD" --build-arg commit="$(git rev-parse --short HEAD)" --build-arg version=v3.19.0 -t heroiclabs/nakama:3.19.0
# docker build "$PWD" --build-arg commit="$(git rev-parse --short HEAD)" --build-arg version="v3.19.0-$(git rev-parse --short HEAD)" -t heroiclabs/nakama-prerelease:"3.19.0-$(git rev-parse --short HEAD)"

FROM golang:1.21.4-bookworm as builder
FROM golang:1.21.5-bookworm as builder

ARG commit
ARG version
Expand Down
2 changes: 1 addition & 1 deletion build/Dockerfile.dsym.arm64
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
# docker build "$PWD" --build-arg commit="$(git rev-parse --short HEAD)" --build-arg version=v3.19.0 -t heroiclabs/nakama:3.19.0
# docker build "$PWD" --build-arg commit="$(git rev-parse --short HEAD)" --build-arg version="v3.19.0-$(git rev-parse --short HEAD)" -t heroiclabs/nakama-prerelease:"3.19.0-$(git rev-parse --short HEAD)"

FROM arm64v8/golang:1.21.4-bookworm as builder
FROM arm64v8/golang:1.21.5-bookworm as builder

ARG commit
ARG version
Expand Down
5 changes: 2 additions & 3 deletions build/Dockerfile.local
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,11 @@
## See the License for the specific language governing permissions and
## limitations under the License.

# docker build .. -f Dockerfile.local -t heroiclabs/nakama-dev
# docker build .. -f Dockerfile.local -t nakama:dev

FROM golang:1.21.4-bookworm as builder
FROM golang:1.21.5-bookworm as builder

ENV GOOS linux
ENV GOARCH amd64
ENV CGO_ENABLED 1

RUN apt-get update && \
Expand Down
7 changes: 3 additions & 4 deletions build/pluginbuilder/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,14 +12,13 @@
## See the License for the specific language governing permissions and
## limitations under the License.

# docker build "$PWD" --file ./Dockerfile.pluginbuilder --build-arg commit="$(git rev-parse --short HEAD)" --build-arg version=v2.1.1 -t heroiclabs/nakama-pluginbuilder:2.1.1
# docker build "$PWD" --file ./Dockerfile.pluginbuilder --build-arg commit="$(git rev-parse --short HEAD)" --build-arg version="v2.1.1-$(git rev-parse --short HEAD)" -t heroiclabs/nakama-prerelease:"2.1.1-$(git rev-parse --short HEAD)"
# docker build . --file ./Dockerfile --build-arg version=v2.1.1 -t heroiclabs/nakama-pluginbuilder:2.1.1
# docker build . --file ./Dockerfile --build-arg version="v2.1.1-$(git rev-parse --short HEAD)" -t heroiclabs/nakama-pluginbuilder:"2.1.1-$(git rev-parse --short HEAD)"

FROM golang:1.21.4-bookworm as builder
FROM golang:1.21.5-bookworm as builder

MAINTAINER Heroic Labs <[email protected]>

ARG commit
ARG version

LABEL version=$version
Expand Down
2 changes: 1 addition & 1 deletion build/pluginbuilder/Dockerfile.arm64
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
# docker build "$PWD" --file ./Dockerfile.pluginbuilder --build-arg commit="$(git rev-parse --short HEAD)" --build-arg version=v2.1.1 -t heroiclabs/nakama-pluginbuilder:2.1.1
# docker build "$PWD" --file ./Dockerfile.pluginbuilder --build-arg commit="$(git rev-parse --short HEAD)" --build-arg version="v2.1.1-$(git rev-parse --short HEAD)" -t heroiclabs/nakama-prerelease:"2.1.1-$(git rev-parse --short HEAD)"

FROM arm64v8/golang:1.21.4-bookworm as builder
FROM arm64v8/golang:1.21.5-bookworm as builder

MAINTAINER Heroic Labs <[email protected]>

Expand Down
58 changes: 28 additions & 30 deletions go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,43 +3,43 @@ module github.com/heroiclabs/nakama/v3
go 1.21

require (
github.com/bits-and-blooms/bitset v1.5.0
github.com/bits-and-blooms/bitset v1.12.0
github.com/blugelabs/bluge v0.2.2
github.com/blugelabs/bluge_segment_api v0.2.0
github.com/blugelabs/query_string v0.3.0
github.com/dop251/goja v0.0.0-20231014103939-873a1496dc8e
github.com/dop251/goja v0.0.0-20231027120936-b396bb4c349d
github.com/go-gorp/gorp/v3 v3.1.0
github.com/gofrs/uuid/v5 v5.0.0
github.com/golang-jwt/jwt/v4 v4.5.0
github.com/golang/snappy v0.0.4
github.com/gorilla/handlers v1.5.1
github.com/gorilla/mux v1.8.0
github.com/gorilla/websocket v1.5.0
github.com/grpc-ecosystem/grpc-gateway/v2 v2.16.0
github.com/gorilla/handlers v1.5.2
github.com/gorilla/mux v1.8.1
github.com/gorilla/websocket v1.5.1
github.com/grpc-ecosystem/grpc-gateway/v2 v2.18.1
github.com/heroiclabs/nakama-common v1.30.0
github.com/jackc/pgconn v1.14.0
github.com/jackc/pgconn v1.14.1
github.com/jackc/pgerrcode v0.0.0-20220416144525-469b46aa5efa
github.com/jackc/pgtype v1.14.0
github.com/jackc/pgx/v4 v4.18.1
github.com/prometheus/client_golang v1.16.0
github.com/rubenv/sql-migrate v1.2.0
github.com/prometheus/client_golang v1.17.0
github.com/rubenv/sql-migrate v1.5.2
github.com/stretchr/testify v1.8.4
github.com/twmb/murmur3 v1.1.8
github.com/uber-go/tally/v4 v4.1.7
github.com/uber-go/tally/v4 v4.1.10
go.uber.org/atomic v1.11.0
go.uber.org/zap v1.24.0
golang.org/x/crypto v0.11.0
golang.org/x/oauth2 v0.10.0
google.golang.org/genproto/googleapis/api v0.0.0-20230530153820-e85fd2cbaebc
google.golang.org/grpc v1.57.2
go.uber.org/zap v1.26.0
golang.org/x/crypto v0.16.0
golang.org/x/oauth2 v0.15.0
google.golang.org/genproto/googleapis/api v0.0.0-20231212172506-995d672761c0
google.golang.org/grpc v1.60.0
google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.3.0
google.golang.org/protobuf v1.31.0
gopkg.in/natefinch/lumberjack.v2 v2.0.0-20230206193814-4cb27fcfbb0f
gopkg.in/natefinch/lumberjack.v2 v2.2.1
gopkg.in/yaml.v3 v3.0.1
)

require (
cloud.google.com/go/compute v1.20.1 // indirect
cloud.google.com/go/compute v1.23.3 // indirect
cloud.google.com/go/compute/metadata v0.2.3 // indirect
github.com/RoaringBitmap/roaring v0.9.4 // indirect
github.com/axiomhq/hyperloglog v0.0.0-20191112132149-a4c4c47bc57f // indirect
Expand All @@ -56,10 +56,8 @@ require (
github.com/davecgh/go-spew v1.1.1 // indirect
github.com/dgryski/go-metro v0.0.0-20180109044635-280f6062b5bc // indirect
github.com/dlclark/regexp2 v1.7.0 // indirect
github.com/felixge/httpsnoop v1.0.1 // indirect
github.com/felixge/httpsnoop v1.0.3 // indirect
github.com/go-sourcemap/sourcemap v2.1.3+incompatible // indirect
github.com/gofrs/uuid v4.3.0+incompatible // indirect
github.com/golang/glog v1.1.0 // indirect
github.com/golang/protobuf v1.5.3 // indirect
github.com/google/pprof v0.0.0-20230207041349-798e818bf904 // indirect
github.com/jackc/chunkreader/v2 v2.0.1 // indirect
Expand All @@ -72,14 +70,14 @@ require (
github.com/mschoch/smat v0.2.0 // indirect
github.com/pkg/errors v0.9.1 // indirect
github.com/pmezard/go-difflib v1.0.0 // indirect
github.com/prometheus/client_model v0.3.0 // indirect
github.com/prometheus/common v0.42.0 // indirect
github.com/prometheus/procfs v0.10.1 // indirect
go.uber.org/multierr v1.6.0 // indirect
golang.org/x/net v0.12.0 // indirect
golang.org/x/sys v0.10.0 // indirect
golang.org/x/text v0.11.0 // indirect
google.golang.org/appengine v1.6.7 // indirect
google.golang.org/genproto v0.0.0-20230530153820-e85fd2cbaebc // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20230530153820-e85fd2cbaebc // indirect
github.com/prometheus/client_model v0.4.1-0.20230718164431-9a2bf3000d16 // indirect
github.com/prometheus/common v0.44.0 // indirect
github.com/prometheus/procfs v0.11.1 // indirect
go.uber.org/multierr v1.10.0 // indirect
golang.org/x/net v0.19.0 // indirect
golang.org/x/sys v0.15.0 // indirect
golang.org/x/text v0.14.0 // indirect
google.golang.org/appengine v1.6.8 // indirect
google.golang.org/genproto v0.0.0-20231211222908-989df2bf70f3 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20231211222908-989df2bf70f3 // indirect
)
Loading

0 comments on commit c8d7676

Please sign in to comment.