973d6f0820
Merge pull request #22422 from cpuguy83/vendor_engine-api
...
Update engine-api
2016-05-04 10:12:29 -04:00
e7584a7fdf
Merge pull request #22499 from duglin/removeQuotes
...
Remove unnecessary double-double quotes
2016-05-04 15:35:45 +02:00
c14b1e3964
Merge pull request #22336 from thaJeztah/carry-21174-update-docker-info-docs
...
Updated docker-info output and documentation
2016-05-04 15:33:21 +02:00
4c88c67058
Merge pull request #21947 from boynux/fix-filter-exited
...
exited=0 in filter shouldn't show "Created" ones
2016-05-04 15:21:59 +02:00
1c1947dd29
Merge pull request #22386 from wenchma/dockerd
...
Update the `docker daemon` to `dockerd` for document
2016-05-04 15:07:53 +02:00
8eb2188bd9
Remove unnecessary double-double quotes
...
Signed-off-by: Doug Davis <dug@us.ibm.com>
2016-05-04 05:15:57 -07:00
9f29f66c29
Merge pull request #22498 from Windfarer/patch-1
...
fix typo in docs
2016-05-04 13:37:28 +02:00
176e9e2ffc
fix typo
...
fix typo
Signed-off-by: Qizhao Yang <windfarer@gmail.com>
2016-05-04 19:18:38 +08:00
9c52a04f38
Merge pull request #22446 from thaJeztah/add-daemon-reload
...
Add support for reloading daemon configuration through systemd
2016-05-04 12:38:40 +02:00
82141a28f5
Merge pull request #22482 from anujbahuguna/master
...
Adding Rita Levi-Montalcini and Claude Shannon to name generator
2016-05-03 22:28:16 +02:00
5892083a8f
Merge pull request #22442 from thaJeztah/remove-issue-template-from-contributing
...
minor contributing.md cleanup
2016-05-03 13:15:26 -07:00
3b0a166b10
Merge pull request #22478 from Microsoft/jjh/clirunsleepingcontainer
...
runSleepingContainer consistency
2016-05-03 13:11:27 -07:00
fd8a6775f5
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>
2016-05-04 00:14:09 +05:30
481cc6716f
RunSleepingContainer consistency
...
Signed-off-by: John Howard <jhoward@microsoft.com>
2016-05-03 11:39:29 -07:00
61d265964f
Merge pull request #22468 from thaJeztah/fix-dotcloud-link
...
Fix dotCloud link
2016-05-03 19:30:13 +02:00
73a8b6e3aa
Merge pull request #22441 from tkopczynski/20784-builder-remote-tests
...
Unit test for builder/remote.go
2016-05-03 09:51:19 -07:00
9837ec4da5
Merge pull request #22461 from tonistiigi/fix-implicit-pull-test-arm
...
Move implicit pull test to use local registry
2016-05-03 11:56:29 +02:00
f2fd765450
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>
2016-05-03 11:43:43 +02:00
e00ad7227e
Unit test for builder/remote.go
...
Signed-off-by: Tomasz Kopczynski <tomek@kopczynski.net.pl>
2016-05-03 10:20:10 +02:00
641c1808e1
Move implicit pull test to use local registry
...
Using hub only works for amd64 platforms.
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2016-05-02 18:14:13 -07:00
1c0edf6c39
Merge pull request #22394 from SvenDowideit/use-docs-base-oss
...
convert docs Dockerfiles to use docs/base:oss
2016-05-03 10:48:29 +10:00
ca95f64968
Merge pull request #22457 from LK4D4/fix_error_format
...
image/tarexport: fix error formatting
2016-05-02 17:27:27 -07:00
227c83826a
Merge pull request #21945 from rhvgoyal/export-min-free-space
...
Export Mininum Thin Pool Free Space through docker info
2016-05-02 20:20:08 -04:00
8d4ccd1925
Merge pull request #22459 from twistlock/authorization_docs_fix
...
Remove response modification sections from authorization design doc
2016-05-02 23:43:05 +02:00
1c1a1280ac
Merge pull request #22458 from estesp/betty-junods-cast
...
Add Joan & Samuel Curran, Welsh scientist and Irish physicist couple
2016-05-02 14:30:32 -07:00
75e63c942e
Merge pull request #21153 from mountkin/log-validator
...
inherit the daemon log options when creating containers
2016-05-02 16:12:43 -04:00
638096431a
Remove response modification sections from authorization design doc
...
Signed-off-by: Liron Levin <liron@twistlock.com>
2016-05-02 22:19:23 +03:00
62bd539629
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>
2016-05-02 14:50:16 -04:00
988f481643
Update engine-api
...
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2016-05-02 14:17:40 -04:00
2f6e3b0ba0
Merge pull request #22448 from twistlock/authorization_error_code
...
Fix authorization issue - when request is denied return forbbiden exist code (403).
2016-05-02 11:04:19 -07:00
ba6209f744
Merge pull request #22367 from dnephin/fix_dockerd_lookup_and_warn
...
Fix lookup of dockerd when called from outside of $PATH
2016-05-02 13:58:57 -04:00
a2eacff5c7
image/tarexport: fix error formatting
...
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
2016-05-02 10:26:32 -07:00
7bb23f7acc
Merge pull request #22247 from vdemeester/22240-implicit-pull
...
Fix #22240 do not pull all the tags implicitely
2016-05-02 10:23:10 -07:00
526abc00b1
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>
2016-05-02 19:14:48 +03:00
8983d42988
Raise a more relevant error when dockerd is not available on the platform.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2016-05-02 11:59:25 -04:00
9db86a38cd
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>
2016-05-02 11:52:50 -04:00
2a6980c5cb
Merge pull request #22452 from cpuguy83/fix_zsh_completion_psformat
...
Make zsh completion work when ps output is custom
2016-05-02 17:39:46 +02:00
e6590b5fa2
vendor docker-py 7befe694bd21e3c54bb1d7825270ea4bd6864c13
...
Signed-off-by: Shijiang Wei <mountkin@gmail.com>
2016-05-02 23:04:04 +08:00
1790980ec6
inherit the daemon log options when creating containers
...
Signed-off-by: Shijiang Wei <mountkin@gmail.com>
2016-05-02 23:04:04 +08:00
ba3f8a9fef
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>
2016-05-02 09:45:01 -04:00
f74b856e1a
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>
2016-05-02 10:27:07 +02:00
b2b82b952c
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>
2016-05-01 20:18:09 +02:00
54ebe42de9
Fix #22240 do not pull all the tags implicitely
...
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2016-05-01 14:46:04 +02:00
b0a5762348
Merge pull request #22439 from sunyuan3/the
...
remove "the" in docs.
2016-05-01 13:50:41 +02:00
043c9ef076
remove "the" in docs.
...
Signed-off-by: Yuan Sun <sunyuan3@huawei.com>
2016-05-01 15:37:11 +08:00
ba901bb062
Vendor engine-api with pull fixes
...
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2016-04-30 17:24:25 +02:00
e385faa35b
Merge pull request #22434 from sdurrheimer/zsh-completion-network-ls-driver-filter
...
Add zsh completion for 'docker network ls -f driver'
2016-04-30 10:54:28 -04:00
d32345240c
Merge pull request #22282 from fntlnz/docs-authorization-plugins
...
Mention the fact that authz plugins are available today
2016-04-30 13:23:58 +02:00
d6780c3190
Add zsh completion for 'docker network ls -f driver'
...
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
2016-04-30 13:07:03 +02:00
7a56581297
Merge pull request #22319 from thaJeztah/network-driver-filter
...
Add "driver" filter for network ls
2016-04-30 10:38:10 +02:00
Brian Goff
Sebastiaan van Stijn
Vincent Demeester
Doug Davis
Eric Yang
Alexander Morozov
Anuj Bahuguna
John Howard
Sebastiaan van Stijn
Tomasz Kopczynski
Tonis Tiigi
Sven Dowideit
Aaron Lehmann
Liron Levin
Phil Estes
Alexander Morozov
Daniel Nephin
Shijiang Wei
Yuan Sun
Antonio Murdaca
Steve Durrheimer