Commit Graph

31086 Commits

Author SHA1 Message Date
e678ceeeb0 Add support for s390x ubuntu-yakkety deb
Signed-off-by: Dominik Dingel <dingel@linux.vnet.ibm.com>
Upstream-commit: 7f54153ba868b55c79e86bfcff196df46b6c9017
Component: engine
2017-02-27 14:52:43 +01:00
12aa0347d6 Merge pull request #30383 from TDAbboud/30096-add-host-docker-build
Add --add-host for docker build
Upstream-commit: a64ea37753fd9a94dfa3ab81f67f46df7bd641f8
Component: engine
2017-02-27 12:42:18 +01:00
458406a7f3 Merge pull request #31212 from fate-grand-order/fixed
use t.Fatal() to output the err message and fix typo
Upstream-commit: a6576b8a2bff0feeb67918403caa3df0c4c37673
Component: engine
2017-02-27 12:26:35 +09:00
1f44fb6e15 Merge pull request #31349 from Phineas/master
Update copyright dates
Upstream-commit: 60a94f7a04748490beaa3a2bad02734ad603b26c
Component: engine
2017-02-26 16:06:39 +01:00
e0954908a7 Merge pull request #31351 from dnephin/what-are-even-build-args
Refactor to remove duplicate code around BuildArgs
Upstream-commit: 24b4c9e7370222a9931678641b5ef7e66c2f6bc0
Component: engine
2017-02-26 16:04:30 +01:00
c38e6f3b83 Merge pull request #31363 from genki/fixed_typo_in_formatter
Fixed typo in service formatter.
Upstream-commit: 33ffb74d3c8a6c73747b042b7720cb5a6b29ff05
Component: engine
2017-02-26 06:24:05 -05:00
ee40a8603d Fixed typo.
Signed-off-by: Genki Takiuchi <genki@s21g.com>
Upstream-commit: d654c3d83152a4bf879ddf04ae637d1e424453ee
Component: engine
2017-02-26 12:59:18 +09:00
f19067fd22 Refactor to remove duplicate code around BuildArgs.
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: 6e005fd5ccd6ba90b51212c4a2539712b6398afd
Component: engine
2017-02-24 16:22:32 -05:00
4dd2c604b6 Update copyright dates
Signed-off-by: phineas <phin@phineas.io>
Upstream-commit: da8cf590eb56343f70d545c298a59d28f90eaf0f
Component: engine
2017-02-24 19:41:59 +00:00
ea150996ac Merge pull request #31192 from thaJeztah/warn-instead-of-error
don't log v2 pull as error when retrying
Upstream-commit: 55fcd6f4db6088be90eef1e521e5e2e89d0b71a1
Component: engine
2017-02-24 09:58:13 -08:00
853294b2c3 Merge pull request #31330 from albers/completion-fix-node-plus-self
Fix bash completion for `docker service ps --filter node`
Upstream-commit: 3470c8d7676ec7e16db2f2be32805c569ad9448e
Component: engine
2017-02-24 15:35:27 +01:00
e5b24c69a8 Merge pull request #31329 from albers/completion-desired-state-shutdown
Add completion for `--filter desired-state=shutdown`
Upstream-commit: d65a721f406297dc5ddd34cdf3a2a750fea99e15
Component: engine
2017-02-24 15:33:52 +01:00
e930fd0d7a Merge pull request #31331 from albers/completion-node-ls--filter-missing
Add bash completion for missing filters of `docker node ls`
Upstream-commit: a0993f6993a9f5e7be44108f5e1b6898a98b0a35
Component: engine
2017-02-24 15:33:27 +01:00
e0f0da5569 Merge pull request #31313 from dperny/31306-fix-specify-stdoutstderr
Fix service logs API to be able to specify stream
Upstream-commit: dd4a6c5affa60fda3affc2ab0e06ac4beb4c226e
Component: engine
2017-02-24 09:11:38 -05:00
535fd24050 Add bash completion for missing filters of docker node ls
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: 23b0c39fa62e7f2a2e55c86754bd7d21cda53a72
Component: engine
2017-02-24 14:29:23 +01:00
722b0a19c5 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>
Upstream-commit: 86061441593f8c768781681db2268bc1ab6d043e
Component: engine
2017-02-24 14:27:35 +01:00
af9590d791 Fix bash completion for docker service ps --filter node
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: 4fb663a3b4068675db2d19571b7fe027e218bf4f
Component: engine
2017-02-24 14:09:26 +01:00
d7fbcdb6ac Add completion for --filter desired-state=shutdown
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: 55fcfe7e8b3c47d2f9d97f41902f5ad56683b72c
Component: engine
2017-02-24 13:31:59 +01:00
1d2d461e40 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>
Upstream-commit: f63c62ce70d6ed4706dbde43feb22c6004c32061
Component: engine
2017-02-23 15:09:09 -08:00
90c65de535 Merge pull request #31292 from albers/completion-exe
Activate bash completion for Windows executable
Upstream-commit: 87e45626f433e5cecd576c0a6fcae09158d95a5e
Component: engine
2017-02-23 10:47:24 -08:00
005a50dcf7 Merge pull request #30731 from shin-/plugin_privileges_param_fix
Parameter name in GetPluginPrivileges is "remote"
Upstream-commit: 8d28fc8fc4db3c89d20679a022ea9cb5d3644b44
Component: engine
2017-02-23 19:39:28 +01:00
38c03e66d8 Merge pull request #31291 from albers/docs-daemon-hosts
Clarify why `hosts` in `daemon.json` does not work
Upstream-commit: 27c9a6e9c22a6cf0c6dae7f59cf8f7d56a67f560
Component: engine
2017-02-23 10:47:26 -05:00
3a985ae2c1 Merge pull request #31282 from YuPengZTE/devPretty
Delete dots to align with other commands description
Upstream-commit: 89b193adbef142304606b3b7fea5471ac846a28e
Component: engine
2017-02-23 09:49:58 -05:00
3294f7201d Merge pull request #31278 from vieux/bump_containerd
update containerd to 665e84e6c28653a9c29a6db601636a92d46896f3
Upstream-commit: 07ca9109a3c7b95389a60c965fd14185cd0d81fc
Component: engine
2017-02-23 09:25:08 -05:00
3c43b79766 Activate bash completion for Windows executable
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: 270a7bb5018e133deb40e4ff0cc88ea387d875bb
Component: engine
2017-02-23 14:45:18 +01:00
6e26e75ead Clarify why hosts in daemon.json does not work
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: 340b75dd41d026e6f6072da851930d6802a1ee34
Component: engine
2017-02-23 14:03:58 +01:00
718b046537 Delete dots to align with other commands description
Signed-off-by: yupengzte <yu.peng36@zte.com.cn>
Upstream-commit: ec95ad7353b240542f73076dde975e392c281748
Component: engine
2017-02-23 16:46:08 +08:00
e252f084ae Merge pull request #31279 from aaronlehmann/shutdown-error-leakage
Shutdown leaks an error when the container was never started
Upstream-commit: 52ba250f7e1f504f2c984961fd7564cefec9c15e
Component: engine
2017-02-22 23:47:39 -08:00
3226daa36d 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>
Upstream-commit: 37b492ae1b2ba5f84cd0b795dbc68804d7b2fec5
Component: engine
2017-02-22 19:12:07 -08:00
9632b0f1e8 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>
Upstream-commit: 2a8d6368d4a930203b93f75914173ab65bf3b0bc
Component: engine
2017-02-23 10:16:22 +08:00
14bd277aab update containerd to 665e84e6c28653a9c29a6db601636a92d46896f3
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
Upstream-commit: 06f4049b8d4fd96933287ef37a17a98379a044aa
Component: engine
2017-02-22 18:04:56 -08:00
d3eb391665 Merge pull request #31259 from mlaventure/bump-runc
Bump runc to version a01dafd48bc1c7cc12bdb01206f9fea7dd6feb70
Upstream-commit: b0986f3b55f73eff68ef6d728b055106fbddec0a
Component: engine
2017-02-22 17:47:00 -08:00
4fcd45b6de Merge pull request #31263 from nalind/journal-doublefree
Synchronize the cursor returned by followJournal
Upstream-commit: b3e7f7013719be7d11d513335ff55802eaf543ce
Component: engine
2017-02-22 17:45:49 -08:00
95c81c945e Merge pull request #31276 from thaJeztah/update-authors
Update authors
Upstream-commit: 1948cc5fac192ef07ac4b711eb5e4b2404072347
Component: engine
2017-02-22 17:23:25 -08:00
e7e310b785 Update authors
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 5dfac5499a147b66e81f091714c2c9df3107ec62
Component: engine
2017-02-23 02:17:51 +01:00
39cbc92ba8 Merge pull request #31203 from yongtang/02202017-Swagger-ContainerSpec
Add missing fields in Swagger docs
Upstream-commit: 19cd2aa389dff922589fe83fc2c48f0477a36617
Component: engine
2017-02-22 15:54:23 -08:00
d9938eace6 Merge pull request #31204 from yongtang/31179-Swagger-Secrets
Add missing Secrets in Swagger docs
Upstream-commit: cf8408106d181e8c31e006d6bb80d5f44ce8f81e
Component: engine
2017-02-23 00:45:32 +01:00
398b1f8b67 Merge pull request #31231 from mlaventure/fix-journald-invalid-free
Prevent freeing a possible invalid pointer from journald
Upstream-commit: f67eb69fe365b38fbbe31dd0b3afc6588711dcd3
Component: engine
2017-02-22 15:36:36 -08:00
2fb912d7a8 Bump runc to version a01dafd48bc1c7cc12bdb01206f9fea7dd6feb70
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
Upstream-commit: 6f0e2c8c8b29bdd9c9eb39f747207ec4dc081be1
Component: engine
2017-02-22 14:10:33 -08:00
53075c0a1f 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>
Upstream-commit: d57c330617efb97cad736a3e4ede82bb46ebbbf2
Component: engine
2017-02-22 16:22:00 -05:00
73607300a9 Prevent freeing a possible invalid pointer from journald
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
Upstream-commit: 81630df85439adab1836e83a7e645d67b1c0eb83
Component: engine
2017-02-22 07:54:10 -08:00
79d868fec9 Merge pull request #31031 from WeiZhang555/stats-all-docs
[Docs] Add docs for stating stopped containers
Upstream-commit: 4534dcd494979ea89d8243002fb478857e25032d
Component: engine
2017-02-22 11:14:15 +01:00
c1d1b2f6f9 Merge pull request #30954 from yongtang/29448-swagger-version
Improve documentation of `Version` usage for Swarm API
Upstream-commit: 89fe0e1b1436871e3d844f8096d1520eaacfad74
Component: engine
2017-02-22 10:59:10 +01:00
4d7a2d0494 Merge pull request #31248 from lixiaobing10051267/masterCliTest
rectify the function name used by note
Upstream-commit: f001c54fee73a99b9396bc6cfc19a0945a00da44
Component: engine
2017-02-22 17:40:50 +09:00
aab1219e8c rectify the function name used by note
Signed-off-by: lixiaobing10051267 <li.xiaobing1@zte.com.cn>
Upstream-commit: 8fff3ea3d60b36745d9dc05546031fe3e851ac35
Component: engine
2017-02-22 16:13:45 +08:00
edc3a87209 Merge pull request #31211 from lixiaobing10051267/masterAttach
invalide detach keys provided
Upstream-commit: ffc70d2f0c2d8552d67e9af0e1a645abf04ca0e2
Component: engine
2017-02-22 11:28:15 +08:00
9e10267bf9 invalide detach keys provided
Signed-off-by: lixiaobing10051267 <li.xiaobing1@zte.com.cn>
Upstream-commit: 660ec32e8fbaf62c6ae9254377495a0674d858d6
Component: engine
2017-02-22 09:48:18 +08:00
5743402c1f Merge pull request #31189 from runcom/fix-build-cache-from
image/cache: fix isValidParent logic
Upstream-commit: 093867b9a6c1f922f18c11aedf107b550b6f0c63
Component: engine
2017-02-21 15:57:18 -08:00
13e389da3c Improve documentation of Version usage for Swarm API
This fix is an attempt to improve the documentation of
`Version` usage for Swarm API in Swagger docs.

As is shown in the docs updates, `Version` field in Swarm
API is a way to ensure safe concurrency and determinism
so that multiple updates to the same swarm related objects
(Node, Service, etc) will not unintentially overwrite each other.

This fix fixes 29448.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
Upstream-commit: 61e3e80b63f697d79665914a23e449fb94e3b678
Component: engine
2017-02-21 15:42:25 -08:00
25f196e2c2 Merge pull request #31206 from xuzhenglun/master
fix wrong print format
Upstream-commit: 19795b934cac6f90b75f973ba59ece153c3df2cb
Component: engine
2017-02-21 14:13:32 -08:00