99119fcafa
Vendor swarmkit 46bbd41
...
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
2017-02-27 11:51:00 -08:00
8b6ae13c08
Merge pull request #31314 from williamh/split-openrc-log
...
contrib/init/openrc: allow separate logs for stdout and stderr
2017-02-27 19:31:57 +01:00
ce79f6b644
Merge pull request #31382 from albers/completion-build--add-host
...
Add bash completion for `docker build --add-host`
2017-02-27 15:25:12 +01:00
8de3eb0486
Add bash completion for `docker build --add-host`
...
Signed-off-by: Harald Albers <github@albersweb.de>
2017-02-27 12:56:57 +01:00
a64ea37753
Merge pull request #30383 from TDAbboud/30096-add-host-docker-build
...
Add --add-host for docker build
2017-02-27 12:42:18 +01:00
a6576b8a2b
Merge pull request #31212 from fate-grand-order/fixed
...
use t.Fatal() to output the err message and fix typo
2017-02-27 12:26:35 +09:00
60a94f7a04
Merge pull request #31349 from Phineas/master
...
Update copyright dates
2017-02-26 16:06:39 +01:00
24b4c9e737
Merge pull request #31351 from dnephin/what-are-even-build-args
...
Refactor to remove duplicate code around BuildArgs
2017-02-26 16:04:30 +01:00
33ffb74d3c
Merge pull request #31363 from genki/fixed_typo_in_formatter
...
Fixed typo in service formatter.
2017-02-26 06:24:05 -05:00
d654c3d831
Fixed typo.
...
Signed-off-by: Genki Takiuchi <genki@s21g.com>
2017-02-26 12:59:18 +09:00
6e005fd5cc
Refactor to remove duplicate code around BuildArgs.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2017-02-24 16:22:32 -05:00
da8cf590eb
Update copyright dates
...
Signed-off-by: phineas <phin@phineas.io>
2017-02-24 19:41:59 +00:00
55fcd6f4db
Merge pull request #31192 from thaJeztah/warn-instead-of-error
...
don't log v2 pull as error when retrying
2017-02-24 09:58:13 -08:00
3470c8d767
Merge pull request #31330 from albers/completion-fix-node-plus-self
...
Fix bash completion for `docker service ps --filter node`
2017-02-24 15:35:27 +01:00
d65a721f40
Merge pull request #31329 from albers/completion-desired-state-shutdown
...
Add completion for `--filter desired-state=shutdown`
2017-02-24 15:33:52 +01:00
a0993f6993
Merge pull request #31331 from albers/completion-node-ls--filter-missing
...
Add bash completion for missing filters of `docker node ls`
2017-02-24 15:33:27 +01:00
dd4a6c5aff
Merge pull request #31313 from dperny/31306-fix-specify-stdoutstderr
...
Fix service logs API to be able to specify stream
2017-02-24 09:11:38 -05:00
23b0c39fa6
Add bash completion for missing filters of `docker node ls`
...
Signed-off-by: Harald Albers <github@albersweb.de>
2017-02-24 14:29:23 +01:00
8606144159
log fallback errors as "info"
...
Fallback errors are not an error, but an
informational message.
This changes those errors to be logged
as "Info" instead of "Error".
After this patch, debug logs look like this;
DEBU[0050] Calling GET /_ping
DEBU[0050] Calling POST /v1.27/images/create?fromImage=localhost%3A5000%2Ffoo&tag=latest
DEBU[0050] Trying to pull localhost:5000/foo from https://localhost:5000 v2
WARN[0050] Error getting v2 registry: Get https://localhost:5000/v2/ : http: server gave HTTP response to HTTPS client
INFO[0050] Attempting next endpoint for pull after error: Get https://localhost:5000/v2/ : http: server gave HTTP response to HTTPS client
DEBU[0050] Trying to pull localhost:5000/foo from http://localhost:5000 v2
INFO[0050] Attempting next endpoint for pull after error: manifest unknown: manifest unknown
DEBU[0050] Trying to pull localhost:5000/foo from https://localhost:5000 v1
DEBU[0050] attempting v1 ping for registry endpoint https://localhost:5000/v1/
DEBU[0050] Fallback from error: Get https://localhost:5000/v1/_ping : http: server gave HTTP response to HTTPS client
INFO[0050] Attempting next endpoint for pull after error: Get https://localhost:5000/v1/_ping : http: server gave HTTP response to HTTPS client
DEBU[0050] Trying to pull localhost:5000/foo from http://localhost:5000 v1
DEBU[0050] [registry] Calling GET http://localhost:5000/v1/repositories/foo/images
ERRO[0050] Not continuing with pull after error: Error: image foo:latest not found
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2017-02-24 14:27:35 +01:00
4fb663a3b4
Fix bash completion for `docker service ps --filter node`
...
Signed-off-by: Harald Albers <github@albersweb.de>
2017-02-24 14:09:26 +01:00
55fcfe7e8b
Add completion for `--filter desired-state=shutdown`
...
Signed-off-by: Harald Albers <github@albersweb.de>
2017-02-24 13:31:59 +01:00
f63c62ce70
Fix service logs API to be able to specify stream
...
Before this change, doing service logs was just tossing the stream
selectors and always using the default (both streams). This change adds
a check for which streams the user wants and only includes those.
Fixes #31306
Signed-off-by: Drew Erny <drew.erny@docker.com>
2017-02-23 15:09:09 -08:00
65c1a3be5b
contrib/init/openrc: allow separate logs for stdout and stderr
...
Signed-off-by: William Hubbs <w.d.hubbs@gmail.com>
2017-02-23 17:07:26 -06:00
87e45626f4
Merge pull request #31292 from albers/completion-exe
...
Activate bash completion for Windows executable
2017-02-23 10:47:24 -08:00
8d28fc8fc4
Merge pull request #30731 from shin-/plugin_privileges_param_fix
...
Parameter name in GetPluginPrivileges is "remote"
2017-02-23 19:39:28 +01:00
27c9a6e9c2
Merge pull request #31291 from albers/docs-daemon-hosts
...
Clarify why `hosts` in `daemon.json` does not work
2017-02-23 10:47:26 -05:00
89b193adbe
Merge pull request #31282 from YuPengZTE/devPretty
...
Delete dots to align with other commands description
2017-02-23 09:49:58 -05:00
07ca9109a3
Merge pull request #31278 from vieux/bump_containerd
...
update containerd to 665e84e6c28653a9c29a6db601636a92d46896f3
2017-02-23 09:25:08 -05:00
270a7bb501
Activate bash completion for Windows executable
...
Signed-off-by: Harald Albers <github@albersweb.de>
2017-02-23 14:45:18 +01:00
340b75dd41
Clarify why `hosts` in `daemon.json` does not work
...
Signed-off-by: Harald Albers <github@albersweb.de>
2017-02-23 14:03:58 +01:00
ec95ad7353
Delete dots to align with other commands description
...
Signed-off-by: yupengzte <yu.peng36@zte.com.cn>
2017-02-23 16:46:08 +08:00
52ba250f7e
Merge pull request #31279 from aaronlehmann/shutdown-error-leakage
...
Shutdown leaks an error when the container was never started
2017-02-22 23:47:39 -08:00
37b492ae1b
Shutdown leaks an error when the container was never started
...
I found that sometimes tasks would end up in a rejected state when
trying to update them quickly. The problem was that Shutdown could fail
if called before the container was started. Instead of returning an
error in this case, Shutdown should succeed. This allows tasks to
progress to the "shutdown" state as expected.
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
2017-02-22 19:12:07 -08:00
2a8d6368d4
use t.Fatal() to output the err message where the values used for formatting
...
text does not appear to contain a placeholder
Signed-off-by: Helen Xie <chenjg@harmonycloud.cn>
2017-02-23 10:16:22 +08:00
06f4049b8d
update containerd to 665e84e6c28653a9c29a6db601636a92d46896f3
...
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
2017-02-22 18:04:56 -08:00
b0986f3b55
Merge pull request #31259 from mlaventure/bump-runc
...
Bump runc to version a01dafd48bc1c7cc12bdb01206f9fea7dd6feb70
2017-02-22 17:47:00 -08:00
b3e7f70137
Merge pull request #31263 from nalind/journal-doublefree
...
Synchronize the cursor returned by followJournal
2017-02-22 17:45:49 -08:00
1948cc5fac
Merge pull request #31276 from thaJeztah/update-authors
...
Update authors
2017-02-22 17:23:25 -08:00
5dfac5499a
Update authors
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2017-02-23 02:17:51 +01:00
19cd2aa389
Merge pull request #31203 from yongtang/02202017-Swagger-ContainerSpec
...
Add missing fields in Swagger docs
2017-02-22 15:54:23 -08:00
cf8408106d
Merge pull request #31204 from yongtang/31179-Swagger-Secrets
...
Add missing Secrets in Swagger docs
2017-02-23 00:45:32 +01:00
f67eb69fe3
Merge pull request #31231 from mlaventure/fix-journald-invalid-free
...
Prevent freeing a possible invalid pointer from journald
2017-02-22 15:36:36 -08:00
6f0e2c8c8b
Bump runc to version a01dafd48bc1c7cc12bdb01206f9fea7dd6feb70
...
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
2017-02-22 14:10:33 -08:00
d57c330617
Synchronize the cursor returned by followJournal
...
Make sure that the cursor value returned by followJournal() is the last
of the values returned by its goroutine's calls to drainJournal() by
waiting for it, rather than returning a value that may be superceded by
another if we're singalling the goroutine that it should exit by closing
a pipe.
Signed-off-by: Nalin Dahyabhai <nalin@redhat.com>
2017-02-22 16:22:00 -05:00
81630df854
Prevent freeing a possible invalid pointer from journald
...
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
2017-02-22 07:54:10 -08:00
4534dcd494
Merge pull request #31031 from WeiZhang555/stats-all-docs
...
[Docs] Add docs for stating stopped containers
2017-02-22 11:14:15 +01:00
89fe0e1b14
Merge pull request #30954 from yongtang/29448-swagger-version
...
Improve documentation of `Version` usage for Swarm API
2017-02-22 10:59:10 +01:00
f001c54fee
Merge pull request #31248 from lixiaobing10051267/masterCliTest
...
rectify the function name used by note
2017-02-22 17:40:50 +09:00
8fff3ea3d6
rectify the function name used by note
...
Signed-off-by: lixiaobing10051267 <li.xiaobing1@zte.com.cn>
2017-02-22 16:13:45 +08:00
ffc70d2f0c
Merge pull request #31211 from lixiaobing10051267/masterAttach
...
invalide detach keys provided
2017-02-22 11:28:15 +08:00
Aaron Lehmann
Sebastiaan van Stijn
Vincent Demeester
Harald Albers
Akihiro Suda
Brian Goff
Genki Takiuchi
Daniel Nephin
phineas
Sebastiaan van Stijn
Drew Erny
William Hubbs
Victor Vieux
yupengzte
fate-grand-order
Alexander Morozov
Kenfe-Mickael Laventure
Nalin Dahyabhai
lixiaobing10051267
Lei Jitang