Commit Graph
31250 Commits
Author SHA1 Message Date
Yong Tang 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
Victor Vieux 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
Sebastiaan van Stijn 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
John Howard 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
Antonio Murdaca 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
Sebastiaan van Stijn 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
Alexander Morozov 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
Vincent Demeester 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
Yong Tang 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
Doug Davis 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
Reficul 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
Yong Tang 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
Sebastiaan van Stijn 301cc805aa Merge pull request #30814 from YuPengZTE/devSwarmCliExplain
fix the type
Upstream-commit: 25500d56a5f3a94456bd8172a64bf119cc36dd7f
Component: engine
2017-02-21 00:59:58 +01:00
Victor Vieux 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
Tony Abboud 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
Harald Albers 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
Harald Albers 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
Vincent Demeester 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
allencloud 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
erxian 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
Vincent Demeester 86338aa9ad Merge pull request #31159 from tonistiigi/fix-size-lock
Don’t hold container lock for size calculation
Upstream-commit: 91cffdbedb89e6164fe2ceca3d68ec039c1acc34
Component: engine
2017-02-19 16:31:21 +01:00
Victor Vieux 6446421ffd add missing API changes
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
Upstream-commit: a7e6d2ca1fd30a6122a65558507135e7079ae6a7
Component: engine
2017-02-19 01:33:43 -08:00
Sebastiaan van Stijn 07cb0637fc Merge pull request #31160 from pastcompute/patch-1
Fix missing whitespace between words in manpage
Upstream-commit: 475a8be5e507e3af645029336a75603e4fc1030d
Component: engine
2017-02-19 01:24:38 -08:00
Andrew McDonnell dbeb0f7f68 Fix whitespace error.
Signed-off-by: Andrew McDonnell <bugs@andrewmcdonnell.net>
Upstream-commit: 296c803d320fa941d8dd0dc5dc73b683486b6c92
Component: engine
2017-02-19 17:28:26 +10:30
Tonis Tiigi c000845b00 Don’t hold container lock for size calculation
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Upstream-commit: bd33a99acfb0e2dd02f692242237d9060e359f4a
Component: engine
2017-02-18 18:11:48 -08:00
Sebastiaan van Stijn adced63586 Merge pull request #30898 from allencloud/add-link-query-in-container-rm-api-doc
add link query in container rm api doc
Upstream-commit: b89aff1afa1f61993ab2ba18fd62d9375a195f5d
Component: engine
2017-02-18 09:53:51 -08:00
Victor Vieux 618fe3e94e Merge pull request #31145 from yongtang/29972-service-read-only-follow-up
Update version-history.md for `ReadOnly` parameter
Upstream-commit: 04c6a04f29bae55f4a27d6a46bd6f983a55ac96d
Component: engine
2017-02-17 23:24:24 -08:00
Sebastiaan van Stijn cf8e30ef04 Merge pull request #31141 from thaJeztah/swarm-node-error-return-503
fix status-code for "locked" swarm and "certificate expired"
Upstream-commit: 6486924f0b6464a90c9c2d251a3ab0a96302dce9
Component: engine
2017-02-17 21:10:45 -08:00
Yong Tang 043ff88c00 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>
Upstream-commit: 097b38c15d420cc467e4bc3587dfe505a4748b47
Component: engine
2017-02-17 19:18:37 -08:00
Aaron.L.Xu cdf7829892 fix some typos from module contrib to man
Signed-off-by: Aaron.L.Xu <likexu@harmonycloud.cn>
Upstream-commit: e0577d5fe876ec92de21c808c31e97e052654223
Component: engine
2017-02-18 10:08:55 +08:00
Sebastiaan van Stijn 55d1061650 Merge pull request #31013 from alihandemir/patch-1
Update LICENSE date
Upstream-commit: cf449cf69c828293bcb09b6837894fb474742988
Component: engine
2017-02-17 17:44:36 -08:00
Victor Vieux 0cc00d1673 Merge pull request #31055 from Microsoft/jjh/fix30278
Windows: Retry workaround for RS1/RS2 compute system enumeration
Upstream-commit: 7761c69e239171c6b388d53d03619eacc49338a0
Component: engine
2017-02-17 16:53:16 -08:00
Sebastiaan van Stijn 999e2c3104 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>
Upstream-commit: 7e44fffe40f39ef4cc0b3bee810f7d0a26136376
Component: engine
2017-02-17 16:51:50 -08:00
Tonis Tiigi abadc8a614 Add more locking to storage drivers
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Upstream-commit: fc1cf1911bb92def95f407364372992d57b11ca2
Component: engine
2017-02-17 15:50:25 -08:00
Victor Vieux 9d740761c3 Merge pull request #31075 from vieux/switch_to_new_versioning_scheme
Switch to new versioning scheme
Upstream-commit: cf5fe9ed0bbadc08512b485f7d1debd423fa3178
Component: engine
2017-02-17 15:43:28 -08:00
Brian Goff 8c17c2f980 Merge pull request #31125 from thaJeztah/fix-TestPullFailsWithAlteredLayer
fix TestPullFailsWithAlteredLayer
Upstream-commit: 95a2aed95ef9381c9e0740643422edbe7684d5af
Component: engine
2017-02-17 16:24:34 -05:00
Anusha Ragunathan 00a09015ca Merge pull request #29984 from jmzwcn/issueNNP
[feature]: add daemon flag to set no_new_priv as default for unprivileged containers
Upstream-commit: 6dd2a82458016d15786b0bb12ba4cecde9b6bb90
Component: engine
2017-02-17 11:43:43 -08:00
Sebastiaan van Stijn 59528eea6e fix DockerSchema1RegistrySuite.TestPullFailsWithAlteredLayer
This test was failing if after the busybox image switched to a
single layer.

