p4u1/docker-cli
0
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity
6,655 Commits 2 Branches 295 Tags
812f45a7e03026656a82c4ea82c8e4e869bfd2a3
Commit Graph

100 Commits

Author SHA1 Message Date
Michael Crosby
d321be3c28 Change veth prefix back to veth 
Fixes #4453
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: 0cdf10263844db0cb4d051ac9f79051104abe77f
Component: engine
 2014-03-04 11:46:05 -08:00
Guillaume J. Charmes
dc4d93c655 Merge pull request #4327 from crosbymichael/add-libcontainer 
Add native execution driver to docker and make it the default
Upstream-commit: 69c69059fc3933531e19c05a9d2e831fb713881c
Component: engine
 2014-03-03 16:34:20 -08:00
Victor Vieux
efaa1f688a fix docker info with lxc 1.0.0 
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com> (github: vieux)
Upstream-commit: f30f823bf50de6581f547aee842286584c4b6990
Component: engine
 2014-02-28 00:32:58 +00:00
Michael Crosby
4bb07a86b5 Ensure that ticker does not leak 
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: 44c3b7133218a66f44cb51b7563b7c0016583eda
Component: engine
 2014-02-27 11:40:25 -08:00
Michael Crosby
49fbe66f4f Allow child process to live if daemon dies 
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: fdeea90fc806d8d2cccdc76a6ecb214dd03093ec
Component: engine
 2014-02-27 09:33:36 -08:00
Michael Crosby
9c9bdcb0ef Ensure that the container dir is remove on restore 
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: a115ce797b80a14d268fcd96521cf05d1e1074c1
Component: engine
 2014-02-27 08:28:55 -08:00
Michael Crosby
02cbc6e6b4 Code review updates 
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: fb08b8b221a9a722910d63db678ffb5a8f91b517
Component: engine
 2014-02-26 19:21:46 -08:00
Michael Crosby
3258d9a2a3 Make network a slice to support multiple types 
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: 70820b69ec2b82ab150af9b8829e37843f67f75a
Component: engine
 2014-02-26 14:20:41 -08:00
Michael Crosby
bec84fb562 Merge branch 'master' into add-libcontainer 
Conflicts:
	execdriver/termconsole.go

Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: ce08083f9cd23e8f5e44228b0b73884bcf2f3562
Component: engine
 2014-02-26 12:55:24 -08:00
unclejack
c5ba66b375 Merge pull request #4282 from ibuildthecloud/jumbo-frames 
Add MTU to lxc conf to make host and container MTU match
Upstream-commit: 22da8cdc7e862dbc54806dc935f4ef079be22654
Component: engine
 2014-02-26 20:11:38 +02:00
unclejack
360444d431 Merge pull request #4308 from vbatts/vbatts-seperate_driver_term 
seperate out the terminal functions from lxc
Upstream-commit: d8b60cb5929b35d35695708ffb8595bc55d2b37f
Component: engine
 2014-02-26 16:58:21 +02:00
Michael Crosby
514380823f Return error for lxc-conf when using native driver 
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: bfdf07ac98e1a425892b787cf224109d5925a798
Component: engine
 2014-02-25 17:13:00 -08:00
Michael Crosby
cdfec9fd8a Ensure that the container's dir is remove from native driver on stop 
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: 5c67d2e6346d493e2b8b0469d453a64d41c22cb2
Component: engine
 2014-02-25 16:27:07 -08:00
Michael Crosby
9248431c6a Fix cross compile for make cross 
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: 93ed15075c43d521f05f4b8f96264efb7fe174e4
Component: engine
 2014-02-25 15:19:13 -08:00
Michael Crosby
0cd1a2f6a4 Move container.json and pid file into a root specific driver dir 
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: 96e33a7646b3669632f48ed1071aeb61b8016be1
Component: engine
 2014-02-25 12:41:31 -08:00
Guillaume J. Charmes
28bf2a10c1 Merge branch 'add-libcontainer' of https://github.com/crosbymichael/docker into add-libcontainer 
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume.charmes@docker.com> (github: creack)
Upstream-commit: ca42758368b7bd8e6b102411531c2c89356407ad
Component: engine
 2014-02-25 11:42:15 -08:00
Michael Crosby
1bd3fbfadf Address initial feedback from pr 
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: de083400b8d7c2074d71a30a92e4f3c8bcd8bad8
Component: engine
 2014-02-25 10:54:41 -08:00
