Aanand Prasad
50dcb1d7e7
Merge pull request #2468 from dnephin/increase_timeout_in_tests
...
Increase timeout in tests
2015-12-07 14:29:08 +00:00
Phil Estes
7d6a2e3cf5
Merge pull request #18451 from WeiZhang555/net-err
...
Better error message for network connect
2015-12-07 09:17:48 -05:00
Tibor Vass
1f8efc687c
Merge pull request #18123 from aidanhs/aphs-fail-on-broken-tar
...
Ensure adding a broken tar doesn't silently fail
2015-12-07 14:38:21 +01:00
Doug Davis
2ecbc9774b
Merge pull request #18463 from haoshuwei/modify-containerinspect-tocheckstatuscode
...
Modify docker inspect client to check statusCode instead of strings c…
2015-12-07 07:55:26 -05:00
Doug Davis
0bb4f82d2d
Merge pull request #18425 from wenchma/18424-ErrorCodeNoSuchContainer
...
Correct the message of ErrorCodeNoSuchContainer to "No such container"
2015-12-07 07:48:04 -05:00
Tibor Vass
ce7ae7868e
Merge pull request #18468 from iGusev/patch-1
...
added rm flag to backup/restore commands in examples
2015-12-07 13:38:16 +01:00
Tibor Vass
f7c0d0ec50
Merge pull request #18105 from mishak87/registry-improvements
...
Registry tiny code improvements
2015-12-07 13:35:02 +01:00
Ilya Gusev
8923c30b4a
Update dockervolumes.md
...
added rm flag to backup/restore commands in examples
Signed-off-by: Ilya Gusev <mail@igusev.ru >
2015-12-07 15:20:10 +03:00
Vincent Demeester
6fcd33b576
Merge pull request #18462 from haoshuwei/modify-networkinspect-tocheckstatuscode
...
Modify docker network inspect client to check statusCode instead of s…
2015-12-07 12:48:41 +01:00
Tibor Vass
ba77a5b46f
Merge pull request #18329 from liusdu/mount_err
...
Fix rm container error in aufs and devicemapper after daemon crash
2015-12-07 12:47:52 +01:00
Shuwei Hao
6306eb3cd3
Modify docker network inspect client to check statusCode instead of string contain
...
Signed-off-by: Shuwei Hao <haoshuwei24@gmail.com >
2015-12-07 10:11:46 +00:00
Jean-Laurent de Morlhon
010a1c76e2
Use logrus
...
Signed-off-by: Jean-Laurent de Morlhon <jeanlaurent@morlhon.net >
2015-12-07 11:08:50 +01:00
Jean-Laurent de Morlhon
6fe3b5581e
vendoring logrus
...
Signed-off-by: Jean-Laurent de Morlhon <jeanlaurent@morlhon.net >
2015-12-07 11:08:50 +01:00
Joel Hansson
6480feb766
Enable ptrace in a container on apparmor below 2.9
...
Ubuntu 14.04 LTS is on apparmor 2.8.95.
This enables `ps` inside a container without causing
audit log entries on the host.
Signed-off-by: Joel Hansson <joel.hansson@ecraft.com >
2015-12-07 11:08:49 +01:00
Shuwei Hao
e719c9225c
Modufy docker inspect client to check statusCode instead of strings contains
...
Signed-off-by: Shuwei Hao <haosw@cn.ibm.com >
2015-12-07 10:03:46 +00:00
Nick Jones
f2c232bb10
Only allocate a tty if we detect one
...
Signed-off-by: Nick Jones <nick@nicksays.co.uk >
2015-12-07 09:56:28 +00:00
Zhang Wei
8edb941b79
Better error message for network connect
...
Use better error message when user want to connect container with same
name to one network, this can help avoid confusion.
Signed-off-by: Zhang Wei <zhangwei555@huawei.com >
2015-12-07 17:39:13 +08:00
Jean-Laurent de Morlhon
1079735af8
Remove withFields
...
Signed-off-by: Jean-Laurent de Morlhon <jeanlaurent@morlhon.net >
2015-12-07 10:34:43 +01:00
Jean-Laurent de Morlhon
2e79f67e93
Cleanup stdout/stderr log initialization
...
Signed-off-by: Jean-Laurent de Morlhon <jeanlaurent@morlhon.net >
2015-12-07 10:33:32 +01:00
Jean-Laurent de Morlhon
892e19c019
delete unused method
...
Signed-off-by: Jean-Laurent de Morlhon <jeanlaurent@morlhon.net >
2015-12-07 10:33:32 +01:00
Jean-Laurent de Morlhon
109bea4151
Extract interface and Remove log.print
...
Signed-off-by: Jean-Laurent de Morlhon <jeanlaurent@morlhon.net >
2015-12-07 10:33:32 +01:00
Sebastiaan van Stijn
91657008f2
Merge pull request #18458 from vdemeester/fix-volume-test
...
Fix DockerSuite.TestVolumeCliInspectMulti
2015-12-07 10:26:18 +01:00
Harald Albers
d7c9ae60e6
Improve bash completion for docker network disconnect
...
Signed-off-by: Harald Albers <github@albersweb.de >
2015-12-07 09:55:00 +01:00
David Gageot
7f499308fc
Merge pull request #2507 from dgageot/dead-code
...
Remove dead code
2015-12-07 09:51:07 +01:00
Jean-Laurent de Morlhon
760e814d43
Merge pull request #2501 from fsoppelsa/2478-sanitizekey
...
Sanitize keynames by replacing dots with underscores
2015-12-07 09:41:34 +01:00
Jean-Laurent de Morlhon
ff54bf1b0c
Merge pull request #2505 from kunalkushwaha/bugfix#2504
...
Bugfix#2504 Rename of temp file fails.
2015-12-07 09:40:42 +01:00
Jean-Laurent de Morlhon
1de66c75e4
Merge pull request #2503 from larskanis/fix-amd-svm-detection-on-linux
...
Fix detection of virtualization support on AMD CPU.
2015-12-07 09:37:54 +01:00
David Gageot
293055fcbc
Remove dead code
...
Signed-off-by: David Gageot <david@gageot.net >
2015-12-07 09:15:12 +01:00
Harald Albers
2525752a05
Use more robust download URL for completions
...
Signed-off-by: Harald Albers <github@albersweb.de >
2015-12-07 09:10:19 +01:00
Vincent Demeester
d125ddaeda
Fix DockerSuite.TestVolumeCliInspectMulti
...
Use dockerCmdWithError now that it actually returns an error code.
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
2015-12-07 08:34:18 +01:00
Lars Kanis
850e2646a6
Fix detection of virtualisation support on AMD CPU.
...
This also changes the amd test case to /proc/cpuinfo content of
a real AMD CPU.
Signed-off-by: Lars Kanis <lars@greiz-reinsdorf.de >
2015-12-07 07:39:24 +01:00
Alexandre Beslic
0b0e328b7b
Merge pull request #1472 from abronan/improve_docs_duplicate_engine_ids
...
Add clarification on install for VM cloning and Engine ID duplication issue
2015-12-06 21:39:37 -08:00
Alexandre Beslic
75a3ac2c7f
add clarification on install for VM cloning and Engine ID duplication problem
...
Signed-off-by: Alexandre Beslic <abronan@docker.com >
2015-12-06 21:27:37 -08:00
Kunal Kushwaha
66db37814d
Bugfix#2504 Rename of temp file fails.
...
Tempfile was not closed, so rename opertion was failing.
Minor code refactor is done, to make function more readable.
Signed-off-by: Kunal Kushwaha <kushwaha_kunal_v7@lab.ntt.co.jp >
2015-12-07 14:02:36 +09:00
moxiegirl
63ba877cff
Merge pull request #1506 from thaJeztah/fix-readme-links
...
Fix broken links in discovery README
2015-12-06 20:49:29 -08:00
James Turnbull
78d8df73b5
Merge pull request #18460 from thaJeztah/fix-pull-by-digest
...
docs: fix pull by digest example
2015-12-06 18:08:51 -06:00
Sebastiaan van Stijn
f27572312f
Fix pull by digest example
...
Also reduced the column spacing in the output, so
that more output is visible in the documentation.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
2015-12-07 00:58:46 +01:00
Sebastiaan van Stijn
fe0a2a9427
Fix broken links in discovery README
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
2015-12-07 00:43:17 +01:00
John Howard
c07e79fa8a
Windows CI Fix: Allow bash v4
...
Signed-off-by: John Howard <jhoward@microsoft.com >
2015-12-06 14:40:29 -08:00
James Turnbull
6b8d8bfbf8
Merge pull request #18454 from dcylabs/master
...
added albatros library
2015-12-06 15:01:55 -06:00
dcylabs
a94bede2aa
added albatros library
...
Signed-off-by: dcylabs <dcylabs@gmail.com >
2015-12-06 20:40:42 +01:00
Sebastiaan van Stijn
02cd3c9413
Add more projects
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
2015-12-06 18:03:16 +01:00
Sebastiaan van Stijn
715f6a135c
Merge pull request #17741 from dhiltgen/pull_token
...
Add token pass-thru for AuthConfig
2015-12-06 16:40:06 +01:00
ahaurw01
bd6ad72c29
Add a note to install-w-machine with pointers if hosted discovery is down
...
Signed-off-by: Aaron Haurwitz <aaron.haurwitz@gmail.com >
2015-12-06 10:34:20 -05:00
Vincent Demeester
32f08e06e6
Merge pull request #18349 from mrfuxi/cli-specific-errors-in-api
...
Remove CLI specific information for API error messages. Issue #17147
2015-12-06 16:02:40 +01:00
Sebastiaan van Stijn
5b4734aaa5
Merge pull request #17788 from haoshuwei/modify-volume-inspect-multi
...
Modify docker volume inspect to return existed volumes and the names of the unexsited volumes
2015-12-06 14:03:46 +01:00
Alexandre Beslic
3048dc996d
Merge pull request #1497 from vieux/emphasis_token_not_prod
...
emphasize the hosted discovery service is not meant for production
2015-12-06 01:16:22 -08:00
Alexandre Beslic
501b9609dd
fix typos and add note in discovery README for token usage scenarios
...
Signed-off-by: Alexandre Beslic <abronan@docker.com >
2015-12-06 01:04:30 -08:00
Sebastiaan van Stijn
ac210c4483
Merge pull request #40 from thaJeztah/more-more-more
...
Add boot2docker maintainers
2015-12-06 01:56:12 +01:00
Sebastiaan van Stijn
94d5b3dffe
Add boot2docker maintainers
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
2015-12-06 01:50:52 +01:00