Skip to content

Commit b9dff73

Browse files
authored
Merge pull request linkedin#780 from linkedin/go
Update Golang to 1.20.4
2 parents b4622d8 + df9f539 commit b9dff73

File tree

5 files changed

+67
-71
lines changed

5 files changed

+67
-71
lines changed

Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# stage 1: builder
2-
FROM golang:1.20.1-alpine as builder
2+
FROM golang:1.20.4-alpine as builder
33

44
ENV BURROW_SRC /usr/src/Burrow/
55

@@ -10,7 +10,7 @@ WORKDIR $BURROW_SRC
1010
RUN go mod tidy && go build -o /tmp/burrow .
1111

1212
# stage 2: runner
13-
FROM alpine:3.15
13+
FROM alpine:3.18
1414

1515
LABEL maintainer="LinkedIn Burrow https://github.com/linkedin/Burrow"
1616

Dockerfile.gorelease

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM alpine:3.15
1+
FROM alpine:3.18
22
LABEL maintainer="LinkedIn Burrow https://github.com/linkedin/Burrow"
33

44
WORKDIR /app

core/internal/storage/inmemory.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ package storage
1111

1212
import (
1313
"container/ring"
14-
"github.com/linkedin/Burrow/core/internal/httpserver"
1514
"math/rand"
1615
"regexp"
1716
"sync"
@@ -21,6 +20,7 @@ import (
2120
"github.com/spf13/viper"
2221
"go.uber.org/zap"
2322

23+
"github.com/linkedin/Burrow/core/internal/httpserver"
2424
"github.com/linkedin/Burrow/core/protocol"
2525
)
2626

go.mod

Lines changed: 18 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,10 @@ require (
99
github.com/karrick/goswarm v1.10.0
1010
github.com/pborman/uuid v1.2.1
1111
github.com/pkg/errors v0.9.1
12-
github.com/prometheus/client_golang v1.14.0
12+
github.com/prometheus/client_golang v1.15.1
1313
github.com/samuel/go-zookeeper v0.0.0-20201211165307-7117e9ea2414
14-
github.com/spf13/viper v1.15.0
15-
github.com/stretchr/testify v1.8.2
14+
github.com/spf13/viper v1.16.0
15+
github.com/stretchr/testify v1.8.4
1616
github.com/xdg/scram v1.0.5
1717
go.uber.org/zap v1.24.0
1818
gopkg.in/gomail.v2 v2.0.0-20160411212932-81ebce5c23df
@@ -27,7 +27,7 @@ require (
2727
github.com/eapache/go-xerial-snappy v0.0.0-20230111030713-bf00bc1b83b6 // indirect
2828
github.com/eapache/queue v1.1.0 // indirect
2929
github.com/fsnotify/fsnotify v1.6.0 // indirect
30-
github.com/golang/protobuf v1.5.2 // indirect
30+
github.com/golang/protobuf v1.5.3 // indirect
3131
github.com/golang/snappy v0.0.4 // indirect
3232
github.com/google/uuid v1.3.0 // indirect
3333
github.com/hashicorp/errwrap v1.1.0 // indirect
@@ -39,34 +39,31 @@ require (
3939
github.com/jcmturner/gofork v1.7.6 // indirect
4040
github.com/jcmturner/gokrb5/v8 v8.4.4 // indirect
4141
github.com/jcmturner/rpc/v2 v2.0.3 // indirect
42-
github.com/json-iterator/go v1.1.12 // indirect
43-
github.com/klauspost/compress v1.16.0 // indirect
42+
github.com/klauspost/compress v1.16.5 // indirect
4443
github.com/magiconair/properties v1.8.7 // indirect
4544
github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
4645
github.com/mitchellh/mapstructure v1.5.0 // indirect
47-
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
48-
github.com/modern-go/reflect2 v1.0.2 // indirect
49-
github.com/pelletier/go-toml/v2 v2.0.6 // indirect
46+
github.com/pelletier/go-toml/v2 v2.0.8 // indirect
5047
github.com/pierrec/lz4/v4 v4.1.17 // indirect
5148
github.com/pmezard/go-difflib v1.0.0 // indirect
52-
github.com/prometheus/client_model v0.3.0 // indirect
53-
github.com/prometheus/common v0.40.0 // indirect
54-
github.com/prometheus/procfs v0.9.0 // indirect
49+
github.com/prometheus/client_model v0.4.0 // indirect
50+
github.com/prometheus/common v0.44.0 // indirect
51+
github.com/prometheus/procfs v0.10.1 // indirect
5552
github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475 // indirect
56-
github.com/spf13/afero v1.9.4 // indirect
57-
github.com/spf13/cast v1.5.0 // indirect
53+
github.com/spf13/afero v1.9.5 // indirect
54+
github.com/spf13/cast v1.5.1 // indirect
5855
github.com/spf13/jwalterweatherman v1.1.0 // indirect
5956
github.com/spf13/pflag v1.0.5 // indirect
6057
github.com/stretchr/objx v0.5.0 // indirect
6158
github.com/subosito/gotenv v1.4.2 // indirect
6259
github.com/xdg/stringprep v1.0.3 // indirect
63-
go.uber.org/atomic v1.10.0 // indirect
64-
go.uber.org/multierr v1.9.0 // indirect
65-
golang.org/x/crypto v0.6.0 // indirect
66-
golang.org/x/net v0.7.0 // indirect
67-
golang.org/x/sys v0.5.0 // indirect
68-
golang.org/x/text v0.7.0 // indirect
69-
google.golang.org/protobuf v1.28.1 // indirect
60+
go.uber.org/atomic v1.11.0 // indirect
61+
go.uber.org/multierr v1.11.0 // indirect
62+
golang.org/x/crypto v0.9.0 // indirect
63+
golang.org/x/net v0.10.0 // indirect
64+
golang.org/x/sys v0.8.0 // indirect
65+
golang.org/x/text v0.9.0 // indirect
66+
google.golang.org/protobuf v1.30.0 // indirect
7067
gopkg.in/alexcesaro/quotedprintable.v3 v3.0.0-20150716171945-2caba252f4dc // indirect
7168
gopkg.in/ini.v1 v1.67.0 // indirect
7269
gopkg.in/yaml.v3 v3.0.1 // indirect

0 commit comments

Comments
 (0)