From d6adbb30688a4206eadb3d4d0fabc41cd6c4f109 Mon Sep 17 00:00:00 2001 From: Willy Kloucek Date: Mon, 11 Oct 2021 14:48:26 +0200 Subject: [PATCH] ugrade to GO 1.17 --- .bingo/bingo.mod | 2 +- .bingo/buf.mod | 2 +- .bingo/buildifier.mod | 2 +- .bingo/calens.mod | 2 +- .bingo/fileb0x.mod | 2 +- .bingo/flaex.mod | 2 +- .bingo/golangci-lint.mod | 2 +- .bingo/gox.mod | 2 +- .bingo/hugo.mod | 2 +- .bingo/mutagen.mod | 2 +- .bingo/protoc-gen-doc.mod | 2 +- .bingo/protoc-gen-go.mod | 2 +- .bingo/protoc-gen-micro.mod | 2 +- .bingo/protoc-gen-microweb.mod | 2 +- .bingo/protoc-gen-openapiv2.mod | 2 +- .bingo/reflex.mod | 2 +- .drone.star | 24 ++-- Dockerfile | 2 +- changelog/unreleased/go-1-17.md | 5 + docs/ocis/development/getting-started.md | 2 +- go.mod | 168 ++++++++++++++++++++++- ocis/docker/eos-ocis/Dockerfile | 2 +- 22 files changed, 203 insertions(+), 32 deletions(-) create mode 100644 changelog/unreleased/go-1-17.md diff --git a/.bingo/bingo.mod b/.bingo/bingo.mod index a40810276c..1bb8dad206 100644 --- a/.bingo/bingo.mod +++ b/.bingo/bingo.mod @@ -1,5 +1,5 @@ module _ // Auto generated by https://github.com/bwplotka/bingo. DO NOT EDIT -go 1.16 +go 1.17 require github.com/bwplotka/bingo v0.5.1 diff --git a/.bingo/buf.mod b/.bingo/buf.mod index 6bcedc262a..e275bb85fa 100644 --- a/.bingo/buf.mod +++ b/.bingo/buf.mod @@ -1,5 +1,5 @@ module _ // Auto generated by https://github.com/bwplotka/bingo. DO NOT EDIT -go 1.16 +go 1.17 require github.com/bufbuild/buf v0.56.0 // cmd/buf diff --git a/.bingo/buildifier.mod b/.bingo/buildifier.mod index 31bd3ef89a..f1f05fae96 100644 --- a/.bingo/buildifier.mod +++ b/.bingo/buildifier.mod @@ -1,5 +1,5 @@ module _ // Auto generated by https://github.com/bwplotka/bingo. DO NOT EDIT -go 1.16 +go 1.17 require github.com/bazelbuild/buildtools v0.0.0-20210920153738-d6daef01a1a2 // buildifier diff --git a/.bingo/calens.mod b/.bingo/calens.mod index 747cf21039..1016f15bb0 100644 --- a/.bingo/calens.mod +++ b/.bingo/calens.mod @@ -1,5 +1,5 @@ module _ // Auto generated by https://github.com/bwplotka/bingo. DO NOT EDIT -go 1.16 +go 1.17 require github.com/restic/calens v0.2.0 diff --git a/.bingo/fileb0x.mod b/.bingo/fileb0x.mod index 0e37513bbb..0f628e1fbd 100644 --- a/.bingo/fileb0x.mod +++ b/.bingo/fileb0x.mod @@ -1,5 +1,5 @@ module _ // Auto generated by https://github.com/bwplotka/bingo. DO NOT EDIT -go 1.16 +go 1.17 require github.com/UnnoTed/fileb0x v1.1.4 diff --git a/.bingo/flaex.mod b/.bingo/flaex.mod index 8bb486c4ef..2b3f2d4817 100644 --- a/.bingo/flaex.mod +++ b/.bingo/flaex.mod @@ -1,5 +1,5 @@ module _ // Auto generated by https://github.com/bwplotka/bingo. DO NOT EDIT -go 1.16 +go 1.17 require github.com/owncloud/flaex v0.2.1-0.20210701123229-9d7dceed124f diff --git a/.bingo/golangci-lint.mod b/.bingo/golangci-lint.mod index b8c188d7c8..00fae5647a 100644 --- a/.bingo/golangci-lint.mod +++ b/.bingo/golangci-lint.mod @@ -1,5 +1,5 @@ module _ // Auto generated by https://github.com/bwplotka/bingo. DO NOT EDIT -go 1.16 +go 1.17 require github.com/golangci/golangci-lint v1.42.1 // cmd/golangci-lint diff --git a/.bingo/gox.mod b/.bingo/gox.mod index ca2894387b..c48c4a9fa3 100644 --- a/.bingo/gox.mod +++ b/.bingo/gox.mod @@ -1,5 +1,5 @@ module _ // Auto generated by https://github.com/bwplotka/bingo. DO NOT EDIT -go 1.16 +go 1.17 require github.com/mitchellh/gox v1.0.1 diff --git a/.bingo/hugo.mod b/.bingo/hugo.mod index d6723b3672..ed6f3ba493 100644 --- a/.bingo/hugo.mod +++ b/.bingo/hugo.mod @@ -1,6 +1,6 @@ module _ // Auto generated by https://github.com/bwplotka/bingo. DO NOT EDIT -go 1.16 +go 1.17 replace github.com/markbates/inflect => github.com/markbates/inflect v0.0.0-20171215194931-a12c3aec81a6 diff --git a/.bingo/mutagen.mod b/.bingo/mutagen.mod index c7e746318a..caef7e6a47 100644 --- a/.bingo/mutagen.mod +++ b/.bingo/mutagen.mod @@ -1,5 +1,5 @@ module _ // Auto generated by https://github.com/bwplotka/bingo. DO NOT EDIT -go 1.16 +go 1.17 require github.com/mutagen-io/mutagen v0.11.8 // cmd/mutagen diff --git a/.bingo/protoc-gen-doc.mod b/.bingo/protoc-gen-doc.mod index 71ce1ab065..37f9686ab8 100644 --- a/.bingo/protoc-gen-doc.mod +++ b/.bingo/protoc-gen-doc.mod @@ -1,5 +1,5 @@ module _ // Auto generated by https://github.com/bwplotka/bingo. DO NOT EDIT -go 1.16 +go 1.17 require github.com/pseudomuto/protoc-gen-doc v1.5.0 // cmd/protoc-gen-doc diff --git a/.bingo/protoc-gen-go.mod b/.bingo/protoc-gen-go.mod index f03a949a78..b6d0aeefaa 100644 --- a/.bingo/protoc-gen-go.mod +++ b/.bingo/protoc-gen-go.mod @@ -1,5 +1,5 @@ module _ // Auto generated by https://github.com/bwplotka/bingo. DO NOT EDIT -go 1.16 +go 1.17 require google.golang.org/protobuf v1.27.1 // cmd/protoc-gen-go diff --git a/.bingo/protoc-gen-micro.mod b/.bingo/protoc-gen-micro.mod index 3e2dd99e2f..0d6cb3d4d6 100644 --- a/.bingo/protoc-gen-micro.mod +++ b/.bingo/protoc-gen-micro.mod @@ -1,5 +1,5 @@ module _ // Auto generated by https://github.com/bwplotka/bingo. DO NOT EDIT -go 1.16 +go 1.17 require github.com/asim/go-micro/cmd/protoc-gen-micro/v3 v3.0.0-20210924081004-8c39b1e1204d diff --git a/.bingo/protoc-gen-microweb.mod b/.bingo/protoc-gen-microweb.mod index d8dc729482..34ca83bbf5 100644 --- a/.bingo/protoc-gen-microweb.mod +++ b/.bingo/protoc-gen-microweb.mod @@ -1,5 +1,5 @@ module _ // Auto generated by https://github.com/bwplotka/bingo. DO NOT EDIT -go 1.16 +go 1.17 require github.com/owncloud/protoc-gen-microweb v0.0.0-20210824101557-828409dbfbf9 diff --git a/.bingo/protoc-gen-openapiv2.mod b/.bingo/protoc-gen-openapiv2.mod index 884e921720..67fe3ee875 100644 --- a/.bingo/protoc-gen-openapiv2.mod +++ b/.bingo/protoc-gen-openapiv2.mod @@ -1,5 +1,5 @@ module _ // Auto generated by https://github.com/bwplotka/bingo. DO NOT EDIT -go 1.16 +go 1.17 require github.com/grpc-ecosystem/grpc-gateway/v2 v2.6.0 // protoc-gen-openapiv2 diff --git a/.bingo/reflex.mod b/.bingo/reflex.mod index 928b66a8df..a75c28b44b 100644 --- a/.bingo/reflex.mod +++ b/.bingo/reflex.mod @@ -1,5 +1,5 @@ module _ // Auto generated by https://github.com/bwplotka/bingo. DO NOT EDIT -go 1.16 +go 1.17 require github.com/cespare/reflex v0.3.1 diff --git a/.drone.star b/.drone.star index 44432c8737..37019964a2 100644 --- a/.drone.star +++ b/.drone.star @@ -260,7 +260,7 @@ def testOcisModule(ctx, module): steps = makeGenerate(module) + [ { "name": "golangci-lint", - "image": "owncloudci/golang:1.16", + "image": "owncloudci/golang:1.17", "pull": "always", "commands": [ "mkdir -p cache/checkstyle", @@ -271,7 +271,7 @@ def testOcisModule(ctx, module): }, { "name": "test", - "image": "owncloudci/golang:1.16", + "image": "owncloudci/golang:1.17", "pull": "always", "commands": [ "mkdir -p cache/coverage", @@ -915,7 +915,7 @@ def dockerRelease(ctx, arch): "steps": makeGenerate("") + [ { "name": "build", - "image": "owncloudci/golang:1.16", + "image": "owncloudci/golang:1.17", "pull": "always", "commands": [ "make -C ocis release-linux-docker", @@ -1089,7 +1089,7 @@ def binaryRelease(ctx, name): "steps": makeGenerate("") + [ { "name": "build", - "image": "owncloudci/golang:1.16", + "image": "owncloudci/golang:1.17", "pull": "always", "commands": [ "make -C ocis release-%s" % (name), @@ -1097,7 +1097,7 @@ def binaryRelease(ctx, name): }, { "name": "finish", - "image": "owncloudci/golang:1.16", + "image": "owncloudci/golang:1.17", "pull": "always", "commands": [ "make -C ocis release-finish", @@ -1123,7 +1123,7 @@ def binaryRelease(ctx, name): }, { "name": "changelog", - "image": "owncloudci/golang:1.16", + "image": "owncloudci/golang:1.17", "pull": "always", "commands": [ "make changelog CHANGELOG_VERSION=%s" % ctx.build.ref.replace("refs/tags/v", "").split("-")[0], @@ -1259,7 +1259,7 @@ def changelog(ctx): "steps": [ { "name": "generate", - "image": "owncloudci/golang:1.16", + "image": "owncloudci/golang:1.17", "pull": "always", "commands": [ "make -C ocis changelog", @@ -1366,19 +1366,19 @@ def docs(ctx): "steps": [ { "name": "docs-generate", - "image": "owncloudci/golang:1.16", + "image": "owncloudci/golang:1.17", "commands": ["make -C %s docs-generate" % (module) for module in config["modules"]], }, { "name": "prepare", - "image": "owncloudci/golang:1.16", + "image": "owncloudci/golang:1.17", "commands": [ "make -C docs docs-copy", ], }, { "name": "test", - "image": "owncloudci/golang:1.16", + "image": "owncloudci/golang:1.17", "commands": [ "make -C docs test", ], @@ -1459,7 +1459,7 @@ def makeGenerate(module): }, { "name": "generate go", - "image": "owncloudci/golang:1.16", + "image": "owncloudci/golang:1.17", "pull": "always", "commands": [ "%s ci-go-generate" % (make), @@ -1598,7 +1598,7 @@ def build(): return [ { "name": "build", - "image": "owncloudci/golang:1.16", + "image": "owncloudci/golang:1.17", "pull": "always", "commands": [ "make -C ocis build", diff --git a/Dockerfile b/Dockerfile index 512d2aa3c1..5b3531133f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM owncloudci/golang:1.16 as build +FROM owncloudci/golang:1.17 as build COPY ./ /ocis/ diff --git a/changelog/unreleased/go-1-17.md b/changelog/unreleased/go-1-17.md new file mode 100644 index 0000000000..0d2e6f53e4 --- /dev/null +++ b/changelog/unreleased/go-1-17.md @@ -0,0 +1,5 @@ +Enhancement: Upgrade to GO 1.17 + +We've upgraded the used GO version from 1.16 to 1.17. + +https://github.com/owncloud/ocis/pull/2605 diff --git a/docs/ocis/development/getting-started.md b/docs/ocis/development/getting-started.md index f7bff54147..8fa756efb6 100644 --- a/docs/ocis/development/getting-started.md +++ b/docs/ocis/development/getting-started.md @@ -16,7 +16,7 @@ So we are trying to reflect this in the tooling. It should be kept simple and qu Besides standard development tools like git and a text editor, you need the following software for development: -- Go >= v1.16 ([install instructions](https://golang.org/doc/install)) +- Go >= v1.17 ([install instructions](https://golang.org/doc/install)) - Yarn ([install instructions](https://classic.yarnpkg.com/en/docs/install)) - docker ([install instructions](https://docs.docker.com/get-docker/)) - docker-compose ([install instructions](https://docs.docker.com/compose/install/)) diff --git a/go.mod b/go.mod index 07c461daf6..259b53702c 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/owncloud/ocis -go 1.16 +go 1.17 require ( github.com/CiscoM31/godata v1.0.4 @@ -75,5 +75,171 @@ require ( stash.kopano.io/kgol/rndm v1.1.1 ) +require ( + contrib.go.opencensus.io/exporter/prometheus v0.4.0 // indirect + github.com/Azure/go-ntlmssp v0.0.0-20200615164410-66371956d46c // indirect + github.com/Masterminds/goutils v1.1.1 // indirect + github.com/Masterminds/semver v1.5.0 // indirect + github.com/Masterminds/sprig v2.22.0+incompatible // indirect + github.com/Microsoft/go-winio v0.5.0 // indirect + github.com/ProtonMail/go-crypto v0.0.0-20210428141323-04723f9f07d7 // indirect + github.com/ReneKroon/ttlcache/v2 v2.8.1 // indirect + github.com/RoaringBitmap/roaring v0.7.3 // indirect + github.com/acomagu/bufpipe v1.0.3 // indirect + github.com/asaskevich/govalidator v0.0.0-20210307081110-f21760c49a8d // indirect + github.com/aws/aws-sdk-go v1.40.46 // indirect + github.com/beevik/etree v1.1.0 // indirect + github.com/beorn7/perks v1.0.1 // indirect + github.com/bitly/go-simplejson v0.5.0 // indirect + github.com/bits-and-blooms/bitset v1.2.0 // indirect + github.com/blevesearch/bleve_index_api v1.0.1 // indirect + github.com/blevesearch/go-porterstemmer v1.0.3 // indirect + github.com/blevesearch/mmap-go v1.0.2 // indirect + github.com/blevesearch/scorch_segment_api/v2 v2.0.1 // indirect + github.com/blevesearch/segment v0.9.0 // indirect + github.com/blevesearch/snowballstem v0.9.0 // indirect + github.com/blevesearch/upsidedown_store_api v1.0.1 // indirect + github.com/blevesearch/vellum v1.0.5 // indirect + github.com/blevesearch/zapx/v11 v11.2.2 // indirect + github.com/blevesearch/zapx/v12 v12.2.2 // indirect + github.com/blevesearch/zapx/v13 v13.2.2 // indirect + github.com/blevesearch/zapx/v14 v14.2.2 // indirect + github.com/blevesearch/zapx/v15 v15.2.2 // indirect + github.com/bluele/gcache v0.0.2 // indirect + github.com/bmizerany/pat v0.0.0-20170815010413-6226ea591a40 // indirect + github.com/boombuler/barcode v1.0.1 // indirect + github.com/cespare/xxhash/v2 v2.1.1 // indirect + github.com/coreos/go-oidc v2.2.1+incompatible // indirect + github.com/coreos/go-semver v0.3.0 // indirect + github.com/coreos/go-systemd/v22 v22.3.2 // indirect + github.com/cpuguy83/go-md2man/v2 v2.0.0 // indirect + github.com/crewjam/httperr v0.2.0 // indirect + github.com/crewjam/saml v0.4.3 // indirect + github.com/cubewise-code/go-mime v0.0.0-20200519001935-8c5762b177d8 // indirect + github.com/davecgh/go-spew v1.1.1 // indirect + github.com/deckarep/golang-set v1.7.1 // indirect + github.com/desertbit/timer v0.0.0-20180107155436-c41aec40b27f // indirect + github.com/dgrijalva/jwt-go v3.2.0+incompatible // indirect + github.com/dustin/go-humanize v1.0.0 // indirect + github.com/emirpasic/gods v1.12.0 // indirect + github.com/eternnoir/gncp v0.0.0-20170707042257-c70df2d0cd68 // indirect + github.com/fatih/color v1.9.0 // indirect + github.com/fsnotify/fsnotify v1.4.9 // indirect + github.com/gdexlab/go-render v1.0.1 // indirect + github.com/go-asn1-ber/asn1-ber v1.5.1 // indirect + github.com/go-git/gcfg v1.5.0 // indirect + github.com/go-git/go-billy/v5 v5.3.1 // indirect + github.com/go-git/go-git/v5 v5.4.2 // indirect + github.com/go-kit/log v0.1.0 // indirect + github.com/go-ldap/ldap/v3 v3.4.1 // indirect + github.com/go-logfmt/logfmt v0.5.0 // indirect + github.com/go-sql-driver/mysql v1.6.0 // indirect + github.com/go-task/slim-sprig v0.0.0-20210107165309-348f09dbbbc0 // indirect + github.com/gogo/protobuf v1.3.2 // indirect + github.com/golang-jwt/jwt v3.2.2+incompatible // indirect + github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect + github.com/golang/snappy v0.0.1 // indirect + github.com/gomodule/redigo v1.8.5 // indirect + github.com/google/go-cmp v0.5.6 // indirect + github.com/google/go-querystring v1.1.0 // indirect + github.com/google/uuid v1.3.0 // indirect + github.com/gorilla/schema v1.1.0 // indirect + github.com/grpc-ecosystem/go-grpc-middleware v1.3.0 // indirect + github.com/hashicorp/go-hclog v0.16.2 // indirect + github.com/hashicorp/go-plugin v1.4.3 // indirect + github.com/hashicorp/hcl v1.0.0 // indirect + github.com/hashicorp/yamux v0.0.0-20180604194846-3520598351bb // indirect + github.com/huandu/xstrings v1.3.2 // indirect + github.com/imdario/mergo v0.3.12 // indirect + github.com/inconshreveable/mousetrap v1.0.0 // indirect + github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 // indirect + github.com/jmespath/go-jmespath v0.4.0 // indirect + github.com/jonboulle/clockwork v0.2.1 // indirect + github.com/json-iterator/go v1.1.11 // indirect + github.com/kevinburke/ssh_config v0.0.0-20201106050909-4977a11b4351 // indirect + github.com/klauspost/cpuid v1.3.1 // indirect + github.com/longsleep/go-metrics v0.0.0-20191013204616-cddea569b0ea // indirect + github.com/magiconair/properties v1.8.5 // indirect + github.com/mattermost/xml-roundtrip-validator v0.0.0-20201213122252-bcd7e1b9601e // indirect + github.com/mattn/go-colorable v0.1.8 // indirect + github.com/mattn/go-isatty v0.0.12 // indirect + github.com/mattn/go-runewidth v0.0.9 // indirect + github.com/mattn/go-sqlite3 v1.14.8 // indirect + github.com/matttproud/golang_protobuf_extensions v1.0.1 // indirect + github.com/mendsley/gojwk v0.0.0-20141217222730-4d5ec6e58103 // indirect + github.com/miekg/dns v1.1.43 // indirect + github.com/mileusna/useragent v1.0.2 // indirect + github.com/minio/md5-simd v1.1.0 // indirect + github.com/minio/minio-go/v7 v7.0.14 // indirect + github.com/minio/sha256-simd v0.1.1 // indirect + github.com/mitchellh/copystructure v1.2.0 // indirect + github.com/mitchellh/go-homedir v1.1.0 // indirect + github.com/mitchellh/go-testing-interface v1.14.1 // indirect + github.com/mitchellh/hashstructure v1.1.0 // indirect + github.com/mitchellh/reflectwalk v1.0.2 // indirect + github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect + github.com/modern-go/reflect2 v1.0.1 // indirect + github.com/mschoch/smat v0.2.0 // indirect + github.com/nats-io/jwt v1.1.0 // indirect + github.com/nats-io/nats.go v1.10.0 // indirect + github.com/nats-io/nkeys v0.1.4 // indirect + github.com/nats-io/nuid v1.0.1 // indirect + github.com/nxadm/tail v1.4.8 // indirect + github.com/orcaman/concurrent-map v0.0.0-20190826125027-8c72a8bb44f6 // indirect + github.com/oxtoacart/bpool v0.0.0-20190530202638-03653db5a59c // indirect + github.com/patrickmn/go-cache v2.1.0+incompatible // indirect + github.com/pelletier/go-toml v1.9.3 // indirect + github.com/pkg/xattr v0.4.3 // indirect + github.com/pmezard/go-difflib v1.0.0 // indirect + github.com/pquerna/cachecontrol v0.1.0 // indirect + github.com/pquerna/otp v1.3.0 // indirect + github.com/prometheus/client_model v0.2.0 // indirect + github.com/prometheus/common v0.28.0 // indirect + github.com/prometheus/procfs v0.6.0 // indirect + github.com/prometheus/statsd_exporter v0.21.0 // indirect + github.com/rickb777/date v1.12.4 // indirect + github.com/rickb777/plural v1.2.0 // indirect + github.com/rs/cors v1.8.0 // indirect + github.com/rs/xid v1.3.0 // indirect + github.com/russellhaering/goxmldsig v1.1.0 // indirect + github.com/russross/blackfriday/v2 v2.0.1 // indirect + github.com/satori/go.uuid v1.2.0 // indirect + github.com/sciencemesh/meshdirectory-web v1.0.4 // indirect + github.com/sergi/go-diff v1.1.0 // indirect + github.com/sethvargo/go-password v0.2.0 // indirect + github.com/shurcooL/sanitized_anchor_name v1.0.0 // indirect + github.com/sony/gobreaker v0.4.1 // indirect + github.com/spf13/afero v1.6.0 // indirect + github.com/spf13/cast v1.3.1 // indirect + github.com/spf13/jwalterweatherman v1.1.0 // indirect + github.com/spf13/pflag v1.0.5 // indirect + github.com/steveyen/gtreap v0.1.0 // indirect + github.com/studio-b12/gowebdav v0.0.0-20210917133250-a3a86976a1df // indirect + github.com/subosito/gotenv v1.2.0 // indirect + github.com/tus/tusd v1.6.0 // indirect + github.com/xanzy/ssh-agent v0.3.0 // indirect + go.etcd.io/bbolt v1.3.5 // indirect + go.etcd.io/etcd/api/v3 v3.5.0 // indirect + go.etcd.io/etcd/client/pkg/v3 v3.5.0 // indirect + go.etcd.io/etcd/client/v3 v3.5.0 // indirect + go.uber.org/atomic v1.7.0 // indirect + go.uber.org/multierr v1.6.0 // indirect + go.uber.org/zap v1.17.0 // indirect + golang.org/x/sync v0.0.0-20210220032951-036812b2e83c // indirect + golang.org/x/sys v0.0.0-20210921065528-437939a70204 // indirect + golang.org/x/text v0.3.6 // indirect + golang.org/x/time v0.0.0-20210220033141-f8bda1e9f3ba // indirect + golang.org/x/tools v0.1.5 // indirect + google.golang.org/appengine v1.6.7 // indirect + gopkg.in/ini.v1 v1.62.0 // indirect + gopkg.in/square/go-jose.v2 v2.6.0 // indirect + gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect + gopkg.in/warnings.v0 v0.1.2 // indirect + gopkg.in/yaml.v2 v2.4.0 // indirect + gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect + stash.kopano.io/kgol/kcc-go/v5 v5.0.1 // indirect + stash.kopano.io/kgol/oidc-go v0.3.1 // indirect +) + // this is a transitive replace. See https://github.com/libregraph/lico/blob/master/go.mod#L38 replace github.com/crewjam/saml => github.com/crewjam/saml v0.4.5 diff --git a/ocis/docker/eos-ocis/Dockerfile b/ocis/docker/eos-ocis/Dockerfile index ea03b46142..693fbea1ea 100644 --- a/ocis/docker/eos-ocis/Dockerfile +++ b/ocis/docker/eos-ocis/Dockerfile @@ -9,7 +9,7 @@ RUN rpm --rebuilddb && yum -y install \ make \ gcc \ git -RUN wget -q https://dl.google.com/go/go1.16.2.linux-amd64.tar.gz +RUN wget -q https://dl.google.com/go/go1.17.2.linux-amd64.tar.gz RUN mkdir -p /usr/local/bin RUN tar xf go1.16.2.linux-amd64.tar.gz -C /usr/local RUN ln -s /usr/local/go/bin/* /usr/local/bin