Ying Li
cc03297c77
Merge pull request #418 from HuKeping/prompt
...
Fix here document
2016-01-06 11:04:21 -08:00
Ying Li
6a45508107
Add a miscellaneous script for testing docker trust functions with notary.
...
Signed-off-by: Ying Li <ying.li@docker.com >
2016-01-06 10:46:07 -08:00
Arthur Baars
bb1e9e0a82
GCS Storagedriver: fix test failure caused by #1187
...
Signed-off-by: Arthur Baars <arthur@semmle.com >
2016-01-06 18:36:28 +00:00
Jess Frazelle
7104f58ac2
Merge pull request #19136 from albers/completion-update
...
bash completion for `docker update`
2016-01-06 10:36:15 -08:00
Dong Chen
58a0e1719d
Update failureCount scenario and test cases.
...
Signed-off-by: Dong Chen <dongluo.chen@docker.com >
2016-01-06 10:33:51 -08:00
Daniel Nephin
c7b71422c0
Fix extends with multiple files.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
2016-01-06 13:30:40 -05:00
Harald Albers
97f84b5dc1
bash completion for docker update
...
Signed-off-by: Harald Albers <github@albersweb.de >
2016-01-06 10:20:33 -08:00
Jessica Frazelle
2b4f64e590
fix proc regex
...
Signed-off-by: Jessica Frazelle <acidburn@docker.com >
2016-01-06 10:08:35 -08:00
Jean-Laurent de Morlhon
e681a4bb50
Merge pull request #2754 from dgageot/shell-bugsnag
...
Improve shell detection in bugsnag reports
2016-01-06 18:58:56 +01:00
Arthur Baars
d3d40a8807
GCS driver: fix retry function
...
Signed-off-by: Arthur Baars <arthur@semmle.com >
2016-01-06 17:57:22 +00:00
Nathan LeClaire
04160e392b
Merge pull request #2760 from dgageot/disable-old-vbox
...
Disable support for VBox <= 4.2
2016-01-06 09:52:22 -08:00
Doug Davis
d3ea7e80e8
Add default PATH to 'scratch' images
...
Closes #19012
Signed-off-by: Doug Davis <dug@us.ibm.com >
2016-01-06 09:50:35 -08:00
Tõnis Tiigi
fe550a1f17
Merge pull request #19093 from estesp/userns-root-rework
...
Allow root non-userns metadata backwards compatibility
2016-01-06 09:48:37 -08:00
Brian Goff
5d1dd8069b
Add docs for volume plugin ls/get
...
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
2016-01-06 12:42:44 -05:00
Tõnis Tiigi
8420366e7c
Merge pull request #19132 from icecrime/maintainer_add_tonis
...
Add Tõnis Tiigi to MAINTAINERS
2016-01-06 09:34:38 -08:00
David Calavera
4b1872f1ef
Merge pull request #18979 from jfrazelle/make-whitelist
...
Change seccomp blacklist to a whitelist
2016-01-06 09:15:25 -08:00
Arnaud Porterie
178806d2b8
Add Tõnis Tiigi to MAINTAINERS
...
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com >
2016-01-06 08:51:52 -08:00
Ying Li
f211b1826d
Merge pull request #421 from justincormack/arm
...
Update jose2go to latest to fix #239
2016-01-06 08:39:37 -08:00
Brian Goff
279dd092b6
Don't error out on plugin err with json
...
We don't want to error out when there is a json unmarshal error since
the `old way` will cause this to error.
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
2016-01-06 11:34:14 -05:00
David Gageot
e28f7d5aa9
FIX #2498 Introduce CI tests for external binary compatibility
...
Signed-off-by: David Gageot <david@gageot.net >
2016-01-06 17:09:03 +01:00
David Gageot
fc025e1984
FIX #2746 Improve shell detection in bugsnag reports
...
Signed-off-by: David Gageot <david@gageot.net >
2016-01-06 16:57:33 +01:00
David Gageot
7cf9ae71be
Support creating a machine on an existing google VM
...
Signed-off-by: David Gageot <david@gageot.net >
2016-01-06 16:55:56 +01:00
Jean-Laurent de Morlhon
ad3e6b5bf0
Merge pull request #2759 from dgageot/better-windows-version-detection
...
Better windows version detection
2016-01-06 16:16:01 +01:00
Jean-Laurent de Morlhon
32c75580bc
Merge pull request #2755 from dgageot/bash-windows-path
...
FIX #2723 invalid path to docker-machine.exe on Windows/bash
2016-01-06 16:14:27 +01:00
Jean-Laurent de Morlhon
e9be8eef71
Merge pull request #2757 from dgageot/fix-broken-vtx-detection
...
Fix broken VTx detection
2016-01-06 16:11:46 +01:00
Jean-Laurent de Morlhon
4fe3bdb628
Merge pull request #2758 from dgageot/remove-dead-code
...
Remove Dead code
2016-01-06 16:11:15 +01:00
Sebastiaan van Stijn
9cf29be0ee
Add -f flag to cURL install instructions
...
From the -f description:
(HTTP) Fail silently (no output at all) on server errors. This is mostly done
to better enable scripts etc to better deal with failed attempts. In normal
cases when an HTTP server fails to deliver a document, it returns an HTML
document stating so (which often also describes why and more). This flag will
prevent curl from outputting that and return error 22.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
2016-01-06 16:05:16 +01:00
Justin Cormack
00efd4a4c9
Update jose2go to latest to fix #239
...
This seems to have never been applied; fixes Arm build
Signed-off-by: Justin Cormack <justin.cormack@unikernel.com >
2016-01-06 14:04:25 +00:00
Victor Vieux
a931c78540
Before that change, etcd and zookeeper would fail to instantiate
...
the discovery without the key being already there in the store or
created beforehand and implicitely by a 'swarm join'.
Signed-off-by: Alexandre Beslic <abronan@docker.com >
Signed-off-by: Victor Vieux <vieux@docker.com >
This PR allows to configure the discovery path using the
--discovery-opt flag (with "kv.path=path/to/nodes"). We
can point to "docker/nodes" and use the docker discovery.
If docker instances are advertising to the cluster using
the `--cluster-advertise` flag, the swarm join command
becomes unnecessary.
Signed-off-by: Alexandre Beslic <abronan@docker.com >
Signed-off-by: Victor Vieux <vieux@docker.com >
2016-01-06 05:18:52 -08:00
David Gageot
5e75bf3346
Fix broken VTx detection
...
Signed-off-by: David Gageot <david@gageot.net >
2016-01-06 12:42:46 +01:00
David Gageot
dcc77f8891
FIX #2756 Disable support for VBox <= 4.2
...
Signed-off-by: David Gageot <david@gageot.net >
2016-01-06 12:41:39 +01:00
David Gageot
f466aa9499
FIX #2745 better Windows version detection
...
Signed-off-by: David Gageot <david@gageot.net >
2016-01-06 12:36:23 +01:00
David Gageot
af09ebbe4e
This code is only useful to crash reports
...
Signed-off-by: David Gageot <david@gageot.net >
2016-01-06 12:36:22 +01:00
David Gageot
b0d265a68b
Remove Dead code
...
Signed-off-by: David Gageot <david@gageot.net >
2016-01-06 11:51:30 +01:00
David Gageot
b36fcbce2c
FIX #2723 invalid path to docker-machine.exe on Windows/bash
...
Signed-off-by: David Gageot <david@gageot.net >
2016-01-06 11:01:10 +01:00
David Gageot
7442ccc585
Merge pull request #2738 from jeanlaurent/better-remove
...
Enhance remove
2016-01-06 09:39:40 +01:00
HuKeping
39701bc858
Fix here document
...
It seems the prompt doesn't work here.
Signed-off-by: Hu Keping <hukeping@huawei.com >
2016-01-06 14:46:06 +08:00
Nathan LeClaire
1a72fab4d0
Merge pull request #2743 from dgageot/crash
...
Crash reporting shouldn't use global variables
2016-01-05 19:20:22 -08:00
Nathan LeClaire
222791fec4
Merge pull request #2744 from dgageot/vtx-hyperv
...
Tell the user that Hyperv could cause VBox to fail
2016-01-05 19:20:10 -08:00
Carol Fager-Higgins
532d3a6911
edited and finalized docs for cs-engine
...
Signed-off-by: Carol Fager-Higgins <carol.fager-higgins@docker.com >
2016-01-05 18:11:30 -08:00
Brian Goff
5ccd33134f
Merge pull request #19113 from Microsoft/jjh/fix-windows-builder
...
Windows: Fix docker build not to sigsegv the daemon
2016-01-05 20:54:00 -05:00
Xian Chaobo
ef8fb1cbc8
Merge pull request #1579 from vieux/fix_api_code
...
fix status code when container found on unhealthy node
2016-01-06 09:30:25 +08:00
Dongluo Chen
82df09b537
Merge pull request #1586 from vieux/fix_soft_affinity_reschedule
...
fix soft affinity reschedule
2016-01-05 17:27:31 -08:00
David Calavera
18d15babef
Do not perform build context switch when content trust is not enabled.
...
Signed-off-by: David Calavera <david.calavera@gmail.com >
2016-01-05 19:23:20 -05:00
Dong Chen
6a1b49cf4e
Fix format issue in state.bats.
...
Signed-off-by: Dong Chen <dongluo.chen@docker.com >
2016-01-05 16:20:38 -08:00
John Howard
1094542c4c
Windows: Fix build not to sigsegv
...
Signed-off-by: John Howard <jhoward@microsoft.com >
2016-01-05 16:08:04 -08:00
Srini Brahmaroutu
9982631707
update runc to the latest code base to fix gccgo build
...
Signed-off-by: Srini Brahmaroutu <srbrahma@us.ibm.com >
2016-01-06 00:02:56 +00:00
Dong Chen
9a1584d508
Update integration test. Reduce pending node validation sleep interval. Each pending node has its own validation interval according to failure count. So reducing sleep interval is not increasing validation frequency for unreachable nodes.
...
Signed-off-by: Dong Chen <dongluo.chen@docker.com >
2016-01-05 15:56:55 -08:00
Joffrey F
1dcdd98da4
Add TODO note to restore n-1 version testing after 1.10 release
...
Signed-off-by: Joffrey F <joffrey@docker.com >
2016-01-05 15:24:58 -08:00
DJ Enriquez
b49c4fff95
Applying recommended changes
...
- Adding clarification to the “chunksize” definition
- Changing short-hand “/w” to “with”
Signed-off-by: DJ Enriquez <dj.enriquez@infospace.com >
2016-01-05 15:22:35 -08:00