8de6090cf2
Merge pull request #22336 from thaJeztah/carry-21174-update-docker-info-docs
...
Updated docker-info output and documentation
Upstream-commit: c14b1e39641fd575f59ef8c8556158d595eff284
Component: engine
2016-05-04 15:33:21 +02:00
c441f187a4
Merge pull request #21947 from boynux/fix-filter-exited
...
exited=0 in filter shouldn't show "Created" ones
Upstream-commit: 4c88c67058080d5f780100cee71a5a9938841cfb
Component: engine
2016-05-04 15:21:59 +02:00
820803730c
Merge pull request #22386 from wenchma/dockerd
...
Update the `docker daemon` to `dockerd` for document
Upstream-commit: 1c1947dd29def10260e61688112eeac665761ace
Component: engine
2016-05-04 15:07:53 +02:00
f77b6d2fb7
fix typo
...
fix typo
Signed-off-by: Qizhao Yang <windfarer@gmail.com >
Upstream-commit: 176e9e2ffc192862f104b13bdf651551c1e492f1
Component: engine
2016-05-04 19:18:38 +08:00
97d521660e
Merge pull request #22446 from thaJeztah/add-daemon-reload
...
Add support for reloading daemon configuration through systemd
Upstream-commit: 9c52a04f389d4bd2eb447c13a13003d79b746abc
Component: engine
2016-05-04 12:38:40 +02:00
4be167aee3
Merge pull request #22482 from anujbahuguna/master
...
Adding Rita Levi-Montalcini and Claude Shannon to name generator
Upstream-commit: 82141a28f525182ee638d5a63558f9545dcd1a7d
Component: engine
2016-05-03 22:28:16 +02:00
e8ace492bd
Merge pull request #22442 from thaJeztah/remove-issue-template-from-contributing
...
minor contributing.md cleanup
Upstream-commit: 5892083a8f26084faab9fd4ad2e348dbc8202504
Component: engine
2016-05-03 13:15:26 -07:00
1328fc105e
Merge pull request #22478 from Microsoft/jjh/clirunsleepingcontainer
...
runSleepingContainer consistency
Upstream-commit: 3b0a166b10e63f8f3f20dd4f4a5250993a9025d3
Component: engine
2016-05-03 13:11:27 -07:00
f31a4deeed
Adding Rita Levi-Montalcini and Claude Shannon to name generator
...
Signed-off-by: Anuj Bahuguna "anujbahuguna.dev@gmail.com "
Signed-off-by: Anuj Bahuguna <abahuguna@fiberlink.com >
Upstream-commit: fd8a6775f57c4fae1d7cc99560f4efe30e1ac9dd
Component: engine
2016-05-04 00:14:09 +05:30
bbb9555a0a
RunSleepingContainer consistency
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: 481cc6716fdfda8db4481dd2a3dfde4d3d2edba5
Component: engine
2016-05-03 11:39:29 -07:00
958cc5f73b
Merge pull request #22468 from thaJeztah/fix-dotcloud-link
...
Fix dotCloud link
Upstream-commit: 61d265964f56b589c96f503906872c0a25fb89e9
Component: engine
2016-05-03 19:30:13 +02:00
4d2b1dfdde
Merge pull request #22441 from tkopczynski/20784-builder-remote-tests
...
Unit test for builder/remote.go
Upstream-commit: 73a8b6e3aaacd440e6666f4a64554ea7c2ca4090
Component: engine
2016-05-03 09:51:19 -07:00
52df305128
Merge pull request #22461 from tonistiigi/fix-implicit-pull-test-arm
...
Move implicit pull test to use local registry
Upstream-commit: 9837ec4da53f15f9120d53a6e1517491ba8b0261
Component: engine
2016-05-03 11:56:29 +02:00
800cf1021d
Fix dotCloud link
...
dotCloud no longer exists, and since this part of the
readme is refering to "where it all started", replaced
the link with an archive link around the time that
Docker was publicly announced.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: f2fd765450e024808a3019bdc118f87c97446f97
Component: engine
2016-05-03 11:43:43 +02:00
263f748b31
Unit test for builder/remote.go
...
Signed-off-by: Tomasz Kopczynski <tomek@kopczynski.net.pl >
Upstream-commit: e00ad7227ea1ea09506145901213640964e7bdfb
Component: engine
2016-05-03 10:20:10 +02:00
fb1770417a
Move implicit pull test to use local registry
...
Using hub only works for amd64 platforms.
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com >
Upstream-commit: 641c1808e187ed86d8b614e49e8e6da5146201e3
Component: engine
2016-05-02 18:14:13 -07:00
dc0034a921
Merge pull request #22394 from SvenDowideit/use-docs-base-oss
...
convert docs Dockerfiles to use docs/base:oss
Upstream-commit: 1c0edf6c3953d0f298d3dc1ec19f71f0b3b57b19
Component: engine
2016-05-03 10:48:29 +10:00
085330bf58
Merge pull request #22457 from LK4D4/fix_error_format
...
image/tarexport: fix error formatting
Upstream-commit: ca95f649682fd22f9fd902a3494e138b2d161a63
Component: engine
2016-05-02 17:27:27 -07:00
dab6ceb6f9
Merge pull request #21945 from rhvgoyal/export-min-free-space
...
Export Mininum Thin Pool Free Space through docker info
Upstream-commit: 227c83826aafbbcb3235d75cf7ab58392e552a83
Component: engine
2016-05-02 20:20:08 -04:00
fefeac158d
Merge pull request #22459 from twistlock/authorization_docs_fix
...
Remove response modification sections from authorization design doc
Upstream-commit: 8d4ccd19258901697d0072ca433c0211e79e8d9d
Component: engine
2016-05-02 23:43:05 +02:00
1a171d098b
Merge pull request #22458 from estesp/betty-junods-cast
...
Add Joan & Samuel Curran, Welsh scientist and Irish physicist couple
Upstream-commit: 1c1a1280ac6ed77dc8e8769d9efbb0fd0f5746eb
Component: engine
2016-05-02 14:30:32 -07:00
230f115d81
Merge pull request #21153 from mountkin/log-validator
...
inherit the daemon log options when creating containers
Upstream-commit: 75e63c942ec8d3852f182b9cd9c221411fc74730
Component: engine
2016-05-02 16:12:43 -04:00
33656931d9
Remove response modification sections from authorization design doc
...
Signed-off-by: Liron Levin <liron@twistlock.com >
Upstream-commit: 638096431a36435aae0e30b6c76c134a4728ed5d
Component: engine
2016-05-02 22:19:23 +03:00
56a9c6981f
Add Joan & Samuel Curran, Welsh scientest and Irish physicist couple
...
In honor of Betty Junod's cast, and her tweet about Joan Curran:
https://twitter.com/BettyJunod/status/727194712956784641
Docker-DCO-1.1-Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com >
Upstream-commit: 62bd539629f643d227908c5d6b445e540bb3c486
Component: engine
2016-05-02 14:50:16 -04:00
31d554228f
Merge pull request #22448 from twistlock/authorization_error_code
...
Fix authorization issue - when request is denied return forbbiden exist code (403).
Upstream-commit: 2f6e3b0ba027b558adabd41344fee59db4441011
Component: engine
2016-05-02 11:04:19 -07:00
6f46f75951
Merge pull request #22367 from dnephin/fix_dockerd_lookup_and_warn
...
Fix lookup of dockerd when called from outside of $PATH
Upstream-commit: ba6209f7448865885519face97b1ffe30396939e
Component: engine
2016-05-02 13:58:57 -04:00
8e29ebccd1
image/tarexport: fix error formatting
...
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
Upstream-commit: a2eacff5c755d3257f453c9555526549bc3753b1
Component: engine
2016-05-02 10:26:32 -07:00
b411e1c47f
Merge pull request #22247 from vdemeester/22240-implicit-pull
...
Fix #22240 do not pull all the tags implicitely
Upstream-commit: 7bb23f7acc5a0d3fc54e1e08bb2f1a88836972d7
Component: engine
2016-05-02 10:23:10 -07:00
b33e8d5489
Fix authorization issue - when request is denied return forbbiden exist code (403).
...
- Return 403 (forbidden) when request is denied in authorization flows
(including integration test)
- Fix #22428
- Close #22431
Signed-off-by: Liron Levin <liron@twistlock.com >
Upstream-commit: 526abc00b138a168fb248c98efd1b90fdf679036
Component: engine
2016-05-02 19:14:48 +03:00
86a8cdbb4b
Raise a more relevant error when dockerd is not available on the platform.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: 8983d42988ad59f1a19a0f4e9e88dfec8b1be690
Component: engine
2016-05-02 11:59:25 -04:00
56c66fb13e
When exec'ing dockerd, look for it in the same directory as the docker binary first, before checking path.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: 9db86a38cdc183cefade48103b9ddb44ce3032fe
Component: engine
2016-05-02 11:52:50 -04:00
be36ed6341
Merge pull request #22452 from cpuguy83/fix_zsh_completion_psformat
...
Make zsh completion work when ps output is custom
Upstream-commit: 2a6980c5cb111514d1929c619b8fc8fc2df00fd5
Component: engine
2016-05-02 17:39:46 +02:00
26d82a2984
vendor docker-py 7befe694bd21e3c54bb1d7825270ea4bd6864c13
...
Signed-off-by: Shijiang Wei <mountkin@gmail.com >
Upstream-commit: e6590b5fa2c442546d3dcfa3e0580eb024ede823
Component: engine
2016-05-02 23:04:04 +08:00
a97fd7f656
inherit the daemon log options when creating containers
...
Signed-off-by: Shijiang Wei <mountkin@gmail.com >
Upstream-commit: 1790980ec68c2579712e97ecffcdb8fa93700bc6
Component: engine
2016-05-02 23:04:04 +08:00
5a1389f4b1
Make zsh completion work when ps output is custom
...
When `psFormat` is used in the docker client config json, if the output
is non-standard it breaks some of the completion handling for
containers.
This fixes that by ensuring that calls to `ps` use the default/standard
formatting by calling `docker ps --format 'table'`
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
Upstream-commit: ba3f8a9fefc9da16dc00cf01f2b1d32ec54ce20d
Component: engine
2016-05-02 09:45:01 -04:00
490a37a62f
Add support for reloading daemon configuration through systemd
...
This adds support for reloading the docker daemon
(SIGHIUP) so that changes in '/etc/docker/daemon.json'
can be loaded at runtime by reloading the service
through systemd ('systemctl reload docker')
Before this change, systemd would output an error
that "reloading" is not supported for the docker
service;
systemctl reload docker
Failed to reload docker.service: Job type reload is not applicable for unit docker.service.
After this change, the docker daemon can be reloaded
through 'systemctl reload docker', which reloads
the configuration;
journalctl -f -u docker.service
May 02 03:49:20 testing systemd[1]: Reloading Docker Application Container Engine.
May 02 03:49:20 testing docker[28496]: time="2016-05-02T03:49:20.143964103-04:00" level=info msg="Got signal to reload configuration, reloading from: /etc/docker/daemon.json"
May 02 03:49:20 testing systemd[1]: Reloaded Docker Application Container Engine.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: f74b856e1ac2805fe48ceb52bc83cd7a3cec870c
Component: engine
2016-05-02 10:27:07 +02:00
6d4279fdb3
minor contributing.md cleanup
...
- added an image-link to the contributors guide
- added a link to forums.docker.com
- removed link to the docker-user Google Group, which is no longer in use
- remove the "Issue Report Template", because we now have a template for this on GitHub
- remove reference to the old "Docker-DCO-1.1-Signed-off-by" sign-off
- changed some none-https links to https
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: b2b82b952c1752038771568661e71f235a4e5e75
Component: engine
2016-05-01 20:18:09 +02:00
9fb835ad73
Fix #22240 do not pull all the tags implicitely
...
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: 54ebe42de9c359e0c9f171953bd787bb997d719e
Component: engine
2016-05-01 14:46:04 +02:00
ef3d0f56d0
remove "the" in docs.
...
Signed-off-by: Yuan Sun <sunyuan3@huawei.com >
Upstream-commit: 043c9ef076477a391a58792930100402b48bbe1e
Component: engine
2016-05-01 15:37:11 +08:00
e7d7019314
Vendor engine-api with pull fixes
...
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: ba901bb062d8f1fbc7cc8d9fae5b7365afb66e69
Component: engine
2016-04-30 17:24:25 +02:00
8a3d4c08a9
Merge pull request #22434 from sdurrheimer/zsh-completion-network-ls-driver-filter
...
Add zsh completion for 'docker network ls -f driver'
Upstream-commit: e385faa35b5026ed27f59124d632ea30e9d647d1
Component: engine
2016-04-30 10:54:28 -04:00
04f7572de5
Merge pull request #22282 from fntlnz/docs-authorization-plugins
...
Mention the fact that authz plugins are available today
Upstream-commit: d32345240c39b990a00d5d3e740a90a1f57d1251
Component: engine
2016-04-30 13:23:58 +02:00
236d071954
Add zsh completion for 'docker network ls -f driver'
...
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com >
Upstream-commit: d6780c319086379023894c6ae26301bce6b01b98
Component: engine
2016-04-30 13:07:03 +02:00
d380357613
Merge pull request #22319 from thaJeztah/network-driver-filter
...
Add "driver" filter for network ls
Upstream-commit: 7a5658129740cd8e4345246758aa30fe3c835d10
Component: engine
2016-04-30 10:38:10 +02:00
9d2d2e1d41
Merge pull request #22372 from dnephin/cli_cleanup
...
Reorganize client and cli packages
Upstream-commit: 90dfb3dacc56d789b70f5b5f3da6791465706c6c
Component: engine
2016-04-29 17:31:39 -07:00
dd55588acd
Merge pull request #22426 from sdurrheimer/zsh-completion-network-ls-filters
...
Add zsh completion for 'docker network ls -f {id,name,type}'
Upstream-commit: b391a5914c5cd040f9f85ceaab04cafca6c34461
Component: engine
2016-04-29 17:29:38 -07:00
55b8abe106
Merge pull request #22241 from bfirsh/update-remote-api-client-libraries-page
...
Update remote API client libraries page
Upstream-commit: cd418701326f91c71194e2e09d71a0692705de78
Component: engine
2016-04-30 00:39:29 +02:00
98448735e8
Merge pull request #22427 from tonistiigi/simplify-blkio
...
Simplify blkio resources setup in spec
Upstream-commit: 5e58a583fc0a9dd208c60690bdc7580209446e93
Component: engine
2016-04-29 15:16:33 -07:00
f2a5bf90ee
Merge pull request #22406 from allencloud/fix-typos
...
fix typos in CHANGELOG.md and pull.go
Upstream-commit: e44a868bc4a0fa2cd2cd3a3b269870ed745da50b
Component: engine
2016-04-30 00:00:48 +02:00
d2c630a173
Simplify blkio resources setup in spec
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com >
Upstream-commit: 668f0a2a4c04e550c957cf5eff6618c6b40d1252
Component: engine
2016-04-29 13:39:04 -07:00
