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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
8c17c2f980
Merge pull request #31125 from thaJeztah/fix-TestPullFailsWithAlteredLayer
...
fix TestPullFailsWithAlteredLayer
Upstream-commit: 95a2aed95ef9381c9e0740643422edbe7684d5af
Component: engine
2017-02-17 16:24:34 -05:00
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
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
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
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
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
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
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
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
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
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
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
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
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
54df4712b6
Update storage driver options link
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com >
Upstream-commit: e9864cc0ec53ae3be250cb184274ccc9349bec2d
Component: engine
2017-02-16 18:32:17 -08:00
c5276a2bfc
Merge pull request #30679 from mlaventure/cgroup-devices-docs
...
Add example for --device-cgroup-rule to create reference
Upstream-commit: 623612fe09b72a907269a7d7fca94f7aeda1747c
Component: engine
2017-02-16 21:18:04 -05:00
48fc06e87e
Merge pull request #30618 from cpuguy83/fix_data_races
...
Fix some data races
Upstream-commit: 7978eef62337abc52912dd9a1901d8aa4aafa123
Component: engine
2017-02-16 21:15:21 -05:00
279032c38f
Merge pull request #31023 from mstanleyjones/fix_liquid_errors
...
Fix some Liquid errors
Upstream-commit: 88de5c36c7afdae095322c64c0472d27c4ff3f43
Component: engine
2017-02-16 18:13:15 -08:00
5361825be7
Suppressing image digest in docker ps
...
Signed-off-by: Nishant Totla <nishanttotla@gmail.com >
Upstream-commit: b04536f61fe9d8e9827832e0cef02cc2c5cef003
Component: engine
2017-02-16 18:11:56 -08:00
85bea8f4a4
Merge pull request #30946 from sdurrheimer/zsh-completion-log-opts
...
Add zsh completion for docker log options 'max-buffer-size|mode'
Upstream-commit: e412e33a2f79d84344b36b7ab292d9b820eb0a48
Component: engine
2017-02-16 20:51:31 -05:00
fd3b01be58
Merge pull request #31006 from vdemeester/30991-secret-mode-in-stack-deploy
...
Set 0444 as default secret mode in stack deploy
Upstream-commit: a12454d7a964b99921adabdb8f741da5a94a0e66
Component: engine
2017-02-16 20:34:21 -05:00
6b0b33830b
Merge pull request #31070 from cpuguy83/31060_fix_log_read_spin
...
Fix cpu spin waiting for log write events
Upstream-commit: 39851eac0c655d0c1911db58d4f630e2da233cac
Component: engine
2017-02-16 20:15:38 -05:00
33d38aa9ab
Merge pull request #31091 from yongtang/02162017-swarmkit-update
...
Update SwarmKit to 6bc357e9c5f0ac2cdf801898a43d08c260b4d5d0
Upstream-commit: 793c94fe440730310cbe88c33f8063418f426bb4
Component: engine
2017-02-16 17:12:00 -08:00
c531abbfb8
Merge pull request #31102 from vdemeester/add-yongtang-to-maintainers
...
Add Yong Tang to maintainers
Upstream-commit: 32b776d0d88c5f8b46a30bf7a73c964ad6d65519
Component: engine
2017-02-16 14:31:18 -08:00
36d38c8a19
Add Yong Tang to maintainers
...
This adds Yong Tang as a maintainer for
docker/docker, as was proposed and
voted on the maintainers mailinglist.
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: c7cf5fcf6c55b266c8166afb686ebd24ba8a34d8
Component: engine
2017-02-16 23:09:09 +01:00
679d4196b0
Merge pull request #31085 from vdemeester/sort-stack-ls
...
Sort `docker stack ls` by name
Upstream-commit: 3e53ecaaae0a6cebdfd6b734a7cb6ef47725a9b2
Component: engine
2017-02-16 14:23:48 -05:00
e2ff499d5e
Merge pull request #29001 from darrenstahlmsft/WindowsOnLinux
...
Block pulling Windows images on non-Windows daemons
Upstream-commit: c31f73abfda14fa2fd75d8eb0a04221066a93dca
Component: engine
2017-02-16 19:57:54 +01:00
88bba1c7b5
Merge pull request #31002 from vdemeester/images-remove-handle-tag-digest
...
reference: handle combination of tag and digest in ImageDelete
Upstream-commit: bd81a16df0b236e874370059fff930badb7bba0d
Component: engine
2017-02-16 10:49:04 -08:00
cb4d6aeea8
Update SwarmKit to 6bc357e9c5f0ac2cdf801898a43d08c260b4d5d0
...
This fix tries to update the SwarmKit from
ed384f3b3957f65e3111bd020f9815f3d4296fa2
to
6bc357e9c5f0ac2cdf801898a43d08c260b4d5d0
The following is the list of docker related changes:
1. Took long time for Docker Swarm service turn desired state from Ready to Running (Issue #28291 )
2. Native Swarm in 1.12 - panic: runtime error: index out of range (Issue #25608 )
3. Global mode target replicas keep increasing (Issue #30854 )
4. Creating service with publish mode=host and without published port crashes swarm manager (Issue #30938 )
5. Define signals used to stop containers for updates (Issue #25696 ) (PR #30754 )
This fix fixes #28291 , #25608 , #30854 , #30938 .
This fix is required by PR #30754 .
Signed-off-by: Yong Tang <yong.tang.github@outlook.com >
Upstream-commit: ec860ca2526a65ec3b7059666b8e65bab9acf62c
Component: engine
2017-02-16 08:50:00 -08:00
29e3dcbbb0
why there are so many mistakes in our repo (up to /cmd)
...
Signed-off-by: Aaron.L.Xu <likexu@harmonycloud.cn >
Upstream-commit: f8a40477960976f12dbbb72e5b133b5b0f05f9b3
Component: engine
2017-02-17 00:32:48 +08:00
19d262d100
Merge pull request #31054 from darrenstahlmsft/WaitOOBE
...
Windows: Wait for OOBE to prevent crashing during host update
Upstream-commit: 7f0b833621f61072d3176d224be02ea5089761f9
Component: engine
2017-02-16 11:18:25 -05:00
2f00829632
Merge pull request #31073 from aboch/naip
...
Release the network attachment on allocation failure
Upstream-commit: 55e2ed2a653f70c58206633710851ac75bc74e0b
Component: engine
2017-02-16 16:36:28 +01:00
ce49df485e
Merge pull request #30746 from yongtang/29936-validate-insecure-registry
...
Validate insecure registry (`--insecure-registry`) values
Upstream-commit: 387ff3c41d0d5185b747e5ec4c9550376d3d4cca
Component: engine
2017-02-16 14:53:51 +01:00
492545a1db
Sort docker stack ls by name
...
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: 97d85127c231d1b0823a3459d638dbd4f0ba1460
Component: engine
2017-02-16 14:30:39 +01:00
6224d25ac6
Release the network attachment on allocation failure
...
- otherwise the attachment task will stay in store and
consume IP addresses and there is no way to remove it.
Signed-off-by: Alessandro Boch <aboch@docker.com >
Upstream-commit: 91820b69412e2ec9e5b3201cd5c637ca1352fd39
Component: engine
2017-02-16 05:21:06 -08:00
