clearlinux/docker
2
0
Fork 0
mirror of https://github.com/clearlinux/docker.git synced 2026-05-16 11:43:39 +00:00
Code Issues Packages Projects Releases Wiki Activity
16,108 Commits 9 Branches 112 Tags
v1.7.0
Commit Graph

1457 Commits

Author SHA1 Message Date
Brian Goff
73e41874b6 Fixes content-type/length for stats stream=false 
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
(cherry picked from commit 855a056af7)
 2015-06-12 11:56:31 -07:00
Darren Shepherd
64552d0b49 Set omitempty for IP and PublicPort to conform w/ API 1.18 
Signed-off-by: Darren Shepherd <darren@rancher.com>
(cherry picked from commit 09de92b891)
 2015-06-12 10:46:07 -07:00
Madhu Venugopal
7ffbd7eaee Vendoring in libnetwork to fix #13873. 
Libnetwork sha# e578e95aa101441481411ff1d620f343895f24fe

Signed-off-by: Madhu Venugopal <madhu@docker.com>
(cherry picked from commit f3d1826350)
 2015-06-12 10:29:58 -07:00
Brian Goff
1d3f7cc012 Default events since to current time 
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
(cherry picked from commit 74c12aa429)
 2015-06-10 10:38:33 -07:00
Jana Radhakrishnan
2b15a888cd libnetwork: Add garbage collection trigger 
When the daemon is going down trigger immediate
garbage collection of libnetwork resources deleted
like namespace path since there will be no way to
remove them when the daemon restarts.

Signed-off-by: Jana Radhakrishnan <mrjana@docker.com>
(cherry picked from commit c68e7f96f9)
 2015-06-09 17:28:08 -07:00
Alessandro Boch
b5086a7494 Add integ test for unpublished ports in ps o/p 
- This is a test to assert the fix #13734

Signed-off-by: Alessandro Boch <aboch@docker.com>
(cherry picked from commit 7b9ae696d8)
 2015-06-09 11:47:25 -07:00
Jessica Frazelle
80157b35ac skip test on lxc 
Signed-off-by: Jessica Frazelle <princess@docker.com>
(cherry picked from commit 1392f99a97)
 2015-06-09 11:47:25 -07:00
Zefan Li
4ebcd0d544 test: Skip TestDevicePermissions on lxc 
Closes: #13641

Signed-off-by: Zefan Li <lizefan@huawei.com>
(cherry picked from commit e55649192e)
 2015-06-09 11:47:25 -07:00
Antonio Murdaca
33588c23c3 Avoid nil pointer dereference while creating a container with an empty Config 
Signed-off-by: Antonio Murdaca <runcom@linux.com>
(cherry picked from commit 4ce817796e)
 2015-06-08 11:39:17 -07:00
Eric-Olivier Lamey
495640005a Restore --default-gateway{,-v6} daemon options. 
This was added before the libnetwork merge, and then lost. Fixes #13755.

Signed-off-by: Eric-Olivier Lamey <eo@lamey.me>
(cherry picked from commit 5fa60149e2)
 2015-06-08 11:36:48 -07:00
Jessica Frazelle
8f211fde46 fix lxc build 
Signed-off-by: Jessica Frazelle <princess@docker.com>
(cherry picked from commit 0adfb908a6)
 2015-06-05 10:29:08 -07:00
Antonio Murdaca
339f0a128a SizeRW & SizeRootFs omitted if empty in /container/json call 
Signed-off-by: Antonio Murdaca <runcom@linux.com>
(cherry picked from commit 6945ac2d02)
 2015-06-03 17:33:10 -07:00
Antonio Murdaca
bf371ab2a5 Do not omit empty json field in /containers/json api response 
Signed-off-by: Antonio Murdaca <runcom@linux.com>
(cherry picked from commit 725f34151c)
 2015-06-03 12:43:08 -07:00
Michael Crosby
d283999b1c 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>
(cherry picked from commit 4f42097883)
 2015-06-02 18:54:54 -07:00
Antonio Murdaca
db3daa7bdd Fix wrong kill signal parsing 
Signed-off-by: Antonio Murdaca <antonio.murdaca@gmail.com>
(cherry picked from commit 39eec4c25b)
 2015-06-02 09:43:43 -07:00
Lei Jitang
6ca78fff63 Add docker stats --no-stream show cpu usage 
Signed-off-by: Lei Jitang <leijitang@huawei.com>
(cherry picked from commit 96123a1fd5)

Conflicts:
	daemon/stats.go
 2015-06-01 10:09:14 -07:00
