Aaron Lehmann
37be2d4e9b
distribution: Add text/html and application/json as image mediatypes
...
As noted by #30083 , the new strict checking of mediatypes misses some
cases where earlier bugs caused nonstandard mediatypes to be stored in
manifests. Two of the known cases are text/html and application/json,
which were returned by certain registries and stored by earlier versions
of Docker. Add special cases for text/html and application/json.
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
(cherry picked from commit a215e15cb1
2017-01-24 15:53:36 -08:00
Harald Albers
880c12df7d
Add bash completion for run|create --init-path
...
Signed-off-by: Harald Albers <github@albersweb.de>
(cherry picked from commit 182048f185
2017-01-24 15:41:44 -08:00
Harald Albers
ecd95a41d2
Add docs for run|create --init|--init-path
...
Signed-off-by: Harald Albers <github@albersweb.de>
(cherry picked from commit d049ef2b0d
2017-01-24 15:41:37 -08:00
Kenfe-Mickael Laventure
b9ee1c6880
Ensure proper value is used when computing reclaimable space
...
When Size was reverted to be equal to VirtualSize, the df command
formatter was not correctly updated to account for the change.
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
(cherry picked from commit dcc1b4baf6
2017-01-24 15:41:06 -08:00
Steve Durrheimer
0c16980468
Add zsh completion for 'dockerd --init' and 'docker {create,run} --init'
...
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
(cherry picked from commit cdf57782fd
2017-01-24 13:52:09 -08:00
Harald Albers
1ec7869443
Add bash completion for plugin install --disable-content-trust
...
Signed-off-by: Harald Albers <github@albersweb.de>
(cherry picked from commit 725a864a04
2017-01-24 13:49:24 -08:00
Steve Durrheimer
0fa35e2073
Add zsh completion for 'docker plugin install --alias'
...
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
(cherry picked from commit 455b7bcbab
2017-01-24 13:48:58 -08:00
Harald Albers
0be8ebd2a1
Fix bash completion for docker service update
...
Signed-off-by: Harald Albers <github@albersweb.de>
(cherry picked from commit 01ac33ce16
2017-01-24 13:48:18 -08:00
Harald Albers
b4fd48ce32
Add bash completion for docker service ps --filter node
...
Signed-off-by: Harald Albers <github@albersweb.de>
(cherry picked from commit a39a2bb6c2
2017-01-24 13:47:54 -08:00
Harald Albers
9da299954f
Add missing options to bash completion for docker swarm init|update
...
Signed-off-by: Harald Albers <github@albersweb.de>
(cherry picked from commit f93da79dc1
2017-01-24 13:47:28 -08:00
Harald Albers
d4e6422212
Add bash completion for docker swarm unlock|unlock-key
...
Signed-off-by: Harald Albers <github@albersweb.de>
(cherry picked from commit 07bd5152b3
2017-01-24 13:47:03 -08:00
Victor Vieux
954520f0ef
Merge pull request #30329 from johndmulhausen/patch-2
...
Fixing formatting errors in Run refdoc
2017-01-20 14:14:15 -08:00
Harald Albers
23e9d30cea
Fix treatment of DOCKER_HIDE_LEGACY_COMMANDS in bash completion
...
Signed-off-by: Harald Albers <github@albersweb.de>
(cherry picked from commit 12952f537c
2017-01-20 14:07:19 -08:00
Harald Albers
7bb3740386
Honour $DOCKER_HIDE_LEGACY_COMMANDS in bash completion
...
Signed-off-by: Harald Albers <github@albersweb.de>
(cherry picked from commit aa006f1280
2017-01-20 14:06:58 -08:00
Harald Albers
ba79dde9d2
Add bash completion for build --squash
...
Signed-off-by: Harald Albers <github@albersweb.de>
(cherry picked from commit e91dbba7ff
2017-01-20 14:06:01 -08:00
Harald Albers
d621d74f64
Add bash completion for dockerd --init and docker run|create --init
...
Fixes #30263
Signed-off-by: Harald Albers <github@albersweb.de>
(cherry picked from commit 2076261757
2017-01-20 14:05:33 -08:00
Steve Durrheimer
78e4fa2caa
Add zsh completion for 'docker swarm --availability'
...
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
(cherry picked from commit ee2ce82c61
2017-01-20 14:05:10 -08:00
Steve Durrheimer
f6d70d08a8
Add zsh completion for 'docker {container,image,network,system} prune --filter'
...
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
(cherry picked from commit 784ebccffa
2017-01-20 14:03:45 -08:00
Anusha Ragunathan
660a186e92
Pass plugingetter as part of swarm node config.
...
This is necessary for swarmkit to support cluster wide plugins, such as
globally scoped network plugins.
Signed-off-by: Anusha Ragunathan <anusha.ragunathan@docker.com>
2017-01-20 13:44:22 -08:00
John Mulhausen
bd6c3ebed9
Fixing formatting errors
...
Fixing issues on https://docs.docker.com/engine/reference/builder/#arg
Signed-off-by: John Mulhausen <john@docker.com>
2017-01-20 13:26:30 -08:00
Victor Vieux
49bf474f9e
bump version to 1.13.0
...
Signed-off-by: Victor Vieux <vieux@docker.com>
2017-01-17 01:00:55 -08:00
Victor Vieux
d4f36676f0
Merge pull request #30188 from thaJeztah/update-1.13-changelog
...
[1.13] Add missing 1.13 features to changelog
2017-01-17 00:59:25 -08:00
Sebastiaan van Stijn
197977d7fd
Merge pull request #30108 from thaJeztah/update-changelog-1.12.6
...
Update changelog on master with changes from 1.12.x
(cherry picked from commit a4bc730298
2017-01-17 09:53:25 +01:00
Sebastiaan van Stijn
8324f11b5a
Add missing 1.13 features to changelog
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2017-01-16 18:45:55 +01:00
Victor Vieux
48a9e53d70
bump version to 1.13.0-rc7
...
Signed-off-by: Victor Vieux <vieux@docker.com>
2017-01-11 18:06:55 -08:00
Victor Vieux
bca3b05950
Merge pull request #30116 from vieux/cherry-pick-1.13.0-rc7
...
cherry pick 1.13.0-rc7
2017-01-12 22:03:51 -08:00
Yong Tang
4f914489e3
Add test for image size for v1.12 and v1.13 clients against v1.13 daemon
...
This test checks to make sure both v1.12 and v1.13 client against v1.13 daemon get correct `Size` after the fix.
This test is related to 30027.
Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
(cherry picked from commit d9451f1c8c
2017-01-11 17:59:31 -08:00
Kenfe-Mickael Laventure
e62d984138
Fix ImageSummary.Size value
...
The prune PR changed the meaning of the file to mean "space on disk
only unique to this image", this PR revert this change.
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
(cherry picked from commit be20dc15af
2017-01-11 17:21:26 -08:00
Stefan J. Wernli
f6bc09c380
storeLayer.Parent should return describableStoreLayers
...
When storeLayer.Parent returns the parent layer, it needs to use the same logic as Get where it wraps in a describablyStoreLayer if the layer is describable. Otherwise, on Windows, this can result in pushing the foreign layers, which is not supposed to be allowed.
This fixes https://github.com/docker/docker/issues/30080 .
Signed-off-by: Stefan J. Wernli <swernli@microsoft.com>
(cherry picked from commit d14b7212ad
2017-01-11 14:54:09 -08:00
Victor Vieux
2f2d055013
bump version to 1.13.0-rc6
...
Signed-off-by: Victor Vieux <vieux@docker.com>
2017-01-11 09:36:57 -08:00
Tõnis Tiigi
fc82c4b391
Merge pull request #30044 from tonistiigi/update-runc-113
...
[v1.13] vendor: update runc to 2f7393a4
2017-01-11 08:37:36 -08:00
Madhu Venugopal
e0c07ab799
Merge pull request #30042 from aaronlehmann/vendor-swarmkit-296fcfc
...
[1.13] Update vendored swarmkit to 296fcfc
2017-01-10 20:59:14 -08:00
Tonis Tiigi
acbad31dcd
vendor: update runc to 2f7393a4
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2017-01-10 18:07:20 -08:00
Victor Vieux
7e792d6ca9
Merge pull request #30012 from tiborvass/plugin-devices-redone
...
[1.13] Plugins: Rename DeviceCreation to AllowAllDevices
2017-01-10 17:28:14 -08:00
Madhu Venugopal
c8083e8735
Modify network plugin test for swarm-mode
...
Signed-off-by: Madhu Venugopal <madhu@docker.com>
2017-01-10 16:38:24 -08:00
Aaron Lehmann
18fd3885c6
Update vendored swarmkit to 296fcfc
...
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
2017-01-10 16:07:45 -08:00
Tibor Vass
83b2782ea9
plugins: rename DeviceCreation to AllowAllDevices
...
Signed-off-by: Tibor Vass <tibor@docker.com>
(cherry picked from commit f265727bdf
2017-01-10 15:21:46 -08:00
Alexander Morozov
ece7e8ba27
Merge pull request #30034 from aaronlehmann/vendor-swarmkit-70cb786
...
[1.13] Update vendored swarmkit to 70cb786
2017-01-10 15:19:17 -08:00
Tonis Tiigi
4b2b0eb608
Add workaround for possible SetClusterProvider deadlock
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2017-01-10 15:14:26 -08:00
Aaron Lehmann
3fc1510dff
[1.13] Update vendored swarmkit to 70cb786
...
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
2017-01-10 12:55:35 -08:00
Vincent Demeester
340f288211
Merge pull request #29962 from vieux/1.13.0-rc6-cherrypicks
...
1.13.0 rc6 cherrypicks
2017-01-10 10:09:04 +01:00
Victor Vieux
0b2a029e56
Merge pull request #30009 from thaJeztah/revert-27146
...
[1.13.x] Revert "Require continuation char to be last char in a line"
2017-01-09 17:45:17 -08:00
Brian Goff
b7f412ef44
Merge pull request #29958 from cpuguy83/1.13_fix_selinux_packaging
...
[1.13] Fix conflicts with newly updated selinux policies
2017-01-09 20:15:51 -05:00
Sebastiaan van Stijn
57c17882a3
Revert "Require continuation char to be last char in a line"
...
This reverts commit 105bc63295
2017-01-10 00:36:40 +01:00
Victor Vieux
25879cfa54
Merge pull request #29994 from vdemeester/29974-fix-external-network
...
[1.13.x] Few stack deploy network fixes
2017-01-09 14:40:54 -08:00
Victor Vieux
6c2fdb64d1
Merge pull request #30004 from dnephin/fix-1.13-stack-deploy-resources
...
[1.13] Fix parsing resources from compose file for stack deploy
2017-01-09 14:40:30 -08:00
Victor Vieux
3fc150171f
Merge pull request #30007 from aaronlehmann/vendor-swarmkit-8ea08a3
...
[1.13] Update vendored swarmkit to 8ea08a3
2017-01-09 14:39:57 -08:00
Victor Vieux
53ac375422
Merge pull request #29905 from coolljt0725/cherry-pick-29721
...
1.13.x cherry-pick: Cherry pick 29721
2017-01-09 14:22:23 -08:00
Aaron Lehmann
831eeb38f1
[1.13] Update vendored swarmkit to 8ea08a3
...
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
2017-01-09 11:45:04 -08:00
Daniel Nephin
f27a297595
Fix parsing resources from compose file for stack deploy.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2017-01-09 14:15:32 -05:00
