09cb1f1121
Merge pull request #17529 from Microsoft/10662-builderisolation
...
Windows: [TP4] Allows --isolation on docker build
2015-10-30 17:10:04 -07:00
6d8aff07ac
Merge pull request #17547 from LK4D4/unn_stat
...
Remove unnecessary Stat check from readHostConfig
2015-10-30 16:56:11 -07:00
9bf20c6847
Merge pull request #17549 from donhcd/fixPre122Stats
...
fix pre-1.21 docker stats
2015-10-30 16:45:41 -07:00
33f5429786
Merge pull request #17538 from calavera/deprecated_bridge_interface
...
Fix network inspect for default networks.
2015-10-30 16:03:51 -07:00
d2c04f844b
fix pre-1.22 docker stats
...
This fixes a bug introduced in #15786 :
* if a pre-v1.20 client requested docker stats, the daemon
would return both an API-compatible JSON blob *and* an API-incompatible JSON
blob: see https://gist.github.com/donhcd/338a5b3681cd6a071629
Signed-off-by: Donald Huang <don.hcd@gmail.com>
2015-10-30 22:28:03 +00:00
0c991f3d68
Merge pull request #16779 from Microsoft/10662-execdrivercommand
...
Windows: Refactor execdriver.Command
2015-10-30 14:59:59 -07:00
36a69bbc60
Remove unnecessary Stat check from readHostConfig
...
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
2015-10-30 14:54:09 -07:00
23a0fe9627
Merge pull request #17539 from cpuguy83/cleaner_ipc_unmount_handling
...
Force IPC mount to unmount on daemon shutdown/init
2015-10-30 14:40:42 -07:00
85d7bbf7aa
Merge pull request #17528 from LK4D4/todisk_encode
...
Use json.Encoder for container.toDisk
2015-10-30 14:36:42 -07:00
74362e8392
Merge pull request #17531 from crosbymichael/no-set-reservation
...
Don't set mem soft limit if not specifiecd
2015-10-30 17:01:36 -04:00
8d7d51190d
Merge pull request #17541 from aboch/uc
...
Modify IPAMConfig structure json tags
2015-10-30 14:01:13 -07:00
f301c5765a
Fix network inspect for default networks.
...
- Keep old fields in NetworkSetting to respect the deprecation policy.
Signed-off-by: David Calavera <david.calavera@gmail.com>
2015-10-30 16:55:21 -04:00
9d14866d71
Windows: Refactor execdriver.Command
...
Signed-off-by: John Howard <jhoward@microsoft.com>
2015-10-30 13:53:00 -07:00
d795bc7d53
Modify IPAMConfig structure json tags
...
- So that it complies with docker convention for inspect
Signed-off-by: Alessandro Boch <aboch@docker.com>
2015-10-30 12:57:49 -07:00
78bd17e805
Force IPC mount to unmount on daemon shutdown/init
...
Instead of using `MNT_DETACH` to unmount the container's mqueue/shm
mounts, force it... but only on daemon init and shutdown.
This makes sure that these IPC mounts are cleaned up even when the
daemon is killed.
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2015-10-30 15:41:48 -04:00
a154b95d06
Merge pull request #17536 from aboch/uc
...
Modify Network structures json tags
2015-10-30 15:28:38 -04:00
b2d0b75018
Modify Network structure json tags
...
- So that they comply with docker inspect convention
Which is allowing camel case for json field names
Signed-off-by: Alessandro Boch <aboch@docker.com>
2015-10-30 11:23:59 -07:00
d5c85897f4
Windows: Allows --isolation on docker build
...
Signed-off-by: John Howard <jhoward@microsoft.com>
2015-10-30 11:14:38 -07:00
0aa3bff482
Merge pull request #17530 from Microsoft/jjh/windowsmasterbuild
...
Build broken on master (awslogs)
2015-10-30 10:39:48 -07:00
17a8fbeaeb
Merge pull request #17514 from mavenugo/ugr
...
Fixing a case of dangling endpoint during ungraceful daemon restart
2015-10-30 13:38:27 -04:00
ecb87ed0a5
Don't set mem soft limit if not specifiecd
...
You cannot do this for individual cgroups for all the containers. Only
set the reservation if the user requested it. The error you will
receive is an EINTVAL when you try to set a large limit like we were in
the memory limit.
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2015-10-30 10:34:01 -07:00
aa832d0197
Merge pull request #17523 from Evalle/17326-fix-ubuntu-installation-instructions
...
Fix ubuntu installation instructions page
2015-10-30 10:10:04 -07:00
f714118439
Merge pull request #17447 from ehaydenr/master
...
Update kill.md
2015-10-30 10:07:44 -07:00
2716e3964d
Windows build broken on master (awslogs)
...
Signed-off-by: John Howard <jhoward@microsoft.com>
2015-10-30 10:02:32 -07:00
c545dce004
Merge pull request #16640 from samuelkarp/awslogs-logging-driver
...
[awslogs] Auto-detect region and set user-agent
2015-10-30 12:38:40 -04:00
aadae4b503
Merge pull request #16412 from Microsoft/10662-hyper-v-containers
...
Windows [TP4]: Adds support for Hyper-V Containers
2015-10-30 09:34:16 -07:00
cf02b369e0
Use json.Encoder for container.toDisk
...
* for simmetry with fromDisk
* it might be slightly better for GC because of internal sync.Pool
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
2015-10-30 09:29:53 -07:00
05534b6f80
Merge pull request #17518 from WeiZhang555/integration-test-bug
...
bug fix for test cases
2015-10-30 16:56:35 +01:00
eb0a208f4b
Fix ubuntu installation instructions page
...
Signed-off-by: evalle <shmarnev@gmail.com>
2015-10-30 15:46:34 +01:00
2c6351a4a5
Merge pull request #17385 from aditirajagopal/16756-upgrade_commit_test
...
Checkers on integration-cli/docker_cli_commit_test
2015-10-30 10:36:41 -04:00
0598ff46ac
Merge pull request #17427 from zelahi/16756-dockercli-killtest
...
modified docker_cli_kill_test.go to use c.Asserts
2015-10-30 12:56:52 +01:00
77488b90c5
Merge pull request #17425 from wenchma/16756-docker_cli_attach_unix_test
...
Using checkers assert for integration-cli/docker_cli_attach_unix_test.go
2015-10-30 12:41:14 +01:00
e990eca1e5
Merge pull request #17510 from LK4D4/refactor_shutdown
...
Refactor Shutdown a little to reduce indentation
2015-10-30 12:24:03 +01:00
855487b379
Merge pull request #17365 from HuKeping/rework-history
...
Rework docker cli history
2015-10-30 10:33:16 +01:00
6b9de7342f
Merge pull request #17498 from LK4D4/fix_graph_comment
...
Fix Graph() docstring
2015-10-30 09:48:16 +01:00
81c5b1ce4a
Merge pull request #17492 from aidanhs/aphs-remove-dead-code
...
Remove dead code
2015-10-30 08:50:54 +01:00
4f3dd3db5a
Merge pull request #17463 from dongluochen/volumeRouter
...
extract docker volume API from local
2015-10-30 08:33:43 +01:00
8f53edae3b
bug fix for test cases
...
Fix bug that `isNwPresent` can't distinguish network names with same
prefix.
Signed-off-by: Zhang Wei <zhangwei555@huawei.com>
2015-10-30 15:13:35 +08:00
483abbb313
Checkers on integration-cli/docker_cli_commit_test
...
Applying #16756 to integration-cli/docker_cli_commit_test.go
Signed-off-by: Aditi Rajagopal <arajagopal@us.ibm.com>
2015-10-29 21:47:54 -05:00
0c07096b7d
Fixes a case of dangling endpoint during ungraceful daemon restart
...
When a container restarts after a ungraceful daemon restart, first
cleanup any unclean sandbox before trying to allocate network resources.
Signed-off-by: Madhu Venugopal <madhu@docker.com>
2015-10-29 18:56:56 -07:00
ebf76171f6
Vendoring libnetwork to solve an ungraceful restart condition
...
Signed-off-by: Madhu Venugopal <madhu@docker.com>
2015-10-29 18:56:17 -07:00
1795eb9545
Merge pull request #17512 from jfrazelle/update-go-deb-rpm
...
update go version for debs and rpms
2015-10-29 18:56:06 -07:00
d7bdbdf564
Merge pull request #17504 from calavera/default_network_driver
...
Let the api to choose the default network driver.
2015-10-29 20:37:21 -04:00
ace5854f65
Refactor Shutdown a little to reduce indentation
...
Also make daemon.netController.Stop() regardless of container existance.
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
2015-10-29 17:20:32 -07:00
985fe8857d
update go version for debs and rpms
...
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
2015-10-29 17:04:38 -07:00
34668ad68b
Let the api to choose the default network driver.
...
That way swarm can understand the user's intention.
Signed-off-by: David Calavera <david.calavera@gmail.com>
2015-10-29 19:47:12 -04:00
c1a5ee53c1
Update kill.md
...
Added Note to show users that signals will not propagate to the container if the preferred exec form isn't used.
Signed-off-by: Eric Rosenberg <ehaydenr@gmail.com>
2015-10-29 18:40:16 -05:00
82203d06eb
Merge pull request #17497 from LK4D4/put_err
...
Do not ignore errors from graphdriver.Put
2015-10-29 19:37:10 -04:00
6c80fd2468
Merge pull request #17228 from ecnahc515/patch-1
...
cliconfig: Do not rely on platform dependent code
2015-10-29 19:29:38 -04:00
d30caedbf8
Merge pull request #17491 from LK4D4/seq_tests
...
Run unit tests as single command
2015-10-29 16:29:24 -07:00
David Calavera
Alexandre Beslic
Donald Huang
Alexander Morozov
Alexander Morozov
Tibor Vass
John Howard
Alessandro Boch
Brian Goff
Jess Frazelle
Michael Crosby
moxiegirl
Vincent Demeester
evalle
Antonio Murdaca
Sebastiaan van Stijn
Zhang Wei
Aditi Rajagopal
Madhu Venugopal
Tianon Gravi
Jessica Frazelle
Eric Rosenberg