Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Updated multiple dependencies + moved to go 1.22 #5013

Merged
merged 2 commits into from
Jan 6, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions changelog/unreleased/go-mod.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
Enhancement: updated dependencies + moved to go 1.22

https://github.com/cs3org/reva/pull/5013
2 changes: 1 addition & 1 deletion docker/Dockerfile.reva
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
# granted to it by virtue of its status as an Intergovernmental Organization
# or submit itself to any jurisdiction.

FROM golang:alpine3.17 as builder
FROM golang:1.22-alpine3.21 as builder

RUN apk --no-cache add \
ca-certificates \
Expand Down
4 changes: 2 additions & 2 deletions docker/Dockerfile.revad
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
# granted to it by virtue of its status as an Intergovernmental Organization
# or submit itself to any jurisdiction.

FROM golang:alpine3.17 as builder
FROM golang:1.22-alpine3.21 as builder

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

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

FROM alpine:3.16
FROM alpine:3.21

COPY --from=builder /home/reva/cmd/revad/revad /usr/bin/revad
RUN mkdir -p /etc/revad/ && touch /etc/revad/revad.toml
Expand Down
8 changes: 4 additions & 4 deletions docker/Dockerfile.revad-ceph
Original file line number Diff line number Diff line change
Expand Up @@ -26,12 +26,12 @@ RUN dnf update --nobest -y && dnf install -y \
librbd-devel \
librados-devel

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

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

ENV PATH /go/bin:/usr/local/go/bin:$PATH
ENV GOPATH /go
Expand Down
3 changes: 2 additions & 1 deletion docker/Dockerfile.revad-eos
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
# granted to it by virtue of its status as an Intergovernmental Organization
# or submit itself to any jurisdiction.

FROM golang:latest as builder
FROM golang:1.22-alpine3.21 as builder

WORKDIR /home/reva
COPY . .
Expand All @@ -27,6 +27,7 @@ ENV GIT_COMMIT=$GIT_COMMIT
ENV VERSION=$VERSION
ENV CGO_ENABLED 0

RUN apk add --no-cache make bash
RUN make revad

