p4u1/docker-cli
0
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity
8,281 Commits 2 Branches 295 Tags
399e34e6ec2ff45ceb60a2d471237c43a27641e2
Commit Graph

50 Commits

Author SHA1 Message Date
Victor Vieux
8003cf19d2 do not merge -i or -t options 
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com> (github: vieux)
Upstream-commit: 2c8b63cb754128a64083426e5c3e6016118e78df
Component: engine
 2014-05-16 22:31:16 +00:00
Michael Crosby
dda972255c Merge pull request #5720 from cyphar/5656-cp-absolute-paths 
Ensure `docker cp` cannot traverse outside container rootfs
Upstream-commit: 4af465fccf35d0c9e529f02f6cc9c8be9fc81c68
Component: engine
 2014-05-14 11:46:11 -07:00
Michael Crosby
4926e35bb1 Add cpuset cpus support for docker 
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: adbe3096e8c8572925dbae5f19ac2ce2dc84fb1c
Component: engine
 2014-05-13 18:17:12 -07:00
cyphar
37a49fd371 integration-cli: cp: added tests for cp 
This patch adds integration tests for the copying of resources
from a container, to ensure that regressions in the security of
resource copying can be easily discovered.

Docker-DCO-1.1-Signed-off-by: Aleksa Sarai <cyphar@cyphar.com> (github: cyphar)
Upstream-commit: 79ca77f3e80d983cf72aa131c1b59c77c60270b0
Component: engine
 2014-05-14 11:14:59 +10:00
Fabio Falci
7a283742d2 Integration test for link and unlink containers 
Docker-DCO-1.1-Signed-off-by: Fabio Falci <fabiofalci@gmail.com> (github: fabiofalci)
Upstream-commit: 7cc27b2075d6293ab2f54a7255fcb1b1e062fd91
Component: engine
 2014-05-11 21:33:01 +01:00
LK4D4
1f5f83d095 Change owner only on copied content 
Fixes #5110
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com> (github: LK4D4)
Upstream-commit: 91b7d8ebd31dba64b551de85e70786c568cb402a
Component: engine
 2014-05-07 20:40:22 +04:00
cyphar
e1bf9e3403 integration-cli: docker_cli_links: fixed broken tests 
The tests weren't ... tested when last edited, this patch fixes
them so that they run and pass correctly.

Docker-DCO-1.1-Signed-off-by: Aleksa Sarai <cyphar@cyphar.com> (github: cyphar)
Upstream-commit: 924979259ec4c9ef6beab0468325f1cb04deaacb
Component: engine
 2014-05-07 01:05:15 +10:00
Solomon Hykes
78dce02460 Simplify integration test for link + hostname. 
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com> (github: shykes)
Upstream-commit: dc605c8be76760951d0d12e67409602c7b4b7973
Component: engine
 2014-05-05 19:51:47 -07:00
Bryan Murphy
1d128ba235 add linked containers to hosts file 
Docker-DCO-1.1-Signed-off-by: Bryan Murphy <bmurphy1976@gmail.com> (github: bmurphy1976)

Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com> (github: shykes)
Tested-by: Solomon Hykes <solomon@docker.com> (github: shykes)
Upstream-commit: 53f38a14cd6b61a6b5df68cc3694dcba2b0c1eb7
Component: engine
 2014-05-05 19:40:27 -07:00
Jérôme Petazzoni
7dc5aa24f0 Mount /proc and /sys read-only, except in privileged containers. 
It has been pointed out that some files in /proc and /sys can be used
to break out of containers. However, if those filesystems are mounted
read-only, most of the known exploits are mitigated, since they rely
on writing some file in those filesystems.

This does not replace security modules (like SELinux or AppArmor), it
is just another layer of security. Likewise, it doesn't mean that the
other mitigations (shadowing parts of /proc or /sys with bind mounts)
are useless. Those measures are still useful. As such, the shadowing
of /proc/kcore is still enabled with both LXC and native drivers.

Special care has to be taken with /proc/1/attr, which still needs to
be mounted read-write in order to enable the AppArmor profile. It is
bind-mounted from a private read-write mount of procfs.

All that enforcement is done in dockerinit. The code doing the real
work is in libcontainer. The init function for the LXC driver calls
the function from libcontainer to avoid code duplication.

Docker-DCO-1.1-Signed-off-by: Jérôme Petazzoni <jerome@docker.com> (github: jpetazzo)
Upstream-commit: 1c4202a6142d238d41f10deff1f0548f7591350b
Component: engine
 2014-05-01 15:26:58 -07:00
Alexandr Morozov
6a260a1e42 Timestamps for docker logs. 
Fixes #1165
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com> (github: LK4D4)
Upstream-commit: d1297feef8b124e69efc99a58294f498ecb8c022
Component: engine
 2014-05-01 20:40:36 +04:00
Michael Crosby
bf18e83e5d Merge pull request #5464 from tianon/close-leftover-fds 
Upstream-commit: e88ef454b7a8705570623e6d26f51731b8300e0f
Component: engine
 2014-04-30 12:27:52 -07:00