Vincent Batts
fbca607ce0 correcting the package name for the terminal setup 
Docker-DCO-1.1-Signed-off-by: Vincent Batts <vbatts@redhat.com> (github: vbatts)
Upstream-commit: c35853191ccd9ca8fe91b666d598eac3e4e12c67
Component: engine
 2014-02-25 10:07:06 -05:00
Guillaume J. Charmes
a70a6bdd53 Better capability/namespace management 
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume.charmes@docker.com> (github: creack)
Upstream-commit: 91bf120c51dec3bae98a1974929e2ae8107340c0
Component: engine
 2014-02-24 21:52:29 -08:00
Michael Crosby
9649d5107a Remove container env var from libcontainer 
Update tests to use native driver
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: 431d510cae85bc1265c861028dd9751ae95088b2
Component: engine
 2014-02-24 21:51:00 -08:00
Michael Crosby
cd79f65fb0 Move types around in native driver 
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: 8db740a38e333158e613bc5b3a7acc2605131581
Component: engine
 2014-02-24 21:21:35 -08:00
Michael Crosby
0460b2181f Refactor and improve libcontainer and driver 
Remove logging for now because it is complicating things
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: f8453cd0499a51f5d3ffd2c2a6012972aef7f69f
Component: engine
 2014-02-24 21:11:52 -08:00
Michael Crosby
530d80759d Fix exec driver flag, rename new driver to 'native' 
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: d59c05a37c3e964cdeef818afc2e7c3a3e8d0cf1
Component: engine
 2014-02-24 20:41:09 -08:00
Michael Crosby
4f321caf5c Merge branch 'master' into add-libcontainer 
Conflicts:
	runtime.go

Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: 27a43692c2b114ed9b6418e75d16cbb2e6c7a993
Component: engine
 2014-02-24 20:35:12 -08:00
Michael Crosby
4d05a25973 Remove chroot driver, it's not needed 
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: ca537a63a8a21eb4d5d31144c934ca18846bb856
Component: engine
 2014-02-24 18:52:48 -08:00
Michael Crosby
3dcdf3e0d6 Improve logging for nsinit 
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: 9cb4573d33607bc32e7db19981b3e9d5eaf449a0
Component: engine
 2014-02-24 18:38:36 -08:00
Michael Crosby
f6bf4c8510 Rename namespace driver to docker 
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: 77f68f74c7e6fc977fb2681c7ee60ac652be983e
Component: engine
 2014-02-24 16:42:30 -08:00
Michael Crosby
b697db52c8 Fix restore container by nspid 
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: 9f03fd76b578f2d9d00b0a1bd76b776e20a7d681
Component: engine
 2014-02-24 16:35:11 -08:00
Michael Crosby
471c8027da Fix get pids for nsinit 
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: 9bf6cb2692a9b14cac559b4b9c9403e7f6f13ecd
Component: engine
 2014-02-24 16:26:06 -08:00
Michael Crosby
aef5af9f3c Cgroups allow devices for privileged containers 
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: a76407ac61dd57429a1350f840c323f45a97b27f
Component: engine
 2014-02-24 15:47:23 -08:00
Michael Crosby
57d4919fc6 Fix kill signals and rootfs path for pid 
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: a6e5e1851197ccc262c61190d5904dd410293466
Component: engine
 2014-02-24 14:35:27 -08:00
Michael Crosby
4c203f5a85 Add info for driver 
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: cfd188e9251f5047e4fd677fe8f2921ae28b8bcc
Component: engine
 2014-02-24 14:11:09 -08:00
Michael Crosby
8a923765fc Use the cpu cgroup subsystem instead of memory because its non optional 
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: 757c7581c8334b6b527d1c922fe5007d5004eca2
Component: engine
 2014-02-24 13:42:13 -08:00
Michael Crosby
07cc777e62 Fix tests with dockerinit lookup path 
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: 01f9815b55742654b2f35d13c3aba6a9e48634c7
Component: engine
 2014-02-24 13:40:17 -08:00
Vincent Batts
031e369945 Move the terminal setup to execdriver, instead of ./pkg/term 
It is independent of any particular driver, but likely used by
  multiple execdrivers. Also, pkg/... is not to have any links to
  docker, which this terminal setup does.

Docker-DCO-1.1-Signed-off-by: Vincent Batts <vbatts@redhat.com> (github: vbatts)
Upstream-commit: fabc478e7e33fd3b3c00c3bd74bad0d87a2c23e3
Component: engine
 2014-02-24 15:28:45 -05:00
