Commit graph

31056 commits

Author SHA1 Message Date
Sebastiaan van Stijn
1921559798
add d_type warning to docker info, and optimize output
The overlay(2) drivers were moved up in the list of storage drivers,
and are known to have problems if the backing filesystem does not
support d_type.

Commit 2e20e63da2 added a warning,
which is logged in the daemon logs, however, many users do not
check those logs, and may overlook this warning.

This patch adds the same warning to the output of `docker info`
so that the warning is more easily found.

In addition, the output of warnings printed by `docker info` is
optimized, by;

- moving all warnings to the _end_ of the output, instead of
  mixing them with the regular output
- wrapping the storage-driver warnings, so that they are more
  easily readable

Example output with this patch applied
============================================

devicemapper using loopback devices:

    ...
    Insecure Registries:
     127.0.0.0/8
    Live Restore Enabled: false

    WARNING: devicemapper: usage of loopback devices is strongly discouraged for production use.
             Use `--storage-opt dm.thinpooldev` to specify a custom block storage device.
    WARNING: bridge-nf-call-iptables is disabled
    WARNING: bridge-nf-call-ip6tables is disabled

overlay2 on xfs without d_type support;

    ...
    Insecure Registries:
     127.0.0.0/8
    Live Restore Enabled: false

    WARNING: overlay2: the backing xfs filesystem is formatted without d_type support, which leads to incorrect behavior.
             Reformat the filesystem with ftype=1 to enable d_type support.
             Running without d_type support will not be supported in future releases.
    WARNING: bridge-nf-call-iptables is disabled

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2017-02-23 13:36:57 +01:00
Victor Vieux
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
Aaron Lehmann
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
Alexander Morozov
b0986f3b55 Merge pull request #31259 from mlaventure/bump-runc
Bump runc to version a01dafd48bc1c7cc12bdb01206f9fea7dd6feb70
2017-02-22 17:47:00 -08:00
Alexander Morozov
b3e7f70137 Merge pull request #31263 from nalind/journal-doublefree
Synchronize the cursor returned by followJournal
2017-02-22 17:45:49 -08:00
Victor Vieux
1948cc5fac Merge pull request #31276 from thaJeztah/update-authors
Update authors
2017-02-22 17:23:25 -08:00
Sebastiaan van Stijn
5dfac5499a
Update authors
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2017-02-23 02:17:51 +01:00
Victor Vieux
19cd2aa389 Merge pull request #31203 from yongtang/02202017-Swagger-ContainerSpec
Add missing fields in Swagger docs
2017-02-22 15:54:23 -08:00
Sebastiaan van Stijn
cf8408106d Merge pull request #31204 from yongtang/31179-Swagger-Secrets
Add missing Secrets in Swagger docs
2017-02-23 00:45:32 +01:00
Victor Vieux
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
Kenfe-Mickael Laventure
6f0e2c8c8b Bump runc to version a01dafd48bc1c7cc12bdb01206f9fea7dd6feb70
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
2017-02-22 14:10:33 -08:00
Nalin Dahyabhai
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
Kenfe-Mickael Laventure
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
Vincent Demeester
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
Vincent Demeester
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
Akihiro Suda
f001c54fee Merge pull request #31248 from lixiaobing10051267/masterCliTest
rectify the function name used by note
2017-02-22 17:40:50 +09:00
lixiaobing10051267
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
Lei Jitang
ffc70d2f0c Merge pull request #31211 from lixiaobing10051267/masterAttach
invalide detach keys provided
2017-02-22 11:28:15 +08:00
lixiaobing10051267
660ec32e8f invalide detach keys provided
Signed-off-by: lixiaobing10051267 <li.xiaobing1@zte.com.cn>
2017-02-22 09:48:18 +08:00
Alexander Morozov
093867b9a6 Merge pull request #31189 from runcom/fix-build-cache-from
image/cache: fix isValidParent logic
2017-02-21 15:57:18 -08:00
Yong Tang
61e3e80b63 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>
2017-02-21 15:42:25 -08:00
Victor Vieux
19795b934c Merge pull request #31206 from xuzhenglun/master
fix wrong print format
2017-02-21 14:13:32 -08:00
Sebastiaan van Stijn
1138803d66 Merge pull request #31232 from thaJeztah/move-james-to-alumni
move James to alumni
2017-02-21 23:11:08 +01:00
John Howard
5fd1aee29a Merge pull request #30747 from friism/update-windows-dockerfiles
update git, hoist powershell setttings to top and get git simpler
2017-02-21 10:53:57 -08:00
Antonio Murdaca
1cf4b2b8bd
image/cache: fix isValidParent logic
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
2017-02-21 19:32:04 +01:00
Sebastiaan van Stijn
d1b8126331
move James to alumni
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2017-02-21 18:20:49 +01:00
Alexander Morozov
1ad165dba1 Merge pull request #31136 from tonistiigi/more-locks
Add more locking to storage drivers
2017-02-21 07:39:33 -08:00
Vincent Demeester
aef8aa565f Merge pull request #31207 from duglin/BuildArgDocs
Add even more docs around BuildArgs and *string
2017-02-21 09:46:31 +01:00
Yong Tang
7e6ce7c176 Add missing Secrets in Swagger docs
This fix tries to address the issue in 31179 where
secrets fields is missing for `docker service create`
or `docker service update`.

