1
0
mirror of https://github.com/docker/cli.git synced 2026-01-16 20:22:36 +03:00
Commit Graph

106 Commits

Author SHA1 Message Date
Michael Crosby
3ec79ee252 Make nsinit a proper go pkg and add the main in another dir
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: 1316007e54e0c5a25f0d67675df7dec40286f5e8
Component: engine
2014-02-21 14:56:17 -08:00
Guillaume J. Charmes
a4597085bf Make sure to close the pipe upon ctrl-d
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume.charmes@docker.com> (github: creack)
Upstream-commit: 66baa0653b636180b8b5c57c58f4bbc805aca8c5
Component: engine
2014-02-21 14:56:17 -08:00
Guillaume J. Charmes
24e3f599c0 Handle non-tty mode
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume.charmes@docker.com> (github: creack)
Upstream-commit: 1a4fb0921919720ab379bc82b7508580057770ee
Component: engine
2014-02-21 14:56:17 -08:00
Guillaume J. Charmes
961a3fcf13 Minor cleanup
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume.charmes@docker.com> (github: creack)
Upstream-commit: 83dfdd1d9587a7335bbf3a4656572baefae4f28d
Component: engine
2014-02-21 14:56:17 -08:00
Guillaume J. Charmes
60d018051a Use a custom pipe instead of stdin for sync net namespace
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume.charmes@docker.com> (github: creack)
Upstream-commit: 8dec4adcb3fd905eb05f07678fa7f5bb47d8242f
Component: engine
2014-02-21 14:56:16 -08:00
Guillaume J. Charmes
ee2c282f60 Use flag for init
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume.charmes@docker.com> (github: creack)
Upstream-commit: b519d3ea5a50ad7c15d576a89ec9846c4fc123fa
Component: engine
2014-02-21 14:56:16 -08:00
Michael Crosby
3b343c063f Move rest of cgroups functions into cgroups pkg
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: 7020e208c70dfca5ebc97d699553e4bf1c6ab0bb
Component: engine
2014-02-21 14:56:16 -08:00
Michael Crosby
9aba82e1b2 Change IP to address because it includes the subnet
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: 3cb698125da7b55a7d7ec43b33858f35844a6143
Component: engine
2014-02-21 14:56:16 -08:00
Michael Crosby
680db4b285 Refactory cgroups into general pkg
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: c44258630575f70231b11fb55bc4edc3fb677cab
Component: engine
2014-02-21 14:56:16 -08:00
Michael Crosby
dc9b9ecbcc Remove clone_vfork
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: f00f37413826e31e9eb87096b67c609fdfa457b9
Component: engine
2014-02-21 14:56:16 -08:00
Michael Crosby
02c5334532 Revert "WIP for setup kmsg"
This reverts commit 80db9a918337c4ae80ffa9a001da13bd24e848c8.

Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: 5f84738ef139f696e339afb8280eb74917f2167c
Component: engine
2014-02-21 14:56:16 -08:00
Alexander Larsson
d2ac05db40 libcontainer: Initial version of cgroups support
This is a minimal version of raw cgroup support for libcontainer.
It has only enough for what docker needs, and it has no support
for systemd yet.

Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com> (github: alexlarsson)
Upstream-commit: 664fc54e65ebc14ca9dd5bfc55e3dfe1796e51c8
Component: engine
2014-02-21 14:56:16 -08:00
Michael Crosby
f93f48e322 WIP for setup kmsg
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: f0b4dd6e5883a65dc23121934b6eed7e70ac2515
Component: engine
2014-02-21 14:56:16 -08:00
Michael Crosby
99ce69e4d5 Remove privileged.json config
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: e133d895a6934e650f64f391f9f26b29b0379457
Component: engine
2014-02-21 14:56:16 -08:00
Michael Crosby
4441df6975 Add comments to many functions
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: 70593be139647cdedca0130250626ea6e0b8a277
Component: engine
2014-02-21 14:56:16 -08:00
Michael Crosby
74894a63ab Add CAP_NET_ADMIN
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: e0ff0f4dd6612e331459a2dec69adc728bc360fe
Component: engine
2014-02-21 14:56:16 -08:00
Michael Crosby
60c5e9ec93 Update readme and add TODO
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: 3a97fe27d8f5a9bbcf4992cc9efe33880e73f274
Component: engine
2014-02-21 14:56:16 -08:00
Michael Crosby
e501c61ed3 Refactor to remove cmd from container
Pass the container's command via args
Remove execin function and just look for an
existing nspid file to join the namespace
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: d84feb8fe5e40838c81321249189f1f0a02825bb
Component: engine
2014-02-21 14:56:16 -08:00
Michael Crosby
eba71238f8 Add execin function to running a process in a namespace
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: 420b5eb211f877baac9622e7bedde2948c043619
Component: engine
2014-02-21 14:56:16 -08:00
Michael Crosby
ec270e1bfb Refactor large funcs
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: 5d62916c48cb97320b37640592805d97badfd8ff
Component: engine
2014-02-21 14:56:16 -08:00
Guillaume J. Charmes
92c44382e1 OSX compilation
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume.charmes@dotcloud.com> (github: creack)
Upstream-commit: f3c48ec584707a9acaf9d79c2e161dadf1d2c99b
Component: engine
2014-02-21 14:56:16 -08:00
Michael Crosby
3c99ad7033 General cleanup of libcontainer
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: 61a119220d88d20bb1cca111e9c8ba7cdb45d4f6
Component: engine
2014-02-21 14:56:16 -08:00
Michael Crosby
10d46be0ea Add dynamic veth name
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: 5428964400ece4cd79cc5d482307df5e8913469f
Component: engine
2014-02-21 14:56:16 -08:00
Michael Crosby
3f67fdb8ed Implement init veth creation
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: 34671f20103fb975fed31a03705e04bc65aed239
Component: engine
2014-02-21 14:56:15 -08:00
Michael Crosby
05ed3c19b6 Simplify namespaces with only nsinit
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: 7bc3c012507edcfc5e8ab8523b240ac2bb03fe19
Component: engine
2014-02-21 14:56:15 -08:00
Michael Crosby
a92b2b9a1b Use nsinit as app
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: e25065a6b1df09771598d77cc698e4fcf1159bd4
Component: engine
2014-02-21 14:56:15 -08:00
Guillaume J. Charmes
570aeb08e3 Fix ptmx issue on libcontainer
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume.charmes@docker.com> (github: creack)
Upstream-commit: 18f06b8d16c475568fd023e97eecc138ab052c2d
Component: engine
2014-02-21 14:56:15 -08:00
Guillaume J. Charmes
0ffa3c9f04 Improve general quality of libcontainer
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume.charmes@docker.com> (github: creack)
Upstream-commit: 93d41e53ae64fd77340c31d3bc5531864ed28779
Component: engine
2014-02-21 14:56:15 -08:00
Michael Crosby
1da80198b4 Use nsinit for setting up namespace
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: 11429457691be3b009c6d9f4cc9fce9150d4e810
Component: engine
2014-02-21 14:56:15 -08:00
Michael Crosby
e746c16a00 WIP moving to nsini
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: 72e65b654b75d5087e50cc6366e78bd2f8318bae
Component: engine
2014-02-21 14:56:15 -08:00
Michael Crosby
d60eb0a2dd Make separate nsinit pkg for a dockerinit like init
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: 68b049aed4663eb5f6f53241390f7602c1b40c12
Component: engine
2014-02-21 14:56:15 -08:00
Michael Crosby
a326ecddb8 Initial commit of libcontainer
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: e8abaf217b887fcd6a157b4f905156bd245f8f0a
Component: engine
2014-02-21 14:56:15 -08: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
Victor Vieux
e253c6c2c6 Merge pull request #4168 from crosbymichael/add-listenbuffer
Hold connections until the daemon has fully loaded
Upstream-commit: 4187f4e7504089d11740925a889e923f8adc54a7
Component: engine
2014-02-17 16:04:49 -08:00
Victor Vieux
e9b88ec705 Merge pull request #4153 from crosbymichael/move-proxy
Move proxy into pkg
Upstream-commit: 518670f3d82ad8f0a9568ef5231d5e4af26860b2
Component: engine
2014-02-17 14:51:16 -08:00
Michael Crosby
5f4d37b73d Remove verbose logging for non errors
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: 055f1a1f8181d51d3386b4270f810efd59d51d30
Component: engine
2014-02-17 13:31:13 -08: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
9fdd3cd967 Change name to listenbuffer
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: d5e41c1cb67b7ccb86fbbd80079642afd5055c2a
Component: engine
2014-02-15 21:10:37 -08:00
Michael Crosby
7473a46910 Add socket activation for go apps
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: cfb7711a74dc4b54d879f79bc2f6435ed71163b9
Component: engine
2014-02-15 20:18:47 -08:00
Michael Crosby
690b93143a Move proxy into pkg
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: 8c39db8f96ac2a7ec479a679bc060410cee1a567
Component: engine
2014-02-14 15:48: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
Solomon Hykes
faccead7fb pkg/opts: a collection of custom value parsers implementing flag.Value
This facilitates the refactoring of commands.go.

Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com> (github: shykes)
Upstream-commit: e6e320acc757f22e113da755293583402c6c1e7c
Component: engine
2014-02-11 19:59:52 -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