07c93dcdba
Merge pull request #14127 from vbatts/vbatts-dm-active-external
...
pkg/devicemapper: external device activation
Upstream-commit: c7492126ef68786a4c57e5e2affb7cba293be652
Component: engine
2015-07-06 14:07:33 -04:00
f17280b05c
Merge pull request #14344 from Mashimiao/add-json-check-for-execcreate
...
api/server: Add missing json check
Upstream-commit: 26a35dd09b4faf39a99ff224f5cd4e14ae368585
Component: engine
2015-07-05 19:04:12 -04:00
461cafcee4
Carries and closes 13361
...
Signed-off-by: Mary Anthony <mary@docker.com >
Upstream-commit: 2c5e044b59c5f37381a22d9a3e8414314802c225
Component: engine
2015-07-04 18:12:52 -07:00
ef90db9fac
Merge pull request #14392 from moxiegirl/fix-fedora-table
...
Table formatting was broken
Upstream-commit: 7aa554c4447adc4186bc554d75f7e5ae48e45fb5
Component: engine
2015-07-04 16:30:17 -07:00
326b0850c7
Merge pull request #14235 from mlarcher/mlarcher-patch-2
...
Add workaround in docs for git bash usage issue
Upstream-commit: 57286aad252a4f22e499c85dd1c27e034f7d87e2
Component: engine
2015-07-04 21:00:53 +02:00
a4234c8502
Merge pull request #14309 from Tenk42/14287-wheezy-link-broken-on-debian-page
...
Fixing Wheezy link on debian installation page
Upstream-commit: f240bb5e941f664b23e7c625378bf72bc882ea71
Component: engine
2015-07-04 14:57:00 -04:00
e0231e4d94
Table formatting was broken
...
Signed-off-by: Mary Anthony <mary@docker.com >
Upstream-commit: 762214ccc860cbe41cb84a4078adfbe4cd92e149
Component: engine
2015-07-04 07:32:58 -07:00
da961c7e1a
Merge pull request #14374 from Mashimiao/clinent-load-tiny-typo-fix
...
client/load: tiny typo fix
Upstream-commit: 36958ba49b55c5b03c281ee1efe2b8025d29cb85
Component: engine
2015-07-04 00:24:21 +02:00
ebc23e68c9
Add break after key is found in for loop
...
Signed-off-by: Antonio Murdaca <runcom@linux.com >
Upstream-commit: a5be8034589fe024ce421b4a7d34739be2a1a8af
Component: engine
2015-07-03 20:37:34 +02:00
eb2ef8d257
Merge pull request #14195 from ch3lo/master
...
update in Kitematic OS support
Upstream-commit: bca32648f4ac21b5185cdba2d1fd50b5f8aa1466
Component: engine
2015-07-03 18:05:27 +02:00
fdd86a6c80
update in Kitematic OS support
...
Kitematic now support Windows
Signed-off-by: Marcelo Salazar R <chelosalazar@gmail.com >
Upstream-commit: 1b3bde47ef5a7c4b178bb3d0cab6e4238e5cc124
Component: engine
2015-07-03 12:32:00 -03:00
057d94db14
Merge pull request #14159 from tristan0x/patch-1
...
docker-hub Admin right gives access to build logs
Upstream-commit: a89f4e36ab7e8b927c92fa5a170213e7135ae75e
Component: engine
2015-07-03 16:56:04 +02:00
907298f6f9
Rewrite DockerHub group permissions documentation
...
On behalf of @moxiegirl
https://gist.github.com/moxiegirl/1c34957b9edc0f6d528c#file-gistfile1-md
Signed-off-by: Tristan Carel <tristan.carel@gmail.com >
Upstream-commit: 515df52f19314f48d4a2cb4aa7f672d1e4eb7703
Component: engine
2015-07-03 16:29:30 +02:00
87e1c90703
Merge pull request #14377 from coolljt0725/validate_restart_policy
...
Validate restart policy. Fixes #14351
Upstream-commit: 0dedadd4d6565b497030456be6512c85215229b3
Component: engine
2015-07-03 07:01:44 -05:00
0d4791f838
Validate restart policy. Fixes #14351
...
Signed-off-by: Lei Jitang <leijitang@huawei.com >
Upstream-commit: f3faf599250e6de3dff340a2e9a72c89c31ba9db
Component: engine
2015-07-03 17:33:33 +08:00
45f765fb3b
Add workaround in docs for git bash usage issue
...
When using boot2docker through git bash, there is a nasty issue when trying to share a folder, due to how git bash parses the URIs. The issue is explained in [issue #12751 ](https://github.com/docker/docker/issues/12751 ) but needs more visibility in the docs.
Signed-off-by: Matthieu Larcher <github@ringabell.org >
Upstream-commit: 33be2c5d2ed15a2f9bb272ac9492ad36113ddb32
Component: engine
2015-07-03 09:07:44 +02:00
26b82c6f4b
Edit "Working with Containers" page for readability
...
Signed-off-by: ayoshitake <airandfingers@gmail.com >
Upstream-commit: 0ed7fd46b6a02203bb6ddaf5cb004641e127da49
Component: engine
2015-07-02 23:10:36 -07:00
08ad652976
api/server: Add missing json check
...
Signed-off-by: Ma Shimiao <mashimiao.fnst@cn.fujitsu.com >
Upstream-commit: 801a7fed19643b7b89929daf53b37e0630e05586
Component: engine
2015-07-03 08:52:32 +08:00
ed646be3f9
client/load: tiny typo fix
...
Signed-off-by: Ma Shimiao <mashimiao.fnst@cn.fujitsu.com >
Upstream-commit: 87cfc2bc58628eb432e326439c1fceeff03704b8
Component: engine
2015-07-03 08:37:27 +08:00
b1f999a90f
Merge pull request #14190 from ankushagarwal/experimentalDownloadLink
...
Document the location of experimental binary
Upstream-commit: d7326bd78767bfd5d2c7025667b5d3437793c5f4
Component: engine
2015-07-02 20:14:15 -04:00
5f24ffae53
Merge pull request #14295 from Lennie/patch-1
...
Fix for broken link
Upstream-commit: 7dc8e77cc7ef5a95b2a1b688ff963aab3eed81ff
Component: engine
2015-07-02 19:24:57 -04:00
abd0d1c1c1
Document the location of experimental binary
...
Some devs might want to download the binary directly,
especially for systems where the install script does not
work.
Signed-off-by: Ankush Agarwal <ankushagarwal11@gmail.com >
Upstream-commit: 01cfb70b0abb4a49c3f04101d8a8d6f59cd69ad0
Component: engine
2015-07-02 15:59:13 -07:00
716fca6f61
Merge pull request #14349 from hqhq/hq_error_for_todisk
...
Show error message when todisk failed
Upstream-commit: 5b2d14fbbf1f4c237cf8f2a3c1b6ec802a68f135
Component: engine
2015-07-02 15:56:56 -07:00
39102aeb7c
add no cache for experimental builds bc cloudfront
...
Signed-off-by: Jessica Frazelle <princess@docker.com >
Upstream-commit: 0cc664fae31549ab4445726ffa41648113394bdb
Component: engine
2015-07-02 13:50:11 -07:00
7e46cb813f
Merge pull request #14359 from cpuguy83/14354_events_send_resp_immediately
...
Send resp immediately on GET /events
Upstream-commit: 71f8ca30ce7420b17151405638151bf9661a8134
Component: engine
2015-07-02 12:00:45 -07:00
bc7c7e9f54
Merge pull request #14292 from calavera/fix_driver_detection
...
Fix implicit DeviceMapper selection
Upstream-commit: f0ed68f852e33ed21420959790be4741725b03b1
Component: engine
2015-07-02 11:33:55 -07:00
cc14e828d1
Merge pull request #13851 from ewindisch/no-allow-rc4
...
Remove RC4 from the list of registry cipher suites
Upstream-commit: e3d488e280caf44d790d5c1cbbff944fcb26a72c
Component: engine
2015-07-02 13:11:40 -04:00
7a9ceedb89
Merge pull request #14350 from moysesb/fixdoc
...
Fixed outdated comment.
Upstream-commit: 36f6b7331ee9e864c1ea0c93dfde938fc078aa07
Component: engine
2015-07-02 10:06:31 -07:00
740b021c6a
Fix implicit DeviceMapper selection
...
DeviceMapper must be explicitly selected because the Docker binary might not be linked to the right devmapper library.
With this change, Docker fails fast if the driver detection finds the devicemapper directory but the driver is not the default option.
The option `override_udev_sync_check` doesn't make sense anymore, since the user must be explicit to select devicemapper, so it's being removed.
Docker fails to use devicemapper only if Docker has been built statically unless the option was explicit.
Signed-off-by: David Calavera <david.calavera@gmail.com >
Upstream-commit: 0a376291b2213699f986a7bca1cc8c4f4ed00f8d
Component: engine
2015-07-02 09:21:27 -07:00
fb7c276639
Send resp immediately on GET /events
...
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
Upstream-commit: d0a299c027fc6b075bed4992329f93e618186a83
Component: engine
2015-07-02 11:45:24 -04:00
fb10c26588
Merge pull request #14355 from vdemeester/log-to-logrus
...
Replace latest log by logrus
Upstream-commit: f58758ce36436a4c941ebbf4926e173c286491ee
Component: engine
2015-07-02 08:20:16 -07:00
842ad32482
Replace latest log by logrus
...
Related to #11618 and #11614
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: 10e114fb956db1b1a8bc9308cc6d14cbf30a5bab
Component: engine
2015-07-02 16:11:52 +02:00
807f056fef
Merge pull request #13825 from Mashimiao/unify-help-message
...
Unify docker commands' usage in man and help
Upstream-commit: 9300eb668459f1e21298db1de829265d6a4c9dd6
Component: engine
2015-07-02 15:31:57 +02:00
699674f3d1
Fixed outdated comment.
...
Synchronized the comment for httputils/mimetype.DetectContentType
with the actual code.
Signed-off-by: Moysés Borges <moysesb@gmail.com >
Upstream-commit: 8b0e40bb3840a755f60fdc823fbd1963aaa0c402
Component: engine
2015-07-02 08:17:11 -03:00
2639bef2c5
Show error message when todisk failed
...
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com >
Upstream-commit: af7f81878f561ecdab32936d4bea72f0ab26ce0e
Component: engine
2015-07-02 18:24:35 +08:00
23dd86bcae
Unify docker commands' usage in man and help
...
Signed-off-by: Ma Shimiao <mashimiao.fnst@cn.fujitsu.com >
Upstream-commit: f38232b475d126d6ea3a37d82be2c7269324e4ab
Component: engine
2015-07-02 10:33:26 +08:00
ee7a0ea07c
Fix missing newline
...
Fixes #14340
Signed-off-by: Ankush Agarwal <ankushagarwal11@gmail.com >
Upstream-commit: 942a0f994f1c6da840086cbcd2933e23521a2953
Component: engine
2015-07-01 18:16:22 -07:00
8211ecfd09
Merge pull request #13187 from shishir-a412ed/docker_inspect_issue
...
Flag Addition: --type flag added for docker inspect command
Upstream-commit: 98f988f62ceccf7237cbcb45f1095ff15f005ea9
Component: engine
2015-07-02 01:31:15 +02:00
a41be0879e
Merge pull request #12548 from camallen/docker_host_docs
...
add note in docs about DOCKER_HOST env var overriding unix socket config
Upstream-commit: f51d77f86e533f6fb4892f6aa0ae7646a7dfbdad
Component: engine
2015-07-02 01:27:47 +02:00
e43d7e0bfd
Merge pull request #14324 from aboch/ds
...
Stats API to retrieve nw stats from libnetwork
Upstream-commit: 75864dcb385e7f27870e5b0c2383dfd0e0748258
Component: engine
2015-07-01 15:19:46 -07:00
b413d58bbc
Merge pull request #14329 from runcom/14318-fix-regression-cap-add-drop-as-single-string
...
Fix regression in parsing capabilities
Upstream-commit: 9b9a4b2e59eaaa8ffb4ecc42ef771109d0f34955
Component: engine
2015-07-01 13:28:07 -07:00
b22691d84a
Fix windows tag in pkg/term
...
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
Upstream-commit: 7b3492df0c3c92215c2ed6f3e8b6cd8f7cf11855
Component: engine
2015-07-01 13:16:16 -07:00
4d0125faee
Fix regression in parsing capabilities list when a single string is given
...
Signed-off-by: Antonio Murdaca <runcom@linux.com >
Upstream-commit: 10a3061c5f342477703e96d9b8b2e877d9cdddf5
Component: engine
2015-07-01 21:28:02 +02:00
908ab87a15
Stats API to retrieve nw stats from libnetwork
...
- Container networking statistics are no longer
retrievable from libcontainer after the introduction
of libnetwork. This change adds the missing code
for docker daemon to retireve the nw stats from
Endpoint.
Signed-off-by: Alessandro Boch <aboch@docker.com >
Upstream-commit: 8b40e44c395fb307cceb6f179ffe02030b316535
Component: engine
2015-07-01 11:15:16 -07:00
90fdc3715d
Merge pull request #14321 from MattHauglustaine/14266-return-envfile-parse-bufio-error
...
Return bufio error when parsing env file
Upstream-commit: 358c022cac204890878c8b3c06999ed3c502819b
Component: engine
2015-07-01 11:06:33 -07:00
576b04d570
Merge pull request #13744 from turtlebender/feature/whitelist-label-for-commit
...
Support LABEL as change for `docker commit`
Upstream-commit: 53b897ce9c1f815a047682edb4ca54baea395a64
Component: engine
2015-07-01 10:57:33 -07:00
2d91fa1913
Merge pull request #14322 from runcom/14320-fix-regression-attach-cont-notfound
...
Return not found before hijacking in attach/wsattach
Upstream-commit: 5fd0563505108a0e2da8847b33f01065af79dda4
Component: engine
2015-07-01 13:22:03 -04:00
56e7e9d73b
Merge pull request #14134 from vdemeester/runconfig-test-coverage
...
Refactor and add tests coverage on package runconfig
Upstream-commit: be5e1498c360d80dfb42fdc1523afb2e7640996b
Component: engine
2015-07-01 10:15:26 -07:00
5607e48f25
Fix regression in containers attach/wsattach api, return not found before hijacking
...
Signed-off-by: Antonio Murdaca <runcom@linux.com >
Upstream-commit: 88d32a6109a15633481f758c4d0689516ae58aef
Component: engine
2015-07-01 18:16:17 +02:00
8aaef3e5b3
Flag Addition: --type flag added for docker inspect command
...
Signed-off-by: Shishir Mahajan <shishir.mahajan@redhat.com >
Upstream-commit: 2cb74e691538351efbdee7a78be6535f22c5d024
Component: engine
2015-07-01 12:14:01 -04:00
