Skip to content

Commit 29987f8

Browse files
Updated multiple dependencies + moved to go 1.22 (#5013)
* Updated multiple dependencies and use go 1.22.7 * Install make, as it is not included in alpine images --------- Co-authored-by: Jesse Geens <[email protected]>
1 parent 11dfcc3 commit 29987f8

File tree

7 files changed

+177
-132
lines changed

7 files changed

+177
-132
lines changed

changelog/unreleased/go-mod.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
Enhancement: updated dependencies + moved to go 1.22
2+
3+
https://github.com/cs3org/reva/pull/5013

docker/Dockerfile.reva

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
# granted to it by virtue of its status as an Intergovernmental Organization
1717
# or submit itself to any jurisdiction.
1818

19-
FROM golang:alpine3.17 as builder
19+
FROM golang:1.22-alpine3.21 as builder
2020

2121
RUN apk --no-cache add \
2222
ca-certificates \

docker/Dockerfile.revad

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
# granted to it by virtue of its status as an Intergovernmental Organization
1717
# or submit itself to any jurisdiction.
1818

19-
FROM golang:alpine3.17 as builder
19+
FROM golang:1.22-alpine3.21 as builder
2020

2121
WORKDIR /home/reva
2222
COPY . .
@@ -31,7 +31,7 @@ RUN apk add --no-cache gcc musl-dev
3131

3232
RUN go build -ldflags "-X main.gitCommit=$GIT_COMMIT -X main.version=$VERSION -X main.goVersion=`go version | awk '{print $3}'` -X main.buildDate=`date +%FT%T%z`" -o ./cmd/revad/revad ./cmd/revad/main
3333

34-
FROM alpine:3.16
34+
FROM alpine:3.21
3535

3636
COPY --from=builder /home/reva/cmd/revad/revad /usr/bin/revad
3737
RUN mkdir -p /etc/revad/ && touch /etc/revad/revad.toml

docker/Dockerfile.revad-ceph

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,12 +26,12 @@ RUN dnf update --nobest -y && dnf install -y \
2626
librbd-devel \
2727
librados-devel
2828

29-
ADD https://go.dev/dl/go1.22.2.linux-amd64.tar.gz \
30-
go1.22.2.linux-amd64.tar.gz
29+
ADD https://go.dev/dl/go1.22.7.linux-amd64.tar.gz \
30+
go1.22.7.linux-amd64.tar.gz
3131

3232
RUN rm -rf /usr/local/go && \
33-
tar -C /usr/local -xzf go1.22.2.linux-amd64.tar.gz && \
34-
rm go1.22.2.linux-amd64.tar.gz
33+
tar -C /usr/local -xzf go1.22.7.linux-amd64.tar.gz && \
34+
rm go1.22.7.linux-amd64.tar.gz
3535

3636
ENV PATH /go/bin:/usr/local/go/bin:$PATH
3737
ENV GOPATH /go

docker/Dockerfile.revad-eos

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
# granted to it by virtue of its status as an Intergovernmental Organization
1717
# or submit itself to any jurisdiction.
1818

19-
FROM golang:latest as builder
19+
FROM golang:1.22-alpine3.21 as builder
2020

2121
WORKDIR /home/reva
2222
COPY . .
@@ -27,6 +27,7 @@ ENV GIT_COMMIT=$GIT_COMMIT
2727
ENV VERSION=$VERSION
2828
ENV CGO_ENABLED 0
2929

30+
RUN apk add --no-cache make bash
3031
RUN make revad
3132

3233
FROM gitlab-registry.cern.ch/dss/eos/eos-all:5.2.14

go.mod

Lines changed: 40 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -4,26 +4,26 @@ require (
44
github.com/BurntSushi/toml v1.4.0
55
github.com/Masterminds/sprig v2.22.0+incompatible
66
github.com/ReneKroon/ttlcache/v2 v2.11.0
7-
github.com/beevik/etree v1.3.0
7+
github.com/beevik/etree v1.4.1
88
github.com/bluele/gcache v0.0.2
99
github.com/c-bata/go-prompt v0.2.6
1010
github.com/ceph/go-ceph v0.30.0
11-
github.com/cern-eos/go-eosgrpc v0.0.0-20240812132646-f105d2304f38
11+
github.com/cern-eos/go-eosgrpc v0.0.0-20240909164147-ad693be93181
1212
github.com/cheggaaa/pb v1.0.29
13-
github.com/coreos/go-oidc/v3 v3.9.0
14-
github.com/creasty/defaults v1.7.0
13+
github.com/coreos/go-oidc/v3 v3.11.0
14+
github.com/creasty/defaults v1.8.0
1515
github.com/cs3org/cato v0.0.0-20200828125504-e418fc54dd5e
16-
github.com/cs3org/go-cs3apis v0.0.0-20240802083356-d617314e1795
17-
github.com/dgraph-io/ristretto v0.1.1
16+
github.com/cs3org/go-cs3apis v0.0.0-20241105092511-3ad35d174fc1
17+
github.com/dgraph-io/ristretto v0.2.0
1818
github.com/dolthub/go-mysql-server v0.14.0
1919
github.com/gdexlab/go-render v1.0.1
2020
github.com/glpatcern/go-mime v0.0.0-20221026162842-2a8d71ad17a9
21-
github.com/go-chi/chi/v5 v5.1.0
22-
github.com/go-ldap/ldap/v3 v3.4.6
21+
github.com/go-chi/chi/v5 v5.2.0
22+
github.com/go-ldap/ldap/v3 v3.4.9
2323
github.com/go-playground/locales v0.14.1
2424
github.com/go-playground/universal-translator v0.18.1
25-
github.com/go-playground/validator/v10 v10.19.0
26-
github.com/go-sql-driver/mysql v1.8.0
25+
github.com/go-playground/validator/v10 v10.23.0
26+
github.com/go-sql-driver/mysql v1.8.1
2727
github.com/gofrs/uuid v4.4.0+incompatible
2828
github.com/golang-jwt/jwt v3.2.2+incompatible
2929
github.com/golang/protobuf v1.5.4
@@ -36,30 +36,30 @@ require (
3636
github.com/juliangruber/go-intersect v1.1.0
3737
github.com/mattn/go-sqlite3 v1.14.24
3838
github.com/maxymania/go-system v0.0.0-20170110133659-647cc364bf0b
39-
github.com/mileusna/useragent v1.3.4
39+
github.com/mileusna/useragent v1.3.5
4040
github.com/mitchellh/mapstructure v1.5.0
4141
github.com/nats-io/nats.go v1.37.0
4242
github.com/onsi/ginkgo v1.16.5
4343
github.com/onsi/gomega v1.30.0
4444
github.com/pkg/errors v0.9.1
45-
github.com/prometheus/client_golang v1.19.0
45+
github.com/prometheus/client_golang v1.20.5
4646
github.com/rs/cors v1.11.1
4747
github.com/rs/zerolog v1.33.0
48-
github.com/sethvargo/go-password v0.2.0
49-
github.com/stretchr/testify v1.9.0
48+
github.com/sethvargo/go-password v0.3.1
49+
github.com/stretchr/testify v1.10.0
5050
github.com/studio-b12/gowebdav v0.9.0
5151
github.com/thanhpk/randstr v1.0.6
5252
github.com/tus/tusd v1.13.0
5353
github.com/wk8/go-ordered-map v1.0.0
5454
go.opencensus.io v0.24.0
55-
go.step.sm/crypto v0.43.1
55+
go.step.sm/crypto v0.55.0
5656
golang.org/x/crypto v0.31.0
57-
golang.org/x/oauth2 v0.20.0
57+
golang.org/x/oauth2 v0.24.0
5858
golang.org/x/sync v0.10.0
5959
golang.org/x/sys v0.28.0
6060
golang.org/x/term v0.27.0
61-
google.golang.org/genproto v0.0.0-20240314234333-6e1732d8331c
62-
google.golang.org/grpc v1.65.0
61+
google.golang.org/genproto v0.0.0-20241209162323-e6fa225c2576
62+
google.golang.org/grpc v1.69.0
6363
google.golang.org/protobuf v1.35.2
6464
gotest.tools v2.2.0+incompatible
6565
)
@@ -79,56 +79,56 @@ require (
7979
github.com/dustin/go-humanize v1.0.1 // indirect
8080
github.com/fatih/color v1.16.0 // indirect
8181
github.com/fsnotify/fsnotify v1.4.9 // indirect
82-
github.com/gabriel-vasile/mimetype v1.4.3 // indirect
83-
github.com/go-asn1-ber/asn1-ber v1.5.5 // indirect
84-
github.com/go-jose/go-jose/v3 v3.0.3 // indirect
82+
github.com/gabriel-vasile/mimetype v1.4.7 // indirect
83+
github.com/go-asn1-ber/asn1-ber v1.5.7 // indirect
84+
github.com/go-jose/go-jose/v4 v4.0.4 // indirect
8585
github.com/go-kit/kit v0.10.0 // indirect
8686
github.com/go-openapi/errors v0.22.0 // indirect
8787
github.com/go-openapi/strfmt v0.23.0 // indirect
8888
github.com/gocraft/dbr/v2 v2.7.2 // indirect
89-
github.com/golang/glog v1.2.1 // indirect
9089
github.com/google/flatbuffers v2.0.8+incompatible // indirect
9190
github.com/google/go-cmp v0.6.0 // indirect
92-
github.com/grpc-ecosystem/go-grpc-middleware/v2 v2.1.0 // indirect
91+
github.com/grpc-ecosystem/go-grpc-middleware/v2 v2.2.0 // indirect
9392
github.com/hashicorp/golang-lru v1.0.2 // indirect
94-
github.com/huandu/xstrings v1.4.0 // indirect
93+
github.com/huandu/xstrings v1.5.0 // indirect
9594
github.com/imdario/mergo v0.3.16 // indirect
96-
github.com/klauspost/compress v1.17.7 // indirect
95+
github.com/klauspost/compress v1.17.11 // indirect
9796
github.com/leodido/go-urn v1.4.0 // indirect
9897
github.com/lestrrat-go/strftime v1.0.4 // indirect
9998
github.com/lib/pq v1.10.9 // indirect
10099
github.com/mattn/go-colorable v0.1.13 // indirect
101100
github.com/mattn/go-isatty v0.0.20 // indirect
102-
github.com/mattn/go-runewidth v0.0.15 // indirect
103-
github.com/mattn/go-tty v0.0.5 // indirect
101+
github.com/mattn/go-runewidth v0.0.16 // indirect
102+
github.com/mattn/go-tty v0.0.7 // indirect
104103
github.com/mitchellh/copystructure v1.2.0 // indirect
105104
github.com/mitchellh/hashstructure v1.1.0 // indirect
106105
github.com/mitchellh/reflectwalk v1.0.2 // indirect
107-
github.com/nats-io/nkeys v0.4.7 // indirect
106+
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
107+
github.com/nats-io/nkeys v0.4.9 // indirect
108108
github.com/nats-io/nuid v1.0.1 // indirect
109109
github.com/nxadm/tail v1.4.8 // indirect
110110
github.com/oklog/ulid v1.3.1 // indirect
111111
github.com/oliveagle/jsonpath v0.0.0-20180606110733-2e52cf6e6852 // indirect
112112
github.com/pkg/term v1.2.0-beta.2 // indirect
113113
github.com/pmezard/go-difflib v1.0.0 // indirect
114-
github.com/prometheus/client_model v0.6.0 // indirect
115-
github.com/prometheus/common v0.50.0 // indirect
116-
github.com/prometheus/procfs v0.13.0 // indirect
114+
github.com/prometheus/client_model v0.6.1 // indirect
115+
github.com/prometheus/common v0.61.0 // indirect
116+
github.com/prometheus/procfs v0.15.1 // indirect
117117
github.com/rivo/uniseg v0.4.7 // indirect
118-
github.com/shopspring/decimal v1.2.0 // indirect
118+
github.com/shopspring/decimal v1.4.0 // indirect
119119
github.com/sirupsen/logrus v1.9.3 // indirect
120120
github.com/stretchr/objx v0.5.2 // indirect
121-
go.mongodb.org/mongo-driver v1.14.0 // indirect
122-
go.opentelemetry.io/otel v1.23.1 // indirect
123-
go.opentelemetry.io/otel/trace v1.23.1 // indirect
124-
golang.org/x/mod v0.17.0 // indirect
125-
golang.org/x/net v0.25.0 // indirect
121+
go.mongodb.org/mongo-driver v1.17.1 // indirect
122+
go.opentelemetry.io/otel v1.31.0 // indirect
123+
go.opentelemetry.io/otel/trace v1.31.0 // indirect
124+
golang.org/x/mod v0.18.0 // indirect
125+
golang.org/x/net v0.32.0 // indirect
126126
golang.org/x/text v0.21.0 // indirect
127-
golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d // indirect
128-
google.golang.org/genproto/googleapis/rpc v0.0.0-20240528184218-531527333157 // indirect
127+
golang.org/x/tools v0.22.0 // indirect
128+
google.golang.org/genproto/googleapis/rpc v0.0.0-20241209162323-e6fa225c2576 // indirect
129129
gopkg.in/src-d/go-errors.v1 v1.0.0 // indirect
130130
gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect
131131
gopkg.in/yaml.v3 v3.0.1 // indirect
132132
)
133133

134-
go 1.21
134+
go 1.22.7

0 commit comments

Comments
 (0)