The test fails because it alters the data of an empty layer and
relies on a side effect of another empty layer not being skipped
on pull to pass.

(The original patch was provided by Tonis Tiigi)

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 4077614fb3e2324ddb897adf3cd092a8085543c1
Component: engine
2017-02-17 10:34:33 -08:00
Anusha Ragunathan b7f72f988d Merge pull request #28213 from yongtang/11062016-service-ps-format
Add `--format` to `docker service ps`
Upstream-commit: b1debf1374ca7be7e7b4d4fcd41eceaf8b7cf153
Component: engine
2017-02-17 10:23:18 -08:00
Anusha Ragunathan f93c7187cd Service creation using network plugin filters.
Signed-off-by: Anusha Ragunathan <anusha.ragunathan@docker.com>
Upstream-commit: bcdd6aa3561357bed88e2aeb07445225fc8c12a9
Component: engine
2017-02-17 09:41:37 -08:00
Alexander Morozov 7b79f78433 Merge pull request #30967 from adshmh/24631-service-without-labels-returns-empty-map
Inspect output on service without labels is an empty map instead of null, fixes #24631
Upstream-commit: 0de867b315ff5734530558319b1f20238c81ba0c
Component: engine
2017-02-17 08:49:32 -08:00
Alexander Morozov ffcecda259 Merge pull request #31114 from allencloud/split-compose-stack-deploy-from-deploydotgo
split compose deploy from deploy.go
Upstream-commit: f00514a1d0cb883229e8388ef0c8bd91efcca6dd
Component: engine
2017-02-17 08:48:51 -08:00
Vincent Demeester 7fdc39f1fc Merge pull request #30848 from nishanttotla/suppress-digest-docker-ps
Suppressing image digest in docker ps
Upstream-commit: 40532143c2c4cf1359fd8484789b81c1f1f59d98
Component: engine
2017-02-17 10:27:49 +01:00
Vincent Demeester 5c62127220 Merge pull request #29742 from miaoyq/rewrite-validate-privileges
Rewrite the function 'validatePrivileges' without checking order
Upstream-commit: 0ac25dfc751fa4304ab45afd5cd8705c2235d101
Component: engine
2017-02-17 10:24:11 +01:00
Vincent Demeester ba76fec59c Merge pull request #31069 from tonistiigi/fix-overlay2-unmount
overlay2: fix unmounting layer without merge dir
Upstream-commit: 146bc072a9bc0c52509d55a96c4324e3cee3d557
Component: engine
2017-02-17 10:21:47 +01:00
allencloud 5f5d704cba split compose deploy from deploy.go
Signed-off-by: allencloud <allen.sun@daocloud.io>
Upstream-commit: f46a14f7b611276256c7e8148e87c1d570201d74
Component: engine
2017-02-17 17:13:31 +08:00
Vincent Demeester def1ef1214 Merge pull request #29894 from cpuguy83/cleanup_volumedriver_retry_test
Use vol plugin creator instead of inserting spec
Upstream-commit: d07cd8c3210f0072b46f402be1dca26f93478ac3
Component: engine
2017-02-17 09:46:31 +01:00
Vincent Demeester 5ecbd0e344 Merge pull request #31103 from tonistiigi/update-docs-link
Update storage driver options link
Upstream-commit: e1839ab95341fe8c40d8e8e0112fcfab38c92f3f
Component: engine
2017-02-17 09:45:31 +01:00
Brian Goff e4c1cbaa7f Merge pull request #30809 from fate-grand-order/branch
Correct fmt.Fprintf and t.Fatalf
Upstream-commit: a2106c8224b9b6224b41eb4221a96a29c1237545
Component: engine
2017-02-16 23:02:03 -05:00
Brian Goff 000b690000 Merge pull request #31088 from xulike666/make-code-readable-again
Typo fixed and this time I provide my cSpell.json
Upstream-commit: 8e5769445211f71635432dcdba17d31f2571e52a
Component: engine
2017-02-16 22:04:27 -05:00