1471 Commits

Author	SHA1	Message	Date
Michael Crosby	4f42097883	Fix nat integration tests ... This removes complexity of current implementation and makes the test correct and assert the right things. Signed-off-by: Michael Crosby <crosbymichael@gmail.com>	2015-06-02 18:21:16 -07:00
David Calavera	6c42b3947a	Merge pull request #12838 from fntlnz/test-cmd ... Using dockerCmd when possible	2015-06-02 14:12:22 -07:00
Jessie Frazelle	7d33bc0bec	Merge pull request #13656 from lizf-os/13641-skip-test-on-lxc ... test: Skip TestDevicePermissions on lxc	2015-06-02 11:05:22 -07:00
Arnaud Porterie	2de2782fe8	Merge pull request #13666 from runcom/13665-kill-signal-wrong-handled ... Fix wrong kill signal parsing	2015-06-02 09:40:55 -07:00
Antonio Murdaca	39eec4c25b	Fix wrong kill signal parsing ... Signed-off-by: Antonio Murdaca <antonio.murdaca@gmail.com>	2015-06-02 18:01:19 +02:00
Zefan Li	e55649192e	test: Skip TestDevicePermissions on lxc ... Closes: #13641 Signed-off-by: Zefan Li <lizefan@huawei.com>	2015-06-02 10:27:54 +08:00
Jessie Frazelle	aa8d8fdc0c	Merge pull request #13611 from duglin/Issue13417a ... Allow .dockerignore to ignore everything	2015-06-01 15:59:57 -07:00
Alexander Morozov	cd80a61cc1	Merge pull request #13443 from duglin/CleanupEvents ... Cleanup container LogEvent calls	2015-06-01 14:04:33 -07:00
Phil Estes	71d960d455	Merge pull request #13557 from ewindisch/apparmor-unshare-priv ... Expand unshare test to include privileged test	2015-06-01 15:43:37 -04:00
Doug Davis	8232312c1e	Cleanup container LogEvent calls ... Move some calls to container.LogEvent down lower so that there's less of a chance of them being missed. Also add a few more events that appear to have been missed. Added testcases for new events: commit, copy, resize, attach, rename, top Signed-off-by: Doug Davis <dug@us.ibm.com>	2015-06-01 12:39:28 -07:00
Brian Goff	a7005c44b5	Merge pull request #13320 from coolljt0725/add_stats_no_stream_show_cpu_usage ... Add docker stats --no-stream show cpu usage	2015-06-01 09:40:04 -07:00
David Calavera	6fb454b9f0	Merge pull request #13464 from davidrjenni/10184-fix-auto-created-devices ... Fixes issue #10184.	2015-06-01 09:30:04 -07:00
Phil Estes	d37aad170f	Merge pull request #13568 from jfrazelle/fix-release-script-for-experimental ... fix release script for experimental	2015-06-01 12:29:45 -04:00
Sebastiaan van Stijn	f2154a5a6b	Merge pull request #13367 from duglin/Issue13353 ... Add a "Created" state for new containers that haven't been run yet	2015-05-30 19:49:38 +02:00
Lei Jitang	96123a1fd5	Add docker stats --no-stream show cpu usage ... Signed-off-by: Lei Jitang <leijitang@huawei.com>	2015-05-31 01:25:51 +08:00
Doug Davis	dc697b1c9f	Add a "Created" state for new containers that haven't been run yet ... Closes #13353 Signed-off-by: Doug Davis <dug@us.ibm.com>	2015-05-30 07:48:46 -07:00
Doug Davis	82ea6ed2bc	Allow .dockerignore to ignore everything ... Change CLI error msg because it was too specific and didn't make sense when there were errors not related to inaccessible files. Removed some log.Error() calls since they're not really errors we should log. Returning the error will be enough. Closes: #13417 Signed-off-by: Doug Davis <dug@us.ibm.com>	2015-05-30 04:16:00 -07:00
Vincent Demeester	c61fa8471a	Update api documentation to add labels in commit ... It is already possible to set labels at commit when using the API. But it is not present in the API documentation. Added an integration test too, to validate this work (and will be in the future). Signed-off-by: Vincent Demeester <vincent@sbr.pm>	2015-05-30 11:31:51 +02:00
David R. Jenni	c913c9921b	Fix issue #10184. ... Merge user specified devices correctly with default devices. Otherwise the user specified devices end up without permissions. Signed-off-by: David R. Jenni <david.r.jenni@gmail.com>	2015-05-30 11:09:47 +02:00
David Calavera	04c6f09fbd	Merge pull request #12400 from coolljt0725/kill_all_containers_on_daemon_shutdown ... Ensure all the running containers are killed on daemon shutdown	2015-05-29 16:45:57 -07:00
David Calavera	eaa9c1b97e	Merge pull request #13596 from jfrazelle/11414-fix-once-and-for-all ... fix bug with rmi multiple tag	2015-05-29 15:10:22 -07:00
David Calavera	4389fc8bf9	Merge pull request #13425 from runcom/13421-stats-default-stream ... Fix regression in stats API endpoint	2015-05-29 15:05:21 -07:00
Jessica Frazelle	185f392691	fix bug with rmi multiple tag ... Signed-off-by: Jessica Frazelle <princess@docker.com>	2015-05-29 14:04:06 -07:00
Antonio Murdaca	ec97f41465	Fix regression in stats API endpoint where stream query param default is true ... Signed-off-by: Antonio Murdaca <me@runcom.ninja>	2015-05-29 22:38:36 +02:00
Antonio Murdaca	15134a3320	Remove PortSpecs from Config ... Signed-off-by: Antonio Murdaca <me@runcom.ninja>	2015-05-29 22:38:09 +02:00
David Calavera	4c9fd72a91	Merge pull request #13598 from calavera/fix_windows_build ... Do not require cgroups capabilities on windows to run the integration tests.	2015-05-29 12:57:40 -07:00
David Calavera	a914101296	Do not require cgroups capabilities on windows to run the integration tests. ... Signed-off-by: David Calavera <david.calavera@gmail.com>	2015-05-29 11:42:40 -07:00
Jessica Frazelle	b372f9f224	fix experimental version and release script ... add api version experimental Signed-off-by: Jessica Frazelle <princess@docker.com>	2015-05-29 10:00:22 -07:00
Jessica Frazelle	1392f99a97	skip test on lxc ... Signed-off-by: Jessica Frazelle <princess@docker.com>	2015-05-28 14:54:12 -07:00
Eric Windisch	e58161fedc	Expand unshare test to include privileged test ... This ensures that AppArmor, not other mechanisms used by Docker or the kernel is restricting the mount. Signed-off-by: Eric Windisch <eric@windisch.us>	2015-05-28 16:49:48 -04:00
David Calavera	617a0c2fde	Merge pull request #13428 from duglin/niceHelp2 ... Nice help2	2015-05-28 11:09:02 -07:00
Jessie Frazelle	5bb6262d88	Merge pull request #13529 from hqhq/hq_skip_cgroup_test ... Skip test if not have Cpu quota or Cpu period	2015-05-28 10:57:32 -07:00
Qiang Huang	34e5b6af19	Skip test if not have Cpu quota or Cpu period ... Closes: #13522 Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>	2015-05-28 14:59:58 +08:00
David Calavera	26650e2ccc	Merge pull request #13483 from jfrazelle/lxc-we-meet-again ... fix lxc tests unshare, they dont use our apparmor profile	2015-05-27 10:22:31 -07:00
Alexander Morozov	2029257e3c	Merge pull request #13493 from jlhawn/volume_unmount_fix ... Fix container unmount networkMounts	2015-05-27 08:44:11 -07:00
Phil Estes	f3e56420a3	Merge pull request #13499 from cpuguy83/fix_stats_unsubscribe ... Fix unregister stats on when rm running container	2015-05-27 11:10:36 -04:00
Antonio Murdaca	3f66f6f2f0	Merge pull request #13500 from HuKeping/cleanup ... Remove unused code	2015-05-27 13:59:40 +02:00
Hu Keping	a34cb32186	Remove unused code ... As far as I see, it's a dead code. Signed-off-by: Hu Keping <hukeping@huawei.com>	2015-05-27 22:39:02 +08:00
Brian Goff	b3e8ab3021	Fix unregister stats on when rm running container ... Signed-off-by: Brian Goff <cpuguy83@gmail.com>	2015-05-26 22:22:03 -04:00
Lei Jitang	bdb77078b5	Ensure all the running containers are killed on daemon shutdown ... Signed-off-by: Lei Jitang <leijitang@huawei.com>	2015-05-27 09:09:25 +08:00
Josh Hawn	04f99a6ca8	Fix container unmount networkMounts ... UnmountVolumes used to also unmount 'specialMounts' but it no longer does after a recent refactor of volumes. This patch corrects this behavior to include unmounting of `networkMounts` which replaces `specialMounts` (now dead code). Docker-DCO-1.1-Signed-off-by: Josh Hawn <josh.hawn@docker.com> (github: jlhawn)	2015-05-26 17:38:26 -07:00
Arnaud Porterie	b50e780925	Merge pull request #13491 from jfrazelle/revert-exec-privileged ... Revert "Add docker exec run a command in privileged mode"	2015-05-26 16:41:50 -07:00
Tibor Vass	54b514735c	Merge pull request #12881 from nakedible/patch-1 ... Prevent fallback to v1 registry for digest pulls	2015-05-26 19:24:37 -04:00
Alexander Morozov	de318d8c1d	Merge pull request #13489 from cpuguy83/cleanup_rm_funcs ... Cleanup container rm funcs	2015-05-26 14:24:02 -07:00
Jessica Frazelle	40b71adee3	Revert "Add docker exec run a command in privileged mode" ... This reverts commit 72a500e9e5. Signed-off-by: Jessica Frazelle <princess@docker.com> Conflicts: daemon/execdriver/native/exec.go integration-cli/docker_cli_exec_test.go runconfig/exec.go	2015-05-26 14:12:16 -07:00
Arnaud Porterie	47e727d1fc	Merge pull request #13440 from LK4D4/fix_bridge_none ... Fix network with -b none	2015-05-26 14:08:21 -07:00
Brian Goff	f8628ba891	Cleanup container rm funcs ... Signed-off-by: Brian Goff <cpuguy83@gmail.com>	2015-05-26 15:38:52 -04:00
Jessica Frazelle	a08fb73f93	fix lxc tests unshare, they dont use our apparmor profile ... Signed-off-by: Jessica Frazelle <princess@docker.com>	2015-05-26 10:31:21 -07:00
Sebastiaan van Stijn	aee9ac302d	Merge pull request #13335 from jfrazelle/add-apparmor-unshare-test ... add unshare apparmor profile test	2015-05-26 17:32:45 +02:00
Zhang Wei	ab121345ee	Cleanup: change test func name ... Signed-off-by: Zhang Wei <zhangwei555@huawei.com>	2015-05-25 14:51:10 +08:00