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

vendor: bump libcontainer and its deps #18106

Merged
merged 1 commit into from
Nov 26, 2015
Merged

vendor: bump libcontainer and its deps #18106

merged 1 commit into from
Nov 26, 2015

Conversation

runcom
Copy link
Member

@runcom runcom commented Nov 19, 2015

Pulls latest libcontainer code and updates its deps (and libnetwork)

Signed-off-by: Antonio Murdaca [email protected]

Fixes #18535

@runcom
Copy link
Member Author

runcom commented Nov 19, 2015

#17211 updated go-systemd to v4, now libnetwork isn't compiling because it's using v3 (and godbus/dbus v2), I'll try and update libnetwork as well otherwise this PR won't even compile.

# github.com/docker/libnetwork/iptables
vendor/src/github.com/docker/libnetwork/iptables/firewalld.go:75: cannot use c.sysconn.Object(dbusInterface, dbus.ObjectPath(dbusPath)) (type dbus.BusObject) as type *dbus.Object in assignment: need type assertion

@runcom runcom mentioned this pull request Nov 19, 2015
Merged
@runcom
Copy link
Member Author

runcom commented Nov 19, 2015

created moby/libnetwork#765 to address the above comment and fix the compilation issue here

@runcom
Copy link
Member Author

runcom commented Nov 20, 2015

/cc @tianon (I'll use v0.0.5 here if tag gets pushed to runc)

@tianon
Copy link
Member

tianon commented Nov 20, 2015 via email

@runcom
Copy link
Member Author

runcom commented Nov 20, 2015

updated! though this still needs libnetwork changes before being merged :(

@runcom runcom force-pushed the bump-runc-libcontainer branch 2 times, most recently from 6a7a66d to 9989c7f Compare November 23, 2015 18:27
@runcom
Copy link
Member Author

runcom commented Nov 23, 2015

@LK4D4 @tianon this can be reviewed now that libnetwork changes are in and it does compile

@tianon
Copy link
Member

tianon commented Nov 23, 2015

🤘 👍 LGTM

@LK4D4
Copy link
Contributor

LK4D4 commented Nov 23, 2015

I'll wait for CI :D

@runcom
Copy link
Member Author

runcom commented Nov 23, 2015

oh noes, cross-compile failed lol

@runcom runcom mentioned this pull request Nov 23, 2015
Merged
@runcom
Copy link
Member Author

runcom commented Nov 23, 2015

opened moby/libnetwork#770 which addresses failures in cross compilation

@runcom
Copy link
Member Author

runcom commented Nov 26, 2015

\o/ green!

@runcom
vendor: bump deps
65900d7 
bump runc/libcontainer to v0.0.5
bump runc deps to latest
bump docker/libnetwork to 04cc1fa0a89f8c407b7be8cab883d4b17531ea7d

Signed-off-by: Antonio Murdaca <[email protected]>
@LK4D4
Copy link
Contributor

LK4D4 commented Nov 26, 2015

LGTM

LK4D4 added a commit that referenced this pull request Nov 26, 2015
@LK4D4
Merge pull request #18106 from runcom/bump-runc-libcontainer
0b5a285 
vendor: bump libcontainer and its deps
@LK4D4 LK4D4 merged commit 0b5a285 into moby:master Nov 26, 2015
@runcom runcom deleted the bump-runc-libcontainer branch November 26, 2015 20:29
This was referenced Dec 1, 2015
Closed
Closed
@thaJeztah thaJeztah added this to the 1.9.2 milestone Dec 1, 2015
@thaJeztah
Copy link
Member

@tiborvass I added this to the 1.9.2 milestone for consideration, because it fixes #18145 and #18169. however I see this PR not only updates libnetwork, but also libcontainer, and I'm not sure (if a 1.9.2 release is released) we want both in a patch release...

@mavenugo mavenugo mentioned this pull request Dec 8, 2015
Closed
@aboch aboch mentioned this pull request Dec 14, 2015
Closed
@thaJeztah thaJeztah mentioned this pull request Jan 5, 2016
Closed
@thaJeztah thaJeztah modified the milestones: 1.9.2, 1.10.0 Jan 8, 2016
@sitamet
Copy link

sitamet commented Jan 11, 2016

@thaJeztah @tiborvass Please, add this to a 1.9.2 :(
we are on production with 1.9.1 with #18535
the workaround (removing network local-kv.db) does not solve the real problem

@thaJeztah
Copy link
Member

@sitamet we most likely won't be releasing 1.9.2; but this will be in docker 1.10; code freeze is this Thursday - scheduled for release February 4th

@sitamet
Copy link

sitamet commented Jan 11, 2016

@thaJeztah ok ... lets go forward then :S

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
status/2-code-review
Projects
None yet
Milestone
1.10.0
Development

Successfully merging this pull request may close these issues.
6 participants
@runcom @tianon @LK4D4 @thaJeztah @sitamet @GordonTheTurtle