p4u1/docker-cli
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
7,436 Commits 2 Branches 295 Tags
ee1f88fe1bee85ea1fffafe12499b3a036e2fb21
Commit Graph

28 Commits

Author SHA1 Message Date
Alexander Larsson
7b99942ebd Fix libcontainer network support on rhel6 
It seems that netlink in older kernels, including RHEL6, does not
support RTM_SETLINK with IFLA_MASTER. It just silently ignores it, reporting
no error, causing netlink.NetworkSetMaster() to not do anything yet
return no error.

We fix this by introducing and using AddToBridge() in a very similar manner
to CreateBridge(), which use the old ioctls directly.

This fixes https://github.com/dotcloud/docker/issues/4668

Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com> (github: alexlarsson)
Upstream-commit: 59c1b2880be8fb9d9a632fa42a10097c1580591a
Component: engine
 2014-04-09 15:44:18 +02:00
Michael Crosby
a4e4b56b6e Set bridge mac addr on supported kernels 
Fixes #3200
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: 4cdcea20474a9f42291fe6b6c6dee348343a7c05
Component: engine
 2014-03-31 22:56:23 +00:00
Guillaume J. Charmes
84def4f523 Update email + add self to pkg/signal 
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume@charmes.net> (github: creack)
Upstream-commit: 915d967f556bc7bb3faea34db8a06ea64fd5de92
Component: engine
 2014-03-10 20:26:45 -07:00
Michael Crosby
0cb5ef58f2 Merge pull request #4011 from crosbymichael/add-netlink-functions 
Add more netlink functions
Upstream-commit: 113629efb17dbb6af277d62259181899d0d031c9
Component: engine
 2014-02-18 19:37:52 -05:00
Michael Crosby
d3c56b4c4a Make crosbymichael and creack netlink maintainers 
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: a75c6907b48f730fe79c6c9ebfe22eeea6389f4a
Component: engine
 2014-02-17 11:17:05 -08:00
Michael Crosby
07f1d747db Add new functions to unsupported file 
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: 17719cab91e175a7bd11f9852e27638df1202b8b
Component: engine
 2014-02-14 12:12:35 -08:00
Guillaume J. Charmes
68a1243dca Simplify code + Allow more generic attr children + remove prefix 
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume.charmes@docker.com> (github: creack)
Upstream-commit: 38e5b4e70fb6b93aa2b86e4d625a0032b97b991a
Component: engine
 2014-02-12 09:29:06 -08:00
Guillaume J. Charmes
1f519be2f8 Merge remote-tracking branch 'mike/add-netlink-functions' into implement_create_veth 
Conflicts:
	pkg/netlink/netlink_linux.go

Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume.charmes@docker.com> (github: creack)
Upstream-commit: dce7b6a69c42fb64a99f873a5f7568799228c1e5
Component: engine
 2014-02-12 04:17:12 -08:00
Guillaume J. Charmes
bcb95a4894 Implement create veth 
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume.charmes@docker.com> (github: creack)
Upstream-commit: 2d2c237f50b7954993f6cd1db67c6f8c6d06f881
Component: engine
 2014-02-12 04:09:56 -08:00
Michael Crosby
ad55909560 Merge branch 'add-netlink-functions' of github.com:crosbymichael/docker into add-netlink-functions 
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: 34f5d94b2cfb0a5401b31f3b669ae6579d8126a8
Component: engine
 2014-02-11 03:33:18 -08:00
Tianon Gravi
3f55cc6f41 Add comment clarifying null termination 
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
Upstream-commit: c626349f651a660302f64101055d65dc6e990307
Component: engine
 2014-02-11 10:32:31 -07:00
Michael Crosby
6d92748c6f Exec out to ip right now for creating the veth pair 
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: 27ed9a9f98750ab666d6221553b6f4ea59d396b8
Component: engine
 2014-02-11 03:32:35 -08:00
Michael Crosby
c0caaa92a3 Add more netlink functions for set ns by fd and bring iface down 
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: f9cd1be6ffbda85f20cc7926274fab7484a19823
Component: engine
 2014-02-10 22:32:07 -08:00