Tianon Gravi
614fad87b9 Close extraneous file descriptors in containers 
Without this patch, containers inherit the open file descriptors of the daemon, so my "exec 42>&2" allows us to "echo >&42 some nasty error with some bad advice" directly into the daemon log. :)

Also, "hack/dind" was already doing this due to issues caused by the inheritance, so I'm removing that hack too since this patch obsoletes it by generalizing it for all containers.

Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
Upstream-commit: d5d62ff95574a48816890d8d6e0785a79f559c3c
Component: engine
 2014-04-29 16:45:28 -06:00
Tibor Vass
d6436680b6 Fixes #5152 : symlink in volume path 
Docker-DCO-1.1-Signed-off-by: Tibor Vass <teabee89@gmail.com> (github: tiborvass)
Upstream-commit: e9a42a45bfe296850a72ba6ee5e7c0c04534ea34
Component: engine
 2014-04-28 13:18:12 -07:00
Michael Crosby
8bd8490f43 Update create with apparmor import 
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: 90678b31331de54598c7a6665c3e7a78bfe6ed63
Component: engine
 2014-04-24 10:35:20 -07:00
Michael Crosby
20ba5d97da No not mount sysfs by default for non privilged containers 
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: 81e5026a6afb282589704fd5f6bcac9ed50108ea
Component: engine
 2014-04-24 10:35:20 -07:00
unclejack
5ba9282149 Merge pull request #5304 from vieux/convert_rm_tests 
convert so rm tests to integration-cli
Upstream-commit: 2931979a5d6abb544fbbfdc359c5f6c131a58c41
Component: engine
 2014-04-18 21:11:18 +03:00
Victor Vieux
86a52f5d6b convert so rm tests to integration-cli 
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com> (github: vieux)
Upstream-commit: fcbc717f9aa11dae75d7418482f51cb61c0bf001
Component: engine
 2014-04-18 17:40:12 +00:00
Michael Crosby
42d84ccd4c Port privileged tests 
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: 296fcf331f2886d2aba3cfb929887dfbb603643d
Component: engine
 2014-04-18 03:20:17 +00:00
Michael Crosby
a871063b21 Port networking tests 
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: caad45d0edd9c1e48eac6e0ae0889039ca6844fc
Component: engine
 2014-04-18 03:12:27 +00:00
Michael Crosby
1437557de2 Port environment test 
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: 47510bd6eb83c43450ba53cb3db13aa340e8226c
Component: engine
 2014-04-18 02:53:08 +00:00
Michael Crosby
e3eecbd979 Port user tests and concurrent tests 
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: e2ed4b9077a46adbe3e4388166bb41969f7fb425
Component: engine
 2014-04-18 02:47:39 +00:00
Michael Crosby
a4830050bf Port volumes and exit code tests 
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: 03993eb5340f1d520e23eac3dfe01d604fe7297f
Component: engine
 2014-04-18 02:34:10 +00:00
Michael Crosby
94560a8cac Update commit test in cli 
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: 6beb858fb0290137c787c9728d84436461c352a0
Component: engine
 2014-04-18 02:24:19 +00:00
Michael Crosby
77c1ab46b6 Port multiple attach test to cli tests 
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: 72f49e554f4d4345238b983d0c820e1e3320f9e5
Component: engine
 2014-04-18 02:14:00 +00:00
Michael Crosby
fa56c6f0d6 Add test verify container ID 
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: 76a19bb3a95ef788cd889b36b0af3b79327ff431
Component: engine
 2014-04-18 01:58:20 +00:00
