Vincent Demeester
05534b6f80
Merge pull request #17518 from WeiZhang555/integration-test-bug
...
bug fix for test cases
2015-10-30 16:56:35 +01:00
Daniel Nephin
491d052088
Don't set a default network driver, let the server decide.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
2015-10-30 11:53:36 -04:00
David Gageot
0176f05db8
FIX #2127 Detect that HW virtualization is not supported
...
Signed-off-by: David Gageot <david@gageot.net >
2015-10-30 16:19:38 +01:00
Shijiang Wei
5970e94072
dont try to remove builtin networks in teardown
...
Signed-off-by: Shijiang Wei <mountkin@gmail.com >
2015-10-30 23:05:33 +08:00
Daniel Nephin
c439e056a0
Merge pull request #2288 from dnephin/warning_about_vars
...
Add console color to warnings and errors so they are more obvious
2015-10-30 10:58:00 -04:00
evalle
eb0a208f4b
Fix ubuntu installation instructions page
...
Signed-off-by: evalle <shmarnev@gmail.com >
2015-10-30 15:46:34 +01:00
Daniel Nephin
04a76dc284
Merge pull request #2287 from shin-/2284-ensure-network-exists-run
...
Ensure network exists when calling run before up
2015-10-30 10:41:55 -04:00
Brian Goff
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
Joffrey F
072e7687ae
Integration test for run command with networking enabled
...
Signed-off-by: Joffrey F <joffrey@docker.com >
2015-10-30 14:15:47 +01:00
Vincent Demeester
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
Antonio Murdaca
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
Antonio Murdaca
e990eca1e5
Merge pull request #17510 from LK4D4/refactor_shutdown
...
Refactor Shutdown a little to reduce indentation
2015-10-30 12:24:03 +01:00
Sebastiaan van Stijn
855487b379
Merge pull request #17365 from HuKeping/rework-history
...
Rework docker cli history
2015-10-30 10:33:16 +01:00
Antonio Murdaca
6b9de7342f
Merge pull request #17498 from LK4D4/fix_graph_comment
...
Fix Graph() docstring
2015-10-30 09:48:16 +01:00
Vincent Demeester
81c5b1ce4a
Merge pull request #17492 from aidanhs/aphs-remove-dead-code
...
Remove dead code
2015-10-30 08:50:54 +01:00
Victor Vieux
1c1a99038e
ensure docker network inspect is the same as the engine one
...
Signed-off-by: Victor Vieux <vieux@docker.com >
2015-10-30 00:38:42 -07:00
Vincent Demeester
4f3dd3db5a
Merge pull request #17463 from dongluochen/volumeRouter
...
extract docker volume API from local
2015-10-30 08:33:43 +01:00
Zhang Wei
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
Victor Vieux
a36a9b416c
update network types
...
Signed-off-by: Victor Vieux <vieux@docker.com >
2015-10-30 00:03:08 -07:00
Diogo Mónica
7e5cc048b7
Merge pull request #253 from cyli/prometheus-server
...
Add prometheus stats to server http handlers
2015-10-29 22:22:24 -07:00
Victor Vieux
0a8cf2cf06
Merge pull request #1355 from jimmyxian/fix-push-image
...
fix push image
2015-10-29 22:00:24 -07:00
Ying Li
5ea5b40d3f
Add prometheus stats to server http handlers
...
Signed-off-by: Ying Li <ying.li@docker.com >
2015-10-29 21:04:35 -07:00
Emmanuel Bretelle
42f1dbb964
virtualbox: support linux host
...
Fixes #2110
Signed-off-by: Emmanuel Bretelle <chantr4@gmail.com >
2015-10-29 20:21:10 -07:00
Ying Li
3bd4637b09
Merge pull request #251 from HuKeping/fix-list
...
Fix broken list
2015-10-29 20:03:49 -07:00
Aditi Rajagopal
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
HuKeping
169d67169c
Fix broken list
...
Signed-off-by: Hu Keping <hukeping@huawei.com >
2015-10-30 10:46:06 +08:00
Jeffrey Morgan
8c128e746d
Fix bug where upgrade would fail if VM is stopped.
...
Signed-off-by: Jeffrey Morgan <jmorganca@gmail.com >
2015-10-29 19:06:15 -07:00
Ying Li
4c195db439
Merge pull request #249 from jfrazelle/dockerfile-cleanup
...
better named dockerfiles and upgrade to go 1.5.1
2015-10-29 19:04:11 -07:00
Madhu Venugopal
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
Madhu Venugopal
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
Tianon Gravi
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
Jeffrey Morgan
1f04b1ea02
Merge branch 'master' of github.com:docker/toolbox
2015-10-29 18:48:48 -07:00
Jeffrey Morgan
2d3a95a0e8
Bump versions for rc3
...
Signed-off-by: Jeffrey Morgan <jmorganca@gmail.com >
2015-10-29 18:48:44 -07:00
David Lawrence
7a24fbf32f
adding singer interfaces to private keys:
...
Signed-off-by: David Lawrence <david.lawrence@docker.com > (github: endophage)
2015-10-29 17:48:15 -07:00
David Lawrence
e904675043
Merge pull request #247 from cyli/remove-unlocked-cryptoservice
...
Remove unlocked_cryptoservice and GetRootCryptoService
2015-10-29 17:47:31 -07:00
Tibor Vass
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
Alexander Morozov
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
Jessica Frazelle
4e59ed05bc
better named dockerfiles and upgrade to go 1.5.1
...
Signed-off-by: Jessica Frazelle <acidburn@docker.com >
2015-10-29 17:18:43 -07:00
Jessica Frazelle
985fe8857d
update go version for debs and rpms
...
Signed-off-by: Jessica Frazelle <acidburn@docker.com >
2015-10-29 17:04:38 -07:00
French Ben
14658306ba
Merge pull request #1157 from kitematic/revert-1155-1061-VM-name
...
Revert "Added selector for VM fixes #1061 "
2015-10-29 17:02:09 -07:00
French Ben
df9e18240f
Revert "Added selector for VM fixes #1061 "
2015-10-29 16:52:13 -07:00
David Calavera
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
Eric Rosenberg
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
Brian Goff
82203d06eb
Merge pull request #17497 from LK4D4/put_err
...
Do not ignore errors from graphdriver.Put
2015-10-29 19:37:10 -04:00
Ying Li
91d54899d7
Add a GetPrivateKey method to cryptoservice so that we can future-proof
...
cryptoservice having multiple keystores
Signed-off-by: Ying Li <ying.li@docker.com >
2015-10-29 16:34:40 -07:00
Ying Li
7dc0dbec84
Remove the cryptoservice argument to sign
...
Signed-off-by: Ying Li <ying.li@docker.com >
2015-10-29 16:34:21 -07:00
Brian Goff
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
Jess Frazelle
d30caedbf8
Merge pull request #17491 from LK4D4/seq_tests
...
Run unit tests as single command
2015-10-29 16:29:24 -07:00
Jeffrey Morgan
60db63d38c
Update circle.yml
2015-10-29 16:22:23 -07:00
John Howard
15e35c4470
Windows: Adds support for Hyper-V Containers
...
Signed-off-by: John Howard <jhoward@microsoft.com >
2015-10-29 16:18:52 -07:00