Michael Crosby
1093e871da Allow add of empty name 
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: 4dec36d1ee8cfd8b396210daa5367d146bbb34bc
Component: engine
 2014-02-10 16:41:16 -08:00
Michael Crosby
6da2235591 Create veth pair via netlink 
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: 38eabfa65c5be78a08a8287b600e230dbe0bfac5
Component: engine
 2014-02-10 13:37:16 -08:00
Michael Crosby
5fb9dcf843 Improve get if socket loop 
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: 27df18ff11dbfc22ca539462710abf07d507c0d9
Component: engine
 2014-02-10 11:36:23 -08:00
Tianon Gravi
aaca90f4b6 Update NetworkChangeName to be more similar to my original (moving IFNAMSIZ constant outside the function like it should've been) 
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
Upstream-commit: 3a7c144e9992591f32daf2d4f1b35b7b6520a07e
Component: engine
 2014-02-09 18:14:17 -07:00
Michael Crosby
c36542fc7c Replace my C code with tianons Go code 
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: 524416560a4624d30023db32101c9fe5ebffc895
Component: engine
 2014-02-09 05:54:13 -08:00
Michael Crosby
347c7fca0d Use c to change interface name 
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: ee39033073ece35e91c6c5a8cb66d23246511fb0
Component: engine
 2014-02-08 20:44:04 -08:00
Michael Crosby
e66ed158d6 Add network set interface in namespace by pid 
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: e3762e8d6937741a5654b1443f95beb784f018f1
Component: engine
 2014-02-08 10:03:16 -08:00
Michael Crosby
7920ed3ee7 Add set master for interface 
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: a6c791e8a92f29a2ae2c6bc81e4ab873d3ceb41f
Component: engine
 2014-02-08 09:53:04 -08:00
Tianon Gravi
e8f6d5eb59 Update/fix build tags, Dockerfile, and release.sh for proper building and releasing of linux/386 and linux/arm cross-compiled client binaries 
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
Upstream-commit: 065dd231dd7d7858df982a8decfade9df936cf63
Component: engine
 2014-01-31 03:16:42 -07:00
Guillaume J. Charmes
185286d85e Remove all darwin specific files and use more generic _unsupported with build tags. 
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume.charmes@docker.com> (github: creack)
Upstream-commit: 45dd051e8ee2e0e18d8ffec99f65878c20bd11e9
Component: engine
 2014-01-30 23:10:56 +00:00
Johan Euphrosine
9ba5452f29 netlink: make darwin happy 
Docker-DCO-1.1-Signed-off-by: Johan Euphrosine <proppy@google.com> (github: proppy)
Upstream-commit: 77d9fd262828c0c626b2093e8a62e05cc130905e
Component: engine
 2014-01-17 16:55:42 -08:00
Johan Euphrosine
5a27089624 netlink: move Route type to common arch file 
Docker-DCO-1.1-Signed-off-by: Johan Euphrosine <proppy@google.com> (github: proppy)
Upstream-commit: dadd54dba395f68c492a8ce5e2bf9488f9db0830
Component: engine
 2014-01-17 14:04:11 -08:00
Johan Euphrosine
52d25202bf netlink: add default Route to NetworkGetRoutes 
Docker-DCO-1.1-Signed-off-by: Johan Euphrosine <proppy@google.com> (github: proppy)
Upstream-commit: 26726dc9ff3ac8ccc7f40f7672e6494d0e77611d
Component: engine
 2014-01-17 11:09:50 -08:00
Tianon Gravi
72bcbfd669 Fix a few miscellaneous typos (Unkown -> Unknown, Recieve -> Receive) 
Docker-DCO-1.0-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
Upstream-commit: e525ad3f9be05bfab388896ae559411650429553
Component: engine
 2014-01-07 22:15:53 -07:00
Solomon Hykes
e7204ea88e Move utility package 'netlink' to pkg/netlink 
Upstream-commit: f6b91262a77b2e70da8572850dd8b56d92384dfe
Component: engine
 2013-12-23 23:39:39 +00:00