This fix adds Secrets for `ContainerSpec` in Swagger docs.

This fix fixes 31179.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
2017-02-20 19:29:25 -08:00
Doug Davis
9419ccd706 Add even more docs around BuildArgs and *string
PR #31197 made me think I needed to add more text explaing why
BuildArgs needs to be a *string instead of string.

Signed-off-by: Doug Davis <dug@us.ibm.com>
2017-02-20 19:19:56 -08:00
Reficul
9b1ceecd8a
fix wrong print format
Signed-off-by: Reficul <xuzhenglun@gmail.com>
2017-02-21 10:26:06 +08:00
Yong Tang
897e69143a Add missing fields in Swagger docs
This fix adds the missing fields of `Hostname`, `OpenStdin`,
`Hosts`, `Groups`, and `Healthcheck` to `ContainerSpec`.
This fix also moves the `Label` in `ContainerSpec` to align with
the definition order.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
2017-02-20 16:06:20 -08:00
Sebastiaan van Stijn
25500d56a5 Merge pull request #30814 from YuPengZTE/devSwarmCliExplain
fix the type
2017-02-21 00:59:58 +01:00
Victor Vieux
f10085165a Merge pull request #31164 from vieux/missing_api_changes
add missing API changes
2017-02-20 15:42:19 -08:00
Vincent Demeester
75843d36aa Merge pull request #31034 from erxian/refine-service-update-document
add rollback explanation to docker service update command document
2017-02-20 09:29:38 +01:00
erxian
34919accaa add rollback explanation to docker service update command document
Signed-off-by: erxian <evelynhsu21@gmail.com>
2017-02-20 11:37:07 +08:00
Vincent Demeester
91cffdbedb Merge pull request #31159 from tonistiigi/fix-size-lock
Don’t hold container lock for size calculation
2017-02-19 16:31:21 +01:00
Victor Vieux
a7e6d2ca1f add missing API changes
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
2017-02-19 01:33:43 -08:00
Sebastiaan van Stijn
475a8be5e5 Merge pull request #31160 from pastcompute/patch-1
Fix missing whitespace between words in manpage
2017-02-19 01:24:38 -08:00
Andrew McDonnell
296c803d32 Fix whitespace error.
Signed-off-by: Andrew McDonnell <bugs@andrewmcdonnell.net>
2017-02-19 17:28:26 +10:30
Tonis Tiigi
bd33a99acf Don’t hold container lock for size calculation
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2017-02-18 18:11:48 -08:00
Sebastiaan van Stijn
b89aff1afa Merge pull request #30898 from allencloud/add-link-query-in-container-rm-api-doc
add link query in container rm api doc
2017-02-18 09:53:51 -08:00
Victor Vieux
04c6a04f29 Merge pull request #31145 from yongtang/29972-service-read-only-follow-up
Update version-history.md for `ReadOnly` parameter
2017-02-17 23:24:24 -08:00
Sebastiaan van Stijn
6486924f0b Merge pull request #31141 from thaJeztah/swarm-node-error-return-503
fix status-code for "locked" swarm and "certificate expired"
2017-02-17 21:10:45 -08:00
Yong Tang
097b38c15d Update version-history.md for ReadOnly parameter
This fix updates the `docs/api/version-history.md`
for `ReadOnly` parameter, which is now available in
`POST /services/create` and `POST /services/(id or name)/update`.

This fix is a follow up to 30162.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
2017-02-17 19:18:37 -08:00
Sebastiaan van Stijn
cf449cf69c Merge pull request #31013 from alihandemir/patch-1
Update LICENSE date
2017-02-17 17:44:36 -08:00
Victor Vieux
7761c69e23 Merge pull request #31055 from Microsoft/jjh/fix30278
Windows: Retry workaround for RS1/RS2 compute system enumeration
2017-02-17 16:53:16 -08:00
Sebastiaan van Stijn
7e44fffe40
fix status-code for "locked" swarm and "certificate expired"
These errors were producing the wrong status code,
changing to 503.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2017-02-17 16:51:50 -08:00
Tonis Tiigi
fc1cf1911b Add more locking to storage drivers
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2017-02-17 15:50:25 -08:00
Victor Vieux
cf5fe9ed0b Merge pull request #31075 from vieux/switch_to_new_versioning_scheme
Switch to new versioning scheme
2017-02-17 15:43:28 -08:00