Michael Crosby
54e2291890 Compile nsinit into docker for use with dockerinit 
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: 8f20058307cb30c9697b8dbee1c7bf2b1e0ba766
Component: engine
 2014-02-24 12:21:13 -08:00
Vincent Batts
d6c00b381a seperate out the terminal functions from lxc to the pkg/term 
Since these functions are indepenent of lxc, and could be used by
  other drivers.

Docker-DCO-1.1-Signed-off-by: Vincent Batts <vbatts@redhat.com> (github: vbatts)
Upstream-commit: de848a14caf1636cc24e621a35d7073cebe5444d
Component: engine
 2014-02-24 13:42:09 -05:00
Michael Crosby
0b2fdfff35 Fix tty copy for driver 
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: 172260a49be6c3516edc6869d58957e844f9c69b
Component: engine
 2014-02-22 01:28:59 -08:00
Michael Crosby
0c8ed4441e Refactor driver to use Exec function from nsini 
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: fac41af25bd5f42269424a788783a4280dd7fc9c
Component: engine
 2014-02-22 01:21:26 -08:00
Michael Crosby
4fbf234237 Initial commit of libcontainer running docker 
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: 2419e63d243255ef38f16799ffdc64084aa18fe4
Component: engine
 2014-02-21 17:23:49 -08:00
Michael Crosby
28cc135001 Move current tty and pipe impl to lxc driver 
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: aac702727ea02b3974a2848748b0713ac583fc84
Component: engine
 2014-02-21 13:27:34 -08:00
Michael Crosby
a3562ba47c Add CloseWriters back and do an interface cast 
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: 8e2284aaa2364a8e47a8058e65d60813f9cd5089
Component: engine
 2014-02-21 12:52:18 -08:00
Michael Crosby
b0992a0e99 Move term creation into driver 
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: 592c2f6f9a472bda227a03c819f73b8edc7c3320
Component: engine
 2014-02-21 12:42:37 -08:00
Michael Crosby
a808fdbf65 Change Console to Terminal 
Move creation and attach to driver
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: 1e742876988546efb876f67f83de6737ee5e9cf6
Component: engine
 2014-02-21 12:32:14 -08:00
Michael Crosby
9de10592bc Move console into execdriver 
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: 8c783c1c1336d8f2d1b08b9cbd8e2298d066750c
Component: engine
 2014-02-21 11:47:53 -08:00
Darren Shepherd
9b049ad74b Add MTU to lxc conf to make host and container MTU match 
If you are using jumbo frames the host side of the veth was being set to
1500.  Docker would set the MTU of the container side of the veth to 9001.
This would lead to a situation in which the two sides of the veth had
different MTU sizes causing issues in network traffic.

Docker-DCO-1.1-Signed-off-by: Darren Shepherd <darren.s.shepherd@gmail.com> (github: ibuildthecloud)
Upstream-commit: 0db53bd2ecba097c6ace1a1088e11458e139390a
Component: engine
 2014-02-21 03:02:06 -07:00
Michael Crosby
a7d9996138 Cleanup some statements from exec driver work 
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: 9e3da87a3a6fea21194ceb9dbd30a39d043a48a4
Component: engine
 2014-02-14 17:28:50 -08:00
Guillaume J. Charmes
3dbd63bc33 Mount-bind the PTY as container console - allow for tmux/screen to run 
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume.charmes@docker.com> (github: creack)
Upstream-commit: 408ea0771a9cb3046b8e484dcfefe5233fcbb27a
Component: engine
 2014-02-13 17:23:09 -08:00
Michael Crosby
750f4cb5c2 Merge pull request #4059 from alexlarsson/no-netadmin-caps 
lxc: Drop NET_ADMIN capability in non-privileged containers
Upstream-commit: 3c215ba41005f225a07ebc8806216acdb746c671
Component: engine
 2014-02-11 14:20:34 -05:00
Alexander Larsson
96a42d5055 lxc: Drop NET_ADMIN capability in non-privileged containers 
With this capability set the container can e.g. change the ip address
of his devices to that of another container on the docker0 bridge. In
a quick test I was able to listen to a port on a different ip than the
one docker assigned me, but was not able to hijack an open port
redirection that another container had open. Maybe its possible with
some more knowledge of networking though.

Anyway, network setup is meant to be handled by docker, not the apps,
so I believe denying this is generally in the spirit of docker, and
it closes down potential security issues.

Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com> (github: alexlarsson)
Upstream-commit: 02fddffd51da782f912e2709ea814c330269515b
Component: engine
 2014-02-11 11:17:34 +01:00