David R. Jenni
e9c51c3edc 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>
(cherry picked from commit c913c9921b)
 2015-06-01 09:32:50 -07:00
Jessica Frazelle
b38c720f19 fix experimental version and release script 
add api version experimental

Signed-off-by: Jessica Frazelle <princess@docker.com>
(cherry picked from commit b372f9f224)

Conflicts:
	docs/sources/reference/api/docker_remote_api_v1.20.md
 2015-06-01 09:31:32 -07:00
Doug Davis
ab7e7a7338 Carry #11858 
Continues 11858 by:
- Making sure the exit code is always zero when we ask for help
- Making sure the exit code isn't zero when we print help on error cases
- Making sure both short and long usage go to the same stream (stdout vs stderr)
- Making sure all docker commands support --help
- Test that all cmds send --help to stdout, exit code 0, show full usage, no blank lines at end
- Test that all cmds (that support it) show short usage on bad arg to stderr, no blank line at end
- Test that all cmds complain about a bad option, no blank line at end
- Test that docker (w/o subcmd) does the same stuff mentioned above properly

Signed-off-by: Doug Davis <dug@us.ibm.com>
(cherry picked from commit 8324d7918b)
 2015-06-01 08:53:49 -07:00
Lei Jitang
4fefcde5a6 Ensure all the running containers are killed on daemon shutdown 
Signed-off-by: Lei Jitang <leijitang@huawei.com>
(cherry picked from commit bdb77078b5)
 2015-05-29 16:50:23 -07:00
Jessica Frazelle
736c216d58 fix bug with rmi multiple tag 
Signed-off-by: Jessica Frazelle <princess@docker.com>
(cherry picked from commit 185f392691)
 2015-05-29 15:12:33 -07:00
Antonio Murdaca
85f0e01833 Fix regression in stats API endpoint where stream query param default is true 
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
(cherry picked from commit ec97f41465)
 2015-05-29 15:06:01 -07:00
Lei Jitang
9827107dcf Fix automatically publish ports without --publish-all 
Signed-off-by: Lei Jitang <leijitang@huawei.com>
(cherry picked from commit 9a09664b51)
 2015-05-28 10:03:29 -07: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
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
Alexander Morozov
3cb14df68c Fix network with -b none 
* Don't AllocateNetwork when network is disabled
* Don't createNetwork in execdriver when network is disabled

Signed-off-by: Alexander Morozov <lk4d4@docker.com>
 2015-05-24 08:26:59 -07:00
Arnaud Porterie
bce3e761c0 Merge pull request #13161 from calavera/plugin_discovery 
Proposal: Volume refactor and external volume plugins
 2015-05-23 18:44:18 -07:00
Alexander Morozov
89582f9781 Merge pull request #13403 from hqhq/hq_fix_ipcmode_check 
Don't check running container at create time
 2015-05-23 08:32:51 -07:00
David Calavera
d592778f4a Propagate unmount events to the external volume drivers. 
Signed-off-by: David Calavera <david.calavera@gmail.com>
 2015-05-22 16:43:34 -07:00
Qiang Huang
84aae5a226 Don't check running container at create time 
We should let user create container even if the container he wants
join is not running, that check should be done at start time.

In this case, the running check is done by getIpcContainer() when
we start container.

Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
 2015-05-23 07:15:14 +08:00
Jessica Frazelle
a1ea562b20 lol 108 chars ETOOMANY 
Signed-off-by: Jessica Frazelle <princess@docker.com>
 2015-05-22 10:10:17 -07:00
Zhang Wei
6809fa6861 Delete "defer deleteAllContainers()" from integration-cli 
Signed-off-by: Zhang Wei <zhangwei555@huawei.com>
 2015-05-22 17:01:52 +08:00
Arnaud Porterie
4fc37a1ede Mark --volume-driver as experimental 
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com>
 2015-05-21 20:34:17 -07:00
David Calavera
81fa9feb0c Volumes refactor and external plugin implementation. 
Signed by all authors:

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com>
Signed-off-by: David Calavera <david.calavera@gmail.com>
Signed-off-by: Jeff Lindsay <progrium@gmail.com>
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
Signed-off-by: Luke Marsden <luke@clusterhq.com>
Signed-off-by: David Calavera <david.calavera@gmail.com>
 2015-05-21 20:34:17 -07:00
Jessie Frazelle
2b8271399e Merge pull request #13386 from icecrime/experimental_suffix_version 
Suffix experimental version / fix warning output
 2015-05-21 17:42:23 -07:00
Qiang Huang
c0dd8538db Fix test failure when --net none build 
Closes: #13369

Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
 2015-05-22 08:21:09 +08:00