FROM gitlab-registry.cern.ch/dss/eos/eos-all:5.2.14
Expand Down
80 changes: 40 additions & 40 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -4,26 +4,26 @@ require (
github.com/BurntSushi/toml v1.4.0
github.com/Masterminds/sprig v2.22.0+incompatible
github.com/ReneKroon/ttlcache/v2 v2.11.0
github.com/beevik/etree v1.3.0
github.com/beevik/etree v1.4.1
github.com/bluele/gcache v0.0.2
github.com/c-bata/go-prompt v0.2.6
github.com/ceph/go-ceph v0.30.0
github.com/cern-eos/go-eosgrpc v0.0.0-20240812132646-f105d2304f38
github.com/cern-eos/go-eosgrpc v0.0.0-20240909164147-ad693be93181
github.com/cheggaaa/pb v1.0.29
github.com/coreos/go-oidc/v3 v3.9.0
github.com/creasty/defaults v1.7.0
github.com/coreos/go-oidc/v3 v3.11.0
github.com/creasty/defaults v1.8.0
github.com/cs3org/cato v0.0.0-20200828125504-e418fc54dd5e
github.com/cs3org/go-cs3apis v0.0.0-20240802083356-d617314e1795
github.com/dgraph-io/ristretto v0.1.1
github.com/cs3org/go-cs3apis v0.0.0-20241105092511-3ad35d174fc1
github.com/dgraph-io/ristretto v0.2.0
github.com/dolthub/go-mysql-server v0.14.0
github.com/gdexlab/go-render v1.0.1
github.com/glpatcern/go-mime v0.0.0-20221026162842-2a8d71ad17a9
github.com/go-chi/chi/v5 v5.1.0
github.com/go-ldap/ldap/v3 v3.4.6
github.com/go-chi/chi/v5 v5.2.0
github.com/go-ldap/ldap/v3 v3.4.9
github.com/go-playground/locales v0.14.1
github.com/go-playground/universal-translator v0.18.1
github.com/go-playground/validator/v10 v10.19.0
github.com/go-sql-driver/mysql v1.8.0
github.com/go-playground/validator/v10 v10.23.0
github.com/go-sql-driver/mysql v1.8.1
github.com/gofrs/uuid v4.4.0+incompatible
github.com/golang-jwt/jwt v3.2.2+incompatible
github.com/golang/protobuf v1.5.4
Expand All @@ -36,30 +36,30 @@ require (
github.com/juliangruber/go-intersect v1.1.0
github.com/mattn/go-sqlite3 v1.14.24
github.com/maxymania/go-system v0.0.0-20170110133659-647cc364bf0b
github.com/mileusna/useragent v1.3.4
github.com/mileusna/useragent v1.3.5
github.com/mitchellh/mapstructure v1.5.0
github.com/nats-io/nats.go v1.37.0
github.com/onsi/ginkgo v1.16.5
github.com/onsi/gomega v1.30.0
github.com/pkg/errors v0.9.1
github.com/prometheus/client_golang v1.19.0
github.com/prometheus/client_golang v1.20.5
github.com/rs/cors v1.11.1
github.com/rs/zerolog v1.33.0
github.com/sethvargo/go-password v0.2.0
github.com/stretchr/testify v1.9.0
github.com/sethvargo/go-password v0.3.1
github.com/stretchr/testify v1.10.0
github.com/studio-b12/gowebdav v0.9.0
github.com/thanhpk/randstr v1.0.6
github.com/tus/tusd v1.13.0
github.com/wk8/go-ordered-map v1.0.0
go.opencensus.io v0.24.0
go.step.sm/crypto v0.43.1
go.step.sm/crypto v0.55.0
golang.org/x/crypto v0.31.0
golang.org/x/oauth2 v0.20.0
golang.org/x/oauth2 v0.24.0
golang.org/x/sync v0.10.0
golang.org/x/sys v0.28.0
golang.org/x/term v0.27.0
google.golang.org/genproto v0.0.0-20240314234333-6e1732d8331c
google.golang.org/grpc v1.65.0
google.golang.org/genproto v0.0.0-20241209162323-e6fa225c2576
google.golang.org/grpc v1.69.0
google.golang.org/protobuf v1.35.2
gotest.tools v2.2.0+incompatible
)
Expand All @@ -79,56 +79,56 @@ require (
github.com/dustin/go-humanize v1.0.1 // indirect
github.com/fatih/color v1.16.0 // indirect
github.com/fsnotify/fsnotify v1.4.9 // indirect
github.com/gabriel-vasile/mimetype v1.4.3 // indirect
github.com/go-asn1-ber/asn1-ber v1.5.5 // indirect
github.com/go-jose/go-jose/v3 v3.0.3 // indirect
github.com/gabriel-vasile/mimetype v1.4.7 // indirect
github.com/go-asn1-ber/asn1-ber v1.5.7 // indirect
github.com/go-jose/go-jose/v4 v4.0.4 // indirect
github.com/go-kit/kit v0.10.0 // indirect
github.com/go-openapi/errors v0.22.0 // indirect
github.com/go-openapi/strfmt v0.23.0 // indirect
github.com/gocraft/dbr/v2 v2.7.2 // indirect
github.com/golang/glog v1.2.1 // indirect
github.com/google/flatbuffers v2.0.8+incompatible // indirect
github.com/google/go-cmp v0.6.0 // indirect
github.com/grpc-ecosystem/go-grpc-middleware/v2 v2.1.0 // indirect
github.com/grpc-ecosystem/go-grpc-middleware/v2 v2.2.0 // indirect
github.com/hashicorp/golang-lru v1.0.2 // indirect
github.com/huandu/xstrings v1.4.0 // indirect
github.com/huandu/xstrings v1.5.0 // indirect
github.com/imdario/mergo v0.3.16 // indirect
github.com/klauspost/compress v1.17.7 // indirect
github.com/klauspost/compress v1.17.11 // indirect
github.com/leodido/go-urn v1.4.0 // indirect
github.com/lestrrat-go/strftime v1.0.4 // indirect
github.com/lib/pq v1.10.9 // indirect
github.com/mattn/go-colorable v0.1.13 // indirect
github.com/mattn/go-isatty v0.0.20 // indirect
github.com/mattn/go-runewidth v0.0.15 // indirect
github.com/mattn/go-tty v0.0.5 // indirect
github.com/mattn/go-runewidth v0.0.16 // indirect
github.com/mattn/go-tty v0.0.7 // indirect
github.com/mitchellh/copystructure v1.2.0 // indirect
github.com/mitchellh/hashstructure v1.1.0 // indirect
github.com/mitchellh/reflectwalk v1.0.2 // indirect
github.com/nats-io/nkeys v0.4.7 // indirect
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
github.com/nats-io/nkeys v0.4.9 // indirect
github.com/nats-io/nuid v1.0.1 // indirect
github.com/nxadm/tail v1.4.8 // indirect
github.com/oklog/ulid v1.3.1 // indirect
github.com/oliveagle/jsonpath v0.0.0-20180606110733-2e52cf6e6852 // indirect
github.com/pkg/term v1.2.0-beta.2 // indirect
github.com/pmezard/go-difflib v1.0.0 // indirect
github.com/prometheus/client_model v0.6.0 // indirect
github.com/prometheus/common v0.50.0 // indirect
github.com/prometheus/procfs v0.13.0 // indirect
github.com/prometheus/client_model v0.6.1 // indirect
github.com/prometheus/common v0.61.0 // indirect
github.com/prometheus/procfs v0.15.1 // indirect
github.com/rivo/uniseg v0.4.7 // indirect
github.com/shopspring/decimal v1.2.0 // indirect
github.com/shopspring/decimal v1.4.0 // indirect
github.com/sirupsen/logrus v1.9.3 // indirect
github.com/stretchr/objx v0.5.2 // indirect
go.mongodb.org/mongo-driver v1.14.0 // indirect
go.opentelemetry.io/otel v1.23.1 // indirect
go.opentelemetry.io/otel/trace v1.23.1 // indirect
golang.org/x/mod v0.17.0 // indirect
golang.org/x/net v0.25.0 // indirect
go.mongodb.org/mongo-driver v1.17.1 // indirect
go.opentelemetry.io/otel v1.31.0 // indirect
go.opentelemetry.io/otel/trace v1.31.0 // indirect
golang.org/x/mod v0.18.0 // indirect
golang.org/x/net v0.32.0 // indirect
golang.org/x/text v0.21.0 // indirect
golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20240528184218-531527333157 // indirect
golang.org/x/tools v0.22.0 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20241209162323-e6fa225c2576 // indirect
gopkg.in/src-d/go-errors.v1 v1.0.0 // indirect
gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
)

go 1.21
go 1.22.7
Loading