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.

Sign up for GitHub

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

Jump to bottom

update various dependencies #3069

Merged
merged 10 commits into from
Nov 24, 2022
Merged

update various dependencies #3069

merged 10 commits into from
Nov 24, 2022

Conversation

thaJeztah
Copy link
Member

let's pick a smaller subset first from #3068

@thaJeztah thaJeztah mentioned this pull request Jul 25, 2022
Merged
2 tasks
@thaJeztah
Copy link
Member Author

still failing 😞 - let's remove some more

go: downloading github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e
cp: cannot stat '/home/circleci/.go_workspace:/usr/local/go_workspace/pkg/mod/github.com/gogo/[email protected]/protobuf': No such file or directory
make: *** [direct.mk:146: go-mod-vendor] Error 1

@thaJeztah thaJeztah force-pushed the update_docker_step1 branch 2 times, most recently from bad83f2 to b7a90dc Compare July 25, 2022 15:57
@thaJeztah
Copy link
Member Author

Argh.. still

Perhaps it's the go mod tidy that I added?

@thaJeztah
Copy link
Member Author

Hmm... not it; perhaps the buster -> bullseye update?

@thaJeztah
Copy link
Member Author

Ah, that doesn't make sense, because CI is not using the Dockerfile?

@thaJeztah
vendor: github.com/Microsoft/go-winio v0.5.2
00d4d33 
to match the version used in moby

Signed-off-by: Sebastiaan van Stijn <[email protected]>
@thaJeztah
vendor: github.com/docker/libkv v0.2.2-0.20211217103745-e480589147e3
33ff8f2 
to match the version used in moby, and to get rid of the (unmaintained)
github.com/boltdb/bolt v1.3.1 indirect dependency.

Signed-off-by: Sebastiaan van Stijn <[email protected]>
@thaJeztah
vendor: github.com/stretchr/testify v1.8.0, gopkg.in/yaml.v3 v3.0.1
2ce2e56 
This updates the indirect gopkg.in/yaml.v3 dependency to v3.0.1, which
contains a fix for a CVE.

Signed-off-by: Sebastiaan van Stijn <[email protected]>
@thaJeztah thaJeztah changed the title update go 1.18, update various dependencies update various dependencies Nov 24, 2022
@thaJeztah thaJeztah marked this pull request as ready for review November 24, 2022 15:35
@thaJeztah
vendor: github.com/hashicorp/go-immutable-radix v1.3.1
c32140f 
to match the version used in moby

Signed-off-by: Sebastiaan van Stijn <[email protected]>
@thaJeztah
vendor: github.com/fsnotify/fsnotify v1.5.1
a95c651 
to match the version used in moby

Signed-off-by: Sebastiaan van Stijn <[email protected]>
@thaJeztah
vendor: github.com/docker/distribution v2.8.1
d208199 
to match the version used in moby

Signed-off-by: Sebastiaan van Stijn <[email protected]>
@thaJeztah
vendor: github.com/phayes/permbits v0.0.0-20190612203442-39d7c581d2ee
5373ad1 
to match the version used in moby

Signed-off-by: Sebastiaan van Stijn <[email protected]>
@thaJeztah
go.mod: github.com/matttproud/golang_protobuf_extensions v1.0.2
3b7a5e6 
same commit, but now tagged

Signed-off-by: Sebastiaan van Stijn <[email protected]>
@thaJeztah
vendor: github.com/moby/term v0.0.0-20221120202655-abb19827d345
3223d7a 
no significant changes in vendored code, other than updating build-tags
for go1.17, but removes some dependencies from the module, which can
help with future updates;

full diff: moby/term@3f7ff69...abb1982

Signed-off-by: Sebastiaan van Stijn <[email protected]>
@thaJeztah
go.mod: gotest.tools/v3 v3.4.0
36cd13c 
Signed-off-by: Sebastiaan van Stijn <[email protected]>
@thaJeztah
Copy link
Member Author

Looks like the rexray fork needs to be updated if we want to update CSI to v1.5.0;

vendor/github.com/rexray/gocsi/mock/service/service.go:54:9: cannot use s (variable of type *service) as type Service in return statement:
	*service does not implement Service (missing ControllerGetVolume method)

@thaJeztah
Copy link
Member Author

Thx!

@thaJeztah thaJeztah merged commit 294d56e into moby:master Nov 24, 2022
@thaJeztah thaJeztah deleted the update_docker_step1 branch November 24, 2022 16:40
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@vvoland vvoland vvoland approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@thaJeztah @vvoland