Alexander Larsson
f7be50364d Rename runtime/* to daemon/* 
Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com> (github: alexlarsson)
Upstream-commit: 359b7df5d2af5733b8a1ea6746d062053053b23e
Component: engine
 2014-04-17 14:43:01 -07:00
Michael Crosby
f79805dbd1 Merge pull request #5248 from unclejack/more_info_testtop 
provide more information when TestTop tests fail
Upstream-commit: 8e67197267891f8390b539b893ce786e0d481427
Component: engine
 2014-04-16 18:54:04 -07:00
unclejack
480254b3ab provide more information when TestTop tests fail 
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)
Upstream-commit: 3ac90aeed5a6bdfe22af48eca1519fb186dc66cb
Component: engine
 2014-04-17 03:39:15 +03:00
Victor Vieux
e8612e5df6 Merge pull request #5246 from crosbymichael/fix-mount 
Fix unmount when host volume is removed
Upstream-commit: 925dfdb18a3298834358d659221135a903749be9
Component: engine
 2014-04-16 17:28:37 -07:00
Guillaume J. Charmes
c35b2bba93 Add integration test for hairpin nat 
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume@charmes.net> (github: creack)
Upstream-commit: 1775ed8c75fabb3544402ca13afe7a4c35b27038
Component: engine
 2014-04-16 14:50:11 -07:00
Michael Crosby
1860a31aef Fix unmount when host volume is removed 
Fixes #5244
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: 39103e72a3ca4ff739a4986c4e4849339e08aaf3
Component: engine
 2014-04-14 12:43:01 +00:00
Michael Crosby
b455526c28 Setup cgroups for all subsystems 
Fixes #5117
Fixes #5118
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: 031fcb31d3a81fbd5c5ab8d898d53fbd486413e6
Component: engine
 2014-04-11 17:28:27 +00:00
Michael Crosby
ecfa4893ce Move volumesfrom to hostconfig 
This also migrates the volumes from integration tests into the new cli
integration test framework.
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: af9746412b6070063f105ae97eba1f8fbd56bd22
Component: engine
 2014-04-08 21:45:06 +00:00
Michael Crosby
ba83763b84 Ensure that ro mounts are remounted 
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: b6042f252dd8a0c7a75da481b667f89c2e4ab071
Component: engine
 2014-04-07 18:23:22 -07:00
Solomon Hykes
42a6758106 Convert a legacy integration test to a clean v2 CLI integration test. 
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com> (github: shykes)
Upstream-commit: 30f22ee9e3ea1012ca663a0383c8c9c2330c52cc
Component: engine
 2014-04-07 20:34:21 +00:00
unclejack
375b426ef6 cli integration: sync container & image deletion 
This makes container and image removal in the tests run synchronously.

Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)
Upstream-commit: e09274476f889c08416a819dfb28f2c425868c6b
Component: engine
 2014-04-04 03:22:32 +03:00
Michael Crosby
4f5eeb82b1 Remove racy test causing tests to stall 
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: a9d6eef2386a3d08840e2a30bd8d6f2ae3679688
Component: engine
 2014-04-02 13:22:51 +00:00
Alexander Larsson
ba88c545d8 Fix --volumes-from mount failure 
As explained in https://github.com/dotcloud/docker/issues/4979
--volumes-from fails with ENOFILE errors.

This is because the code tries to look at the "from" volume without
ensuring that it is mounted yet. We fix this by mounting the containers
before stating in it.

Also includes a regression test.

Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com> (github: alexlarsson)
Upstream-commit: bd94f84ded944ab69c18cf9d23c35deee3b15963
Component: engine
 2014-04-03 19:33:20 +02:00
Guillaume J. Charmes
0423604572 Add API version to docker version 
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume@charmes.net> (github: creack)
Upstream-commit: b246fc33ae4f05b5084fed8fc9f1034e36d87d78
Component: engine
 2014-04-01 17:30:19 -07:00
Victor Vieux
25fa65216f add test 
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com> (github: vieux)
Upstream-commit: dcf2b72f5b6732a4b9b1897cb2b3f7019e3d547e
Component: engine
 2014-04-01 21:07:40 +00:00
Guillaume J. Charmes
1b87e1127a Merge pull request #4929 from crosbymichael/volume-abs-path 
Force abs paths for host volumes
Upstream-commit: f6f059d99af2d4ff7f6049221608b4fe9b82bf6a
Component: engine
 2014-03-31 15:19:30 -07:00
unclejack
c2da88e90a Merge pull request #4925 from creack/fix_logs 
Fix expending buffer in StdCopy
Upstream-commit: e76113be6c8a07f276a4bdc0d6ae043d6bc3a17e
Component: engine
 2014-03-31 23:15:07 +03:00
unclejack
d5407b1cee Merge pull request #4930 from vieux/fix_regression_import 
Fix regression import
Upstream-commit: cd0a907325153b985f8090c0e79c7f3cedfb4537
Component: engine
 2014-03-31 23:12:39 +03:00
Guillaume J. Charmes
78874b1098 Add regression test 
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume@charmes.net> (github: creack)
Upstream-commit: 5fb28eab3e670f225019174987424be31a0d0527
Component: engine
 2014-03-31 13:12:22 -07:00
Victor Vieux
99b81e3c36 add test 
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com> (github: vieux)
Upstream-commit: b430f4f45be27b9565027b5c89b2506577027e88
Component: engine
 2014-03-31 19:31:21 +00:00
Michael Crosby
91181125c8 Force abs paths for host volumes 
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: 904bf049c1626567ee28a21bde4b68ab82c5ce77
Component: engine
 2014-03-31 19:10:19 +00:00
Michael Crosby
3205f2e595 Make sure to set error reguardless of attach or stdin 
Fixes #3364
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: 51d9a04f17d1c8c6c1a069227c1417b20283dda2
Component: engine
 2014-03-31 18:33:14 +00:00
Michael Crosby
38d0326791 Add integration test for volumes-from as file 
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: 28015f8e579e7bbe396f65b3343188ca03b06cbd
Component: engine
 2014-03-31 17:42:34 +00:00
unclejack
624997be0f initial version of cli integration tests 
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)
Upstream-commit: 6db32fdefdae49843ed9535b3af1099e6bd2755d
Component: engine
 2014-03-29 23:09:40 +02:00