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

88 Commits

Author SHA1 Message Date
Alexandr Morozov
d887d96ffe Move entrypoint build test to integration-cli 
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com> (github: LK4D4)
Upstream-commit: b25a9b7138e44950bee646c1bcb691a3dd273ea1
Component: engine
 2014-05-27 08:36:38 +04:00
LK4D4
ed1a6f580d Move expose build test to integration-cli 
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com> (github: LK4D4)
Upstream-commit: 81d16411398c20a7ddc0bbe3e5e1ce0bd95d6519
Component: engine
 2014-05-27 08:00:35 +04:00
LK4D4
26be5cc632 Move cmd build test to integration-cli 
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com> (github: LK4D4)
Upstream-commit: c58991f31a6a2ceaee7a3a327bfbc697b059ff51
Component: engine
 2014-05-27 08:00:35 +04:00
LK4D4
966a80b8ce Move env build test to integration-cli 
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com> (github: LK4D4)
Upstream-commit: b05be686ec490ba68de82434f1ecaff01a84fcfa
Component: engine
 2014-05-27 08:00:35 +04:00
LK4D4
23e7a90af8 Move relative workdir build test to integration-cli 
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com> (github: LK4D4)
Upstream-commit: 40630ce4b65755683e496bb7dbf3779b96ec5393
Component: engine
 2014-05-27 08:00:35 +04:00
LK4D4
cfeef64a2d Move user build test to integration-cli 
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com> (github: LK4D4)
Upstream-commit: 360fb3d4ea192e28a4d2579589cd16954bb959c1
Component: engine
 2014-05-27 08:00:34 +04:00
LK4D4
07ea87f779 Move maintainer build test to integration-cli 
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com> (github: LK4D4)
Upstream-commit: 3dd4c5f49977bb9538ae1c39605895fde69c86ee
Component: engine
 2014-05-27 08:00:34 +04:00
LK4D4
ee7d24f0a0 Move volume build test to integration-cli 
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com> (github: LK4D4)
Upstream-commit: 11f7f0bf9b510e09a853a9fd2030a95b72462164
Component: engine
 2014-05-27 08:00:34 +04:00
Victor Vieux
418706706b now busybox as nc 
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com> (github: vieux)
Upstream-commit: 0be44d1a0a2dfd70c35367d7ee8383feeab8d3b9
Component: engine
 2014-05-23 21:03:52 +00:00
Michael Crosby
46f785b005 Update ip test to parse new output 
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: 24872379375dd66518f09b8063698c2d1fb08df9
Component: engine
 2014-05-23 13:22:01 -07:00
Michael Crosby
7dcc66f3df Update integration tests with --net flag 
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: 581e8e891886e6db387ed27aabda7dd8f1d14174
Component: engine
 2014-05-23 11:31:01 -07:00
Tibor Vass
dae04453b9 adding test for hanging ADD src . 
Docker-DCO-1.1-Signed-off-by: Tibor Vass <teabee89@gmail.com> (github: tiborvass)
Upstream-commit: 1ce5457d57d783d6c61557681970bf0977621e78
Component: engine
 2014-05-22 17:28:04 -07:00
Michael Crosby
456a42e6c9 Merge pull request #5839 from unclejack/improve_build_rm 
add --force-rm to clean up after a failed build
Upstream-commit: db1a3551a34e054ee687545ab4922114d13d29d0
Component: engine
 2014-05-22 10:54:05 -07:00
Michael Crosby
d979c2acea Merge pull request #5859 from philips/append-etc-hosts-not-bind 
fix(daemon): prepend host /etc/hosts instead of bind mounting
Upstream-commit: 4bb4bf634a0a056ff8fb4186875c004e156f012d
Component: engine
 2014-05-21 15:57:59 -07:00
Brandon Philips
519b053861 integration-cli: fix spelling error in test 
Docker-DCO-1.1-Signed-off-by: Brandon Philips <brandon.philips@coreos.com> (github: philips)
Upstream-commit: 61ac745d7a7dd192948e0c1cfbdff87af7715c92
Component: engine
 2014-05-21 15:20:29 -07:00
Brandon Philips
8fa886baf3 integration-cli: tests for /etc/hosts and net=host 
Some basic tests to make sure this is acting correctly on machines.

Docker-DCO-1.1-Signed-off-by: Brandon Philips <brandon.philips@coreos.com> (github: philips)
Upstream-commit: 5579bec47be6279569e69c72cccf87864af481de
Component: engine
 2014-05-21 15:20:29 -07:00
Tibor Vass
7594078fbe for perms checking tests, create files from Go and remove them from git 
Docker-DCO-1.1-Signed-off-by: Tibor Vass <teabee89@gmail.com> (github: tiborvass)
Upstream-commit: bb431a719008ae183179d9d71090bd1224d61480
Component: engine
 2014-05-21 11:35:12 -07:00
Tibor Vass
1e7aa2e3c4 remove chmod 755: fixes #5941 
Docker-DCO-1.1-Signed-off-by: Tibor Vass <teabee89@gmail.com> (github: tiborvass)
Upstream-commit: 56a53c72d285b3f9fa6b34dcb81c9720a1974bde
Component: engine
 2014-05-21 11:35:08 -07:00
Victor Vieux
6b24ea22ae add test 
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com> (github: vieux)
Upstream-commit: 5eef0a28cb70881d8f1e34519e9c0df6cb1da071
Component: engine
 2014-05-21 00:10:07 +00:00
Victor Vieux
45b3b14782 Merge pull request #5951 from vieux/pr5919 
Fix remote add cache
Upstream-commit: 240fad497415d798fcaef6dcd8d1231f93a4887c
Component: engine
 2014-05-20 14:33:05 -07:00
