David Calavera
d7d512bb92
Rename Daemon.Get to Daemon.GetContainer.
...
This is more aligned with `Daemon.GetImage` and less confusing.
Signed-off-by: David Calavera <david.calavera@gmail.com >
2015-12-11 12:39:28 -05:00
Jean-Laurent de Morlhon
a8ba712286
Use bundled bugsnag APIKey
...
Signed-off-by: Jean-Laurent de Morlhon <jeanlaurent@morlhon.net >
2015-12-11 18:07:23 +01:00
Alexander Morozov
5525593a68
Merge pull request #18595 from mariussturm/gelf-no-trim-18568
...
don't trim GELF message
2015-12-11 07:39:44 -08:00
Jean-Laurent de Morlhon
5dadfe093d
Merge pull request #2557 from dgageot/2553-fix-build-x
...
Fix the build on linux/windows by excluding fusion driver
2015-12-11 16:21:40 +01:00
David Gageot
6ab09860af
Fix the CI on darwin/windows
...
Signed-off-by: David Gageot <david@gageot.net >
2015-12-11 15:46:47 +01:00
David Gageot
f3775f774c
FIX #2553 Fusion Driver is supported only on darwin
...
Signed-off-by: David Gageot <david@gageot.net >
2015-12-11 15:46:47 +01:00
Soshi Katsuta
bbe7a00db5
libmachine/mcnutils: check the version of cached iso and download the latest one when it is out-of-date
...
Signed-off-by: Soshi Katsuta <soshi.katsuta@gmail.com >
2015-12-11 22:04:31 +09:00
David Gageot
54a85e6863
Merge pull request #2555 from jeanlaurent/bugsnag-info-detail
...
Add context, driver name & command to crash report
2015-12-11 13:48:05 +01:00
Jean-Laurent de Morlhon
5f4583bd3f
Add context, driver name & command to crash report
...
Signed-off-by: Jean-Laurent de Morlhon <jeanlaurent@morlhon.net >
2015-12-11 11:39:13 +01:00
Tibor Vass
cd648dce3a
Merge pull request #18242 from jfrazelle/i-have-no-idea
...
Remove ipc rule in docker-engine apparmor profile
2015-12-11 11:23:41 +01:00
Victor Vieux
2497df0862
prevent panic in filters when container has no name
...
Signed-off-by: Victor Vieux <vieux@docker.com >
2015-12-11 02:11:21 -08:00
Jean-Laurent de Morlhon
02dde087c9
Merge pull request #2552 from nathanleclaire/ls_timeout_nits
...
Aesthetic nitpicks on ls timeout
2015-12-11 10:55:40 +01:00
Marius Sturm
a31435c8a2
dont trim gelf log message
...
Signed-off-by: Marius Sturm <marius@graylog.com >
2015-12-11 10:28:24 +01:00
Jean-Laurent de Morlhon
ac41fba24e
Merge pull request #2541 from dougm/env-emacs
...
Add emacs support to env command
2015-12-11 09:37:06 +01:00
Dimitar Bonev
6d709caaa5
Fixes incorrect network name shown in the log when no driver is specified
...
Signed-off-by: Dimitar Bonev <dimitar.bonev@gmail.com >
2015-12-11 10:14:01 +02:00
HuKeping
b78823e5c3
Refactor a little to reduce indentation
...
Signed-off-by: Hu Keping <hukeping@huawei.com >
2015-12-11 15:48:09 +08:00
Ying Li
8fd8916b15
Merge pull request #352 from HuKeping/check-map
...
Use canonical way to check if a map contains a key
2015-12-10 23:13:27 -08:00
Jean-Laurent de Morlhon
974270bb77
Merge pull request #2554 from nathanleclaire/err-recording
...
Add style and phrasing nitpicks
2015-12-11 07:58:30 +01:00
Victor Vieux
f25040f3ab
add RELEASE-CHECKLIST.md
...
Signed-off-by: Victor Vieux <victorvieux@gmail.com >
2015-12-10 22:46:14 -08:00
HuKeping
54af67344b
Minor typo
...
Signed-off-by: Hu Keping <hukeping@huawei.com >
2015-12-11 14:07:38 +08:00
HuKeping
f147a7ac68
Use canonical way to check if a map contains a key
...
As the language spec:
https://golang.org/ref/spec#Index_expressions
Signed-off-by: Hu Keping <hukeping@huawei.com >
2015-12-11 14:07:38 +08:00
Marcelo Salazar R
3e0d4f124e
fix bracket
...
Signed-off-by: Marcelo Salazar R <chelosalazar@gmail.com >
2015-12-11 02:44:19 -03:00
Ying Li
c77bbee0ef
Merge pull request #351 from cyli/better-validation-errors
...
Propagate error validations from server to client
2015-12-10 21:29:57 -08:00
Dima Stopel
b7af5bcd20
Fixing documentation comments by @thaJeztah
...
Signed-off-by: Dima Stopel <dima@twistlock.com >
2015-12-11 07:03:58 +02:00
Victor Vieux
4b33656bb4
return proper error for inspect and proxy on unhealthy node
...
Signed-off-by: Victor Vieux <victorvieux@gmail.com >
2015-12-10 20:05:17 -08:00
Nathan LeClaire
6439ee967d
Add style and phrasing nitpicks
...
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com >
2015-12-10 19:26:05 -08:00
Nathan LeClaire
5358010229
Merge pull request #2526 from jeanlaurent/bugsnag
...
Monitor and report bug with bugsnag
2015-12-10 19:01:22 -08:00
Qiang Huang
c6bfb54ac1
Move verify container resources to a separate function
...
Make the code easy to view.
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com >
2015-12-11 10:59:29 +08:00
Li Yi
54da47d636
Support large layer for OSS driver
...
Signed-off-by: Li Yi <denverdino@gmail.com >
2015-12-11 10:56:50 +08:00
Qiang Huang
464eefd795
Add lock for container update
...
Container needs to be locked when updating the fields, and
this PR also remove the redundant `parseSecurityOpt` since
it'll be done in `setHostConfig`.
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com >
2015-12-11 10:33:13 +08:00
David Calavera
bc02d42d9e
Make sure template inspector always prints a carriage return.
...
To match with the raw inspector.
Adds tests to verify its functionality.
Signed-off-by: David Calavera <david.calavera@gmail.com >
2015-12-10 21:13:13 -05:00
Sebastiaan van Stijn
23bd9b881f
Merge pull request #18577 from devvyn/patch-1
...
Update custom-docker0.md (corrections)
2015-12-11 02:38:24 +01:00
Sebastiaan van Stijn
8cd356630a
Merge pull request #18142 from ekuric/mkimage
...
mkimage-yum.sh to support dnf
2015-12-11 02:27:13 +01:00
Ying Li
8b9cc4c3f6
Minor review comment changes:
...
- add a specific error type when the server is requested to manage
an unsupported key type
- variable name change
Signed-off-by: Ying Li <ying.li@docker.com >
2015-12-10 17:16:53 -08:00
Ying Li
5717258931
When publishing, if no snapshot data exists, create it and then try to sign.
...
This supports the case of a user intializing a repo so that the server
signs the snapshot, and then changing their minds and rotating the keys
so that they now sign the snapshot, but all before publishing a single
thing.
Signed-off-by: Ying Li <ying.li@docker.com >
2015-12-10 16:28:20 -08:00
Jessica Frazelle
b118871190
update w docker-py and toolbox
...
Signed-off-by: Jessica Frazelle <acidburn@docker.com >
2015-12-10 16:15:13 -08:00
Jess Frazelle
a16a1d75d9
Merge pull request #18564 from runcom/warn-on-loopback
...
api: client: info: print a warning if dm is using a loopback file
2015-12-11 10:11:03 +10:00
Daniel Nephin
1d3aeaaae7
Ignore extra coverge files
...
These files are created because we run acceptance tests in a subprocess.
They have the process id in their name, so they wont be removed by the
normal coverage cleanup on each run.
Signed-off-by: Daniel Nephin <dnephin@docker.com >
2015-12-10 15:29:36 -08:00
Doug MacEachern
4e58bb9434
Add emacs support to env command
...
Signed-off-by: Doug MacEachern <dougm@vmware.com >
2015-12-10 15:29:14 -08:00
David Calavera
b89676bead
Merge pull request #18580 from tophj-ibm/fix-typo-blkio-invalid-device
...
Fix typo in named test and docs.
2015-12-10 15:19:41 -08:00
Ying Li
6aa114a49f
Fix all instances where 'propagate' was mispelled as 'propogate'
...
Signed-off-by: Ying Li <ying.li@docker.com >
2015-12-10 15:12:05 -08:00
Ying Li
aaf45a9cce
Refactor Initialize to be easier to read, and update comments per review.
...
Signed-off-by: Ying Li <ying.li@docker.com >
2015-12-10 15:02:31 -08:00
Alexander Morozov
ac453a310b
Merge pull request #18353 from aaronlehmann/transfer-manager
...
Improved push and pull with upload manager and download manager
2015-12-10 14:52:48 -08:00
Nathan LeClaire
18372b13c3
Merge pull request #2550 from dgageot/2479-warn-vbox-version
...
FIX #2479 Warn on VirtualBox version
2015-12-10 14:19:38 -08:00
Nathan LeClaire
29ffc04cc9
Aesthetic nitpicks on ls timeout
...
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com >
2015-12-10 13:25:13 -08:00
Christopher Jones
7c077c2c34
Fixed typo change deivce to device.
...
This changes deivce to device in daemon, test and docs.
Signed-off-by: Christopher Jones <tophj@linux.vnet.ibm.com >
2015-12-10 15:23:05 -06:00
Nathan LeClaire
a5eb979f09
Merge pull request #2546 from jeanlaurent/ls-timeout
...
add timeout override to ls command
2015-12-10 13:09:29 -08:00
Alexander Morozov
9381c744b8
Merge pull request #18566 from coolljt0725/fix_18544
...
Probably fix flaky test TestExecTTY
2015-12-10 12:53:47 -08:00
David Calavera
a0f80079b8
Merge pull request #18557 from cpuguy83/use_correct_resize_fn
...
Use correct fn for resizing TTY
2015-12-10 12:37:13 -08:00
Andrew T Nguyen
80e3d4b219
fix links?
2015-12-10 11:39:21 -08:00