Skip to content

Commit b41403b

Browse files
committed
Update Go version, deps and Alpine
1 parent 3f14ac4 commit b41403b

File tree

5 files changed

+231
-391
lines changed

5 files changed

+231
-391
lines changed

.circleci/config.yml

+6-6
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,13 @@ version: 2
33
jobs:
44
test:
55
docker:
6-
- image: circleci/golang:1
6+
- image: cimg/go:1.18
77
steps:
8-
- checkout
9-
- run: make protos && git add --all && git diff --staged --exit-code
10-
- run: go test -v -race -cover ./...
11-
- run: go build -o ./bin/server ./cmd/proximo-server
12-
- run: go build -o ./bin/client ./cmd/proximo-client
8+
- checkout
9+
- run: make protos && git add --all && git diff --staged --exit-code
10+
- run: go test -v -race -cover ./...
11+
- run: go build -o ./bin/server ./cmd/proximo-server
12+
- run: go build -o ./bin/client ./cmd/proximo-client
1313

1414
workflows:
1515
version: 2

Dockerfile

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM golang:1.13-alpine AS build
1+
FROM golang:1.18-alpine AS build
22
RUN apk update && apk add make git gcc musl-dev
33
WORKDIR /proximo
44
ADD . /proximo/
@@ -7,7 +7,7 @@ RUN go get -v ./...
77
RUN CGO_ENABLED=0 go build -ldflags '-s -extldflags "-static"' -o /proximo-server ./cmd/proximo-server
88
RUN CGO_ENABLED=0 go build -ldflags '-s -extldflags "-static"' -o /proximo-client ./cmd/proximo-client
99

10-
FROM alpine:3.10
10+
FROM alpine:3.15
1111
RUN apk add --no-cache ca-certificates
1212
COPY --from=build /proximo-server /bin/proximo-server
1313
COPY --from=build /proximo-client /bin/proximo-client

Makefile

-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
21
install-tools:
32
go install \
43
google.golang.org/protobuf/cmd/protoc-gen-go \

go.mod

+64-12
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,72 @@
11
module github.com/uw-labs/proximo
22

3-
go 1.12
3+
go 1.18
44

55
require (
6-
github.com/bufbuild/buf v0.44.0
7-
github.com/grpc-ecosystem/go-grpc-middleware v1.2.0
8-
github.com/jawher/mow.cli v1.1.0
9-
github.com/nats-io/stan.go v0.5.0
6+
github.com/bufbuild/buf v1.3.1
7+
github.com/grpc-ecosystem/go-grpc-middleware v1.3.0
8+
github.com/jawher/mow.cli v1.2.0
9+
github.com/nats-io/stan.go v0.10.2
1010
github.com/pkg/errors v0.9.1
11-
github.com/stretchr/testify v1.7.0
12-
github.com/urfave/cli v1.22.2
13-
github.com/uw-labs/substrate v0.0.0-20200423155849-5805738940ec
11+
github.com/stretchr/testify v1.7.1
12+
github.com/urfave/cli v1.22.5
13+
github.com/uw-labs/substrate v0.0.0-20220401135905-9a99642d3f07
1414
github.com/uw-labs/sync v0.0.0-20190307114256-1bb306bf6e71
15-
golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9
16-
google.golang.org/grpc v1.40.0-dev.0.20210623211556-d9eb12feed7a
17-
google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.1.0
18-
google.golang.org/protobuf v1.27.1
15+
golang.org/x/crypto v0.0.0-20220411220226-7b82a4e95df4
16+
google.golang.org/grpc v1.45.0
17+
google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.2.0
18+
google.golang.org/protobuf v1.28.0
1919
gopkg.in/yaml.v2 v2.4.0
2020
)
21+
22+
require (
23+
github.com/Shopify/sarama v1.32.0 // indirect
24+
github.com/cpuguy83/go-md2man/v2 v2.0.1 // indirect
25+
github.com/davecgh/go-spew v1.1.1 // indirect
26+
github.com/eapache/go-resiliency v1.2.0 // indirect
27+
github.com/eapache/go-xerial-snappy v0.0.0-20180814174437-776d5712da21 // indirect
28+
github.com/eapache/queue v1.1.0 // indirect
29+
github.com/gofrs/flock v0.8.1 // indirect
30+
github.com/gofrs/uuid v4.2.0+incompatible // indirect
31+
github.com/gogo/protobuf v1.3.2 // indirect
32+
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
33+
github.com/golang/protobuf v1.5.2 // indirect
34+
github.com/golang/snappy v0.0.4 // indirect
35+
github.com/hashicorp/errwrap v1.1.0 // indirect
36+
github.com/hashicorp/go-multierror v1.1.1 // indirect
37+
github.com/hashicorp/go-uuid v1.0.3 // indirect
38+
github.com/inconshreveable/mousetrap v1.0.0 // indirect
39+
github.com/jcmturner/aescts/v2 v2.0.0 // indirect
40+
github.com/jcmturner/dnsutils/v2 v2.0.0 // indirect
41+
github.com/jcmturner/gofork v1.0.0 // indirect
42+
github.com/jcmturner/gokrb5/v8 v8.4.2 // indirect
43+
github.com/jcmturner/rpc/v2 v2.0.3 // indirect
44+
github.com/jdxcode/netrc v0.0.0-20210204082910-926c7f70242a // indirect
45+
github.com/jhump/protocompile v0.0.0-20220216033700-d705409f108f // indirect
46+
github.com/jhump/protoreflect v1.12.0 // indirect
47+
github.com/klauspost/compress v1.15.1 // indirect
48+
github.com/klauspost/pgzip v1.2.5 // indirect
49+
github.com/nats-io/jwt v1.2.2 // indirect
50+
github.com/nats-io/nats.go v1.14.0 // indirect
51+
github.com/nats-io/nkeys v0.3.0 // indirect
52+
github.com/nats-io/nuid v1.0.1 // indirect
53+
github.com/pierrec/lz4 v2.6.1+incompatible // indirect
54+
github.com/pkg/browser v0.0.0-20210911075715-681adbf594b8 // indirect
55+
github.com/pkg/profile v1.6.0 // indirect
56+
github.com/pmezard/go-difflib v1.0.0 // indirect
57+
github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475 // indirect
58+
github.com/russross/blackfriday/v2 v2.1.0 // indirect
59+
github.com/spf13/cobra v1.4.0 // indirect
60+
github.com/spf13/pflag v1.0.5 // indirect
61+
go.opencensus.io v0.23.0 // indirect
62+
go.uber.org/atomic v1.9.0 // indirect
63+
go.uber.org/multierr v1.8.0 // indirect
64+
go.uber.org/zap v1.21.0 // indirect
65+
golang.org/x/net v0.0.0-20220412020605-290c469a71a5 // indirect
66+
golang.org/x/sync v0.0.0-20210220032951-036812b2e83c // indirect
67+
golang.org/x/sys v0.0.0-20220412211240-33da011f77ad // indirect
68+
golang.org/x/term v0.0.0-20220411215600-e5f449aeb171 // indirect
69+
golang.org/x/text v0.3.7 // indirect
70+
google.golang.org/genproto v0.0.0-20220413183235-5e96e2839df9 // indirect
71+
gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect
72+
)

0 commit comments

Comments
 (0)