Victor Vieux
83451c4f0a add test 
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com> (github: vieux)
Upstream-commit: 03a109e446351ba40ea5d74e8eb6733b2a9a5045
Component: engine
 2014-05-20 21:31:28 +00:00
Michael Crosby
446a0e28d3 Add test for commiting container with bind mount 
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: d31c37fceb6c09a48b5dd9d6c33a95d734e02704
Component: engine
 2014-05-19 22:57:29 +00:00
unclejack
bf729dca8b add unprivilegeduser via the Dockerfile 
This changes the test TestBuildWithInaccessibleFilesInContext to not
add the user 'unprivilegeduser' and add it via the Dockerfile instead.

Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)
Upstream-commit: 599cb12bb8aa13aa2f1be940dd8de4c9d3a06959
Component: engine
 2014-05-19 23:55:28 +03:00
unclejack
2e2afce79e integcli: add tests for build --rm 
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)
Upstream-commit: a691fcb2774deb07fe602d654bd7ba0908fdc09f
Component: engine
 2014-05-19 23:10:54 +03:00
unclejack
2a0a0d8d03 integcli: test container removal for failed builds 
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)
Upstream-commit: 69dcf767fd6b4c54c219c20f87b2fdbb173b7f1c
Component: engine
 2014-05-19 23:10:54 +03:00
unclejack
8a11c8ce1e integcli: add getContainerCount utility function 
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)
Upstream-commit: 77f54252606e6a094b5f722680d43f625bb0d0a8
Component: engine
 2014-05-19 23:10:54 +03:00
Alexandr Morozov
20387c224e Make chmod on ADDed files 
Fixes #3979
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com> (github: LK4D4)
Upstream-commit: 620c8c72535670e8358cebc65a2fb424be58a93c
Component: engine
 2014-05-20 00:09:39 +04:00
Victor Vieux
854833443c Merge pull request #5871 from unclejack/speed_up_buildsixtysteps 
integcli: speed up TestBuildSixtySteps
Upstream-commit: 8674ec7f757807a8df6b9980aa62c18499c39d9f
Component: engine
 2014-05-19 11:02:36 -07:00
Victor Vieux
f45c8a5e25 Merge pull request #5782 from unclejack/fix_5270 
Upstream-commit: 8eef1be29e763db58a22d336b71d97c076a11199
Component: engine
 2014-05-19 10:36:10 -07:00
Michael Crosby
6d2d044bd5 Merge pull request #5670 from jmccrohan/master 
client: Remove docker new version check 
Upstream-commit: b50c9a185c2278daea5be5a9012cf20d548150a4
Component: engine
 2014-05-19 10:26:58 -07:00
Michael Crosby
6d8b321053 Merge pull request #5864 from shykes/pr_out_make_cristian_maintainer_of_integration_cli_he_wrote_it 
Make Cristian maintainer of integration-cli (he wrote it)
Upstream-commit: 15a94fdcbb1ff1a6cf5f02248eb7ca92e6bf9ee9
Component: engine
 2014-05-19 10:26:18 -07:00
Alexandr Morozov
823bf4bfec Check uid ranges 
Fixes #5647
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com> (github: LK4D4)
Upstream-commit: 72d1e40c4a3b190319cfa5cb44b5e6f1694100fc
Component: engine
 2014-05-18 20:49:08 +04:00
Jonathan McCrohan
95b5064ed6 client: Rip out HTTP check from docker version 
For background to this change please see:
https://github.com/dotcloud/docker/issues/4802
https://github.com/dotcloud/docker/pull/5670

Docker-DCO-1.1-Signed-off-by: Jonathan McCrohan <jmccrohan@gmail.com> (github: jmccrohan)
Upstream-commit: 3cec63d56f9de6332aa3f33502695283d4feb054
Component: engine
 2014-05-18 02:22:22 +01:00
Jonathan McCrohan
32ad2ac698 client: rearrange docker version output 
Rearrange docker version output so that server output matches client
output

Docker-DCO-1.1-Signed-off-by: Jonathan McCrohan <jmccrohan@gmail.com> (github: jmccrohan)
Upstream-commit: 82712ed67ef9c189ccc8837ef8469272c91f6fcf
Component: engine
 2014-05-18 01:49:58 +01:00
unclejack
16c16ea197 integcli: speed up TestBuildSixtySteps 
This improves the TestBuildSixtySteps test by switching from busybox to
scratch and simply adding a file.

This lowers the execution time of that test from 20 seconds to 5
seconds.

Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)
Upstream-commit: 58c11ee0a8be74562b0e6f88ee000afdf9ddf025
Component: engine
 2014-05-17 17:25:56 +03:00
Solomon Hykes
da923b63c2 Make Cristian maintainer of integration-cli (he wrote it) 
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com> (github: shykes)
Upstream-commit: ab6027324d1b31d3f8fb880a014091435b68dd07
Component: engine
 2014-05-16 19:03:08 -07:00
unclejack
d17f841625 add test for issue #5270 
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)
Upstream-commit: f5b1afae74a62ba9a4c89f3372dd6e5e5cb89dbf
Component: engine
 2014-05-17 02:38:29 +03:00
unclejack
9195f7ed61 integcli: resolve full path to docker binary 
Setting dockerBinary to the full path of the Docker binary is a good
idea and this is now done in the test code.

Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)
Upstream-commit: 46578a2359714e32d61af4efaeea86b7ff770359
Component: engine
 2014-05-17 02:38:28 +03:00
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