Skip to content

Conversation

@dims
Copy link
Member

@dims dims commented Oct 13, 2020

Initial attempt was to update to v19.03.13 docker. But ended up in trouble because of conflicting dependencies. So updated to latest moby/moby instead:
moby/moby@4634ce6...9c15e82

Needed to bring in newer golang.org/x/sys because of:
moby/moby@c3a0a37

Signed-off-by: Davanum Srinivas [email protected]

@theopenlab-ci
Copy link

theopenlab-ci bot commented Oct 13, 2020

Build succeeded.

@dims dims force-pushed the bump-to-newer-docker-tag branch from 37c0c59 to 16a64c7 Compare October 13, 2020 11:23
@theopenlab-ci
Copy link

theopenlab-ci bot commented Oct 13, 2020

Build succeeded.

@dims dims force-pushed the bump-to-newer-docker-tag branch from 16a64c7 to b68fafe Compare October 13, 2020 12:03
@theopenlab-ci
Copy link

theopenlab-ci bot commented Oct 13, 2020

Build succeeded.

@dims dims force-pushed the bump-to-newer-docker-tag branch from b68fafe to a07c999 Compare October 13, 2020 12:19
@theopenlab-ci
Copy link

theopenlab-ci bot commented Oct 13, 2020

Build succeeded.

Signed-off-by: Davanum Srinivas <[email protected]>
@dims dims force-pushed the bump-to-newer-docker-tag branch from a07c999 to 4044ca9 Compare October 13, 2020 14:37
@theopenlab-ci
Copy link

theopenlab-ci bot commented Oct 13, 2020

Build succeeded.

@theopenlab-ci
Copy link

theopenlab-ci bot commented Oct 13, 2020

Build succeeded.

Copy link
Member

@mikebrow mikebrow left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@dims dims changed the title [WIP] Updating to docker v19.03.13 Updating to latest docker Oct 13, 2020
# cri dependencies
github.com/davecgh/go-spew v1.1.1
github.com/docker/docker 4634ce647cf2ce2c6031129ccd109e557244986f
github.com/docker/docker 9c15e82f19b0ad3c5fe8617a8ec2dddc6639f40a
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks like the updated docker vendor does not bring in any changes; was there a specific need to update?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

the SHA was older than the one in k/k, so was trying to update to newer one. am ok to leave this as-is.

i had to jump between versions of containerd/console x/sys and docker/docker to find the right combination that works and i have to do the same thing in cadvisor and k/k, i thought i would file this here first :)

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks like there's only two packages used from docker; perhaps worth evaluating if those could be separated 🤔 (the "contrib" files are vendored because they contain C files, which vndr always vendors)

Screenshot 2020-10-13 at 23 26 46

Copy link
Member

@thaJeztah thaJeztah left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM, but worth looking if we can cut the dependency (perhaps moving out some of those packages)

@dims
Copy link
Member Author

dims commented Oct 14, 2020

@thaJeztah ack, i'll follow up with a PR to remove docker/docker, looks doable :) let's get this in

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants