Commit Graph

31631 Commits

Author SHA1 Message Date
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
1798e7e8be 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 2e20e63da2a8a0ffbbb3f2146f87559e17f43046 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>
Upstream-commit: 19215597982232f65dcbc873e54e632b99cddecc
Component: engine
2017-02-23 13:36:57 +01:00
c6ebb9e13b Improved aarch64 build
- Added 'golint', 'yamllint', and 'swagger'
- Fixed man/Dockerfile.aarch64 by bootstrapping Go 1.7.5

Signed-off-by: Boris Pruessmann <boris@pruessmann.org>
Upstream-commit: cdf17e6943b15103b37fd57da7c2729a26ecb674
Component: engine
2017-02-23 10:51:27 +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
72ef392909 Check parameter --ip --ip6 --link-local-ip in
Signed-off-by: chchliang <chen.chuanliang@zte.com.cn>
Upstream-commit: b7ce6ce02e2776c3d83eac7c676cc10e23908c78
Component: engine
2017-02-23 14:13:55 +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
5050030ffa Add --stop-signal for service create and service update
This fix tries to address the issue raised in 25696 where
it was not possible to specify `--stop-signal` for `docker service create`
and `docker service update`, in order to use special signal to stop
the container.

This fix adds `--stop-signal` and update the `StopSignal` in `Config`
through `service create` and `service update`.

Related docs has been updated.

Integration test has been added.

This fix fixes 25696.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
Upstream-commit: c2d49ec214649b0025f7060429334893350fbaee
Component: engine
2017-02-21 15:19:45 -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
7e387ff4cc Merge pull request #31232 from thaJeztah/move-james-to-alumni
move James to alumni
Upstream-commit: 1138803d6611034a9f80e604d7e13f157deaf80f
Component: engine
2017-02-21 23:11:08 +01:00
f292c3369c ignore registry url from user when it is the default namespace
Signed-off-by: Krasi Georgiev <krasi@vip-consult.solutions>
Upstream-commit: 2914098996e0cacfb0c72027d3d115559df323d4
Component: engine
2017-02-21 22:04:54 +02:00
f2eb0b821b Merge pull request #30747 from friism/update-windows-dockerfiles
update git, hoist powershell setttings to top and get git simpler
Upstream-commit: 5fd1aee29a91a597488fd3118dc7d3040bcecbe3
Component: engine
2017-02-21 10:53:57 -08:00
2f3cef62de image/cache: fix isValidParent logic
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
Upstream-commit: 1cf4b2b8bd92562ffe8d7cce8a705efb3ef32ba7
Component: engine
2017-02-21 19:32:04 +01:00
605db46d50 move James to alumni
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: d1b81263315dc34f77019f4f2b2b84a84a24b39d
Component: engine
2017-02-21 18:20:49 +01:00
b6a3bf40fb Merge pull request #31136 from tonistiigi/more-locks
Add more locking to storage drivers
Upstream-commit: 1ad165dba151a76af30a8dee548d9e5689183227
Component: engine
2017-02-21 07:39:33 -08:00
cbc9c577fc Merge pull request #31207 from duglin/BuildArgDocs
Add even more docs around BuildArgs and *string
Upstream-commit: aef8aa565f471eeed64eb6f25e15b3ac634048a3
Component: engine
2017-02-21 09:46:31 +01:00
20b38c5942 Added debian-jessie for aarch64
Adding debian-jessie as output for running make deb on aarch64. Also
update GO_VERSION to 1.8 to fix issues with incorrect pagesize.-

Signed-off-by: Boris Pruessmann <boris@pruessmann.org>
Upstream-commit: f9543b339dcc47b28e0eb1b39b6a59b70ca3867e
Component: engine
2017-02-21 07:43:57 +01:00
710afa4c9a 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>
Upstream-commit: 7e6ce7c1768335600abc82a2fe933f19af70bad4
Component: engine
2017-02-20 19:29:25 -08:00
99c5a3ad18 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>
Upstream-commit: 9419ccd706feee0531d63ec3b517f97104b5177f
Component: engine
2017-02-20 19:19:56 -08:00
a8278abaf1 fix wrong print format
Signed-off-by: Reficul <xuzhenglun@gmail.com>
Upstream-commit: 9b1ceecd8a44e72ad773f7016df09a4b285258b8
Component: engine
2017-02-21 10:26:06 +08:00
2de064d034 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>
Upstream-commit: 897e69143a15bbf5f4efe91664e3de2aba7264a1
Component: engine
2017-02-20 16:06:20 -08:00
301cc805aa Merge pull request #30814 from YuPengZTE/devSwarmCliExplain
fix the type
Upstream-commit: 25500d56a5f3a94456bd8172a64bf119cc36dd7f
Component: engine
2017-02-21 00:59:58 +01:00
1483bc0c6d Merge pull request #31164 from vieux/missing_api_changes
add missing API changes
Upstream-commit: f10085165a42dc93b6180e0e5478f71c1c614126
Component: engine
2017-02-20 15:42:19 -08:00
7dba33b4e7 Add --add-host for docker build
Signed-off-by: Tony Abboud <tdabboud@hotmail.com>
Upstream-commit: 7a962e4577628c357f96153eca07e527813fb42b
Component: engine
2017-02-20 17:32:28 -05:00
da91e54336 Add support for command aliases to bash completion of docker volume
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: 073047101e17dcb1cd3713ad89faa3f15b2a8a6f
Component: engine
2017-02-20 18:19:57 +01:00
88987394f4 Hide aliases in bash completion of docker node|service
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: 52330a907ab3e5a0dfbfac4a7ca39a8ae268d32a
Component: engine
2017-02-20 16:48:42 +01:00
c4ca316177 Merge pull request #31034 from erxian/refine-service-update-document
add rollback explanation to docker service update command document
Upstream-commit: 75843d36aa5c3eaade50da005f9e0ff2602f3d5e
Component: engine
2017-02-20 09:29:38 +01:00
de008a1137 do not allow sub second in healthcheck options in Dockerfile
Signed-off-by: allencloud <allen.sun@daocloud.io>
Upstream-commit: 63811a82b67528494f711086547580e7c40aaa93
Component: engine
2017-02-20 15:47:34 +08:00
07ac2fb3ec add rollback explanation to docker service update command document
Signed-off-by: erxian <evelynhsu21@gmail.com>
Upstream-commit: 34919accaa1f43fce17398aa82430cfe5883ea2f
Component: engine
2017-02-20 11:37:07 +08:00