b003f7cdb4
Merge pull request #30077 from tonistiigi/fix-test-leaks
...
Fix leaked connections in integration tests
Upstream-commit: af5323f9583dbce0f6d8a43a2e442400b9e9b981
Component: engine
2017-01-12 11:35:02 +01:00
411f61003c
Merge pull request #30085 from swernli/skip_push_base
...
storeLayer.Parent should return describableStoreLayers
Upstream-commit: e48937fb9922cbc1a7e2b50eb9d3d6d589a51d02
Component: engine
2017-01-11 23:37:50 -08:00
8d865a6c15
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 >
Upstream-commit: d14b7212ad7b2b161afc6f0c9ac08daae14198c0
Component: engine
2017-01-11 19:01:13 -08:00
5d161f8e0e
Merge pull request #30073 from albers/completion-swarm-join--availability
...
Add bash completion for `swarm join --availability`
Upstream-commit: d9a4bba398031b6f644985d50265df9b32ce2ae0
Component: engine
2017-01-12 10:37:02 +09:00
4481a136ca
Merge pull request #30079 from tonistiigi/debug-trusttest
...
Print daemon stacktrace when trust test times out
Upstream-commit: 640a5c1a38b3d6128be27f15e823e7cb2ce7e323
Component: engine
2017-01-11 17:06:33 -08:00
1362fa8de5
Merge pull request #30065 from dnephin/fix-extends-error-message
...
Improve the error message for extends in stack deploy.
Upstream-commit: acaf3cf870ff6a88df5c480682046e4106e31da5
Component: engine
2017-01-11 15:27:01 -08:00
8618f63e83
Print daemon stacktrace when trust test times out
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com >
Upstream-commit: e533685d13251e5c7127f2d92636c7fa6393c06e
Component: engine
2017-01-11 15:14:36 -08:00
24c4a881f8
Fix leaked connections in integration tests
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com >
Upstream-commit: 1e98fb5ad91b956005059ae2148b1dda6fdf372c
Component: engine
2017-01-11 14:48:48 -08:00
b8f872e90b
Merge pull request #29891 from sanimej/libnvendor
...
vendorin libnetwork @f9fa6e0
Upstream-commit: de54284bd7cf4e1c8c255c61d0cf05533f3c2ba4
Component: engine
2017-01-11 19:55:00 +01:00
47580bbc58
Add bash completion for swarm join --availability
...
Signed-off-by: Harald Albers <github@albersweb.de >
Upstream-commit: f487b268f9ec7e4f06723261dadc2b567bf0504c
Component: engine
2017-01-11 10:30:56 -08:00
be1edfea27
Merge pull request #30060 from xulike666/fix-typo
...
Fix typo in libcontainerd/client.go
Upstream-commit: c38bb7a72517aec4c695d778c857621778edff82
Component: engine
2017-01-11 12:13:35 -05:00
b112b94b43
Improve the error message for extends in stack deploy.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: 46422df4900be14730447045cc1b1da3ebbf1e28
Component: engine
2017-01-11 11:57:24 -05:00
de94c8e520
Merge pull request #24993 from yongtang/24596-swarm-join-with-drain
...
Allow swarm join with `--availability=drain`
Upstream-commit: 66aba12df2319b55b04e381189da39a7f35029e5
Component: engine
2017-01-11 17:39:01 +01:00
8928076872
fix typo in libcontainerd/client.go
...
Signed-off-by: Aaron.L.Xu <likexu@harmonycloud.cn >
Upstream-commit: 39a24019e3a7b2f423090dff4793698001620737
Component: engine
2017-01-11 23:10:02 +08:00
95646d90c7
Merge pull request #29206 from ripcurld0/doc_api_update
...
Specify content type in the build request
Upstream-commit: 24e9ac15759cc23caf90383b5ea6de79af4363a0
Component: engine
2017-01-11 08:41:39 +01:00
1cb5b7c369
Merge pull request #30014 from tiborvass/plugin-devices-redone-master
...
Plugins: Rename DeviceCreation to AllowAllDevices
Upstream-commit: 696ef7a19eccd44732e9c50902c8949e574ef097
Component: engine
2017-01-10 17:24:38 -08:00
2b1a88aa3b
Handle IPv6 enabling correctly in the tests
...
Signed-off-by: Santhosh Manohar <santhosh@docker.com >
Upstream-commit: d5e8d8e1cfb65cab9a2a651fd30c50a06afb4e00
Component: engine
2017-01-10 16:34:23 -08:00
acaf4ba63f
Allow swarm init with --availability=drain
...
This fix adds a new flag `--availability` to `swarm join`.
Related documentation has been updated.
An integration test has been added.
Signed-off-by: Yong Tang <yong.tang.github@outlook.com >
Upstream-commit: 0f30c644441b3b4150252af1b41db99d4b6e697a
Component: engine
2017-01-10 16:31:51 -08:00
9a5d4b9c8d
Allow swarm join with --availability=drain
...
This fix tries to address the issue raised in 24596 where it was not
possible to join as manager only (`--availability=drain`).
This fix adds a new flag `--availability` to `swarm join`.
Related documentation has been updated.
An integration test has been added.
NOTE: Additional pull request for swarmkit and engine-api will
be created separately.
This fix fixes 24596.
Signed-off-by: Yong Tang <yong.tang.github@outlook.com >
Upstream-commit: a8e7e37aa82d1adac67b05836ea97a06fbdfdbf0
Component: engine
2017-01-10 16:31:51 -08:00
b998fced62
plugins: rename DeviceCreation to AllowAllDevices
...
Signed-off-by: Tibor Vass <tibor@docker.com >
Upstream-commit: f265727bdf637c717cd8bdc8675aff4d1714963e
Component: engine
2017-01-10 13:50:30 -08:00
3e8a509133
vendorin libnetwork @d2edad309cc874e865b5ba4d6bd6b276c93451d3
...
Signed-off-by: Santhosh Manohar <santhosh@docker.com >
Upstream-commit: a0dcdcb95f73cd06d3f037f9652a66a5764cb18a
Component: engine
2017-01-10 13:50:16 -08:00
cc8a539fed
Update vendored swarmkit to 62d835f
...
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com >
Upstream-commit: f31ed6cb5bb0888acd83c5ddcd3c0da95dc0719b
Component: engine
2017-01-10 13:00:11 -08:00
2f215f3de2
Merge pull request #29967 from justincormack/gpg-include-keys
...
Do not use keyservers to fetch GPG keys for apt
Upstream-commit: 518945b6bd30dc535addf2aac9d5eeefbfc5e523
Component: engine
2017-01-10 11:35:11 -08:00
59c79fe38f
Merge pull request #29787 from yongtang/29730-multiple-published-port
...
Fix issues of multiple published ports mapping to the same target port
Upstream-commit: 82dfa6563fe78d41eb2f720e1f041f52e02b2a7a
Component: engine
2017-01-10 18:49:16 +01:00
bc04d9530c
Merge pull request #30021 from vdemeester/29994-followup
...
Few stack deploy network fixes
Upstream-commit: 2209c9c948331bac0f706cb0e068ae3bb134d55c
Component: engine
2017-01-10 16:40:51 +01:00
6a39de5e4f
Merge pull request #29947 from vdemeester/integration-some-runCommandWithOutput-clean
...
[test-integration] clean some runCommandWithOutput
Upstream-commit: e5058ff15cac51836f426175df8a7840a670f046
Component: engine
2017-01-10 15:56:42 +01:00
5bf9b5443d
Update swarmkit to c97146840a26c9ce8023284d0e9c989586cc1857
...
This commit updates swarmkit to c97146840a26c9ce8023284d0e9c989586cc1857
Signed-off-by: Yong Tang <yong.tang.github@outlook.com >
Upstream-commit: f3a274fa08d70e25b31ba0e0603d14d3b9997c32
Component: engine
2017-01-10 03:46:42 -08:00
c1d7d93cb3
Few stack deploy network fixes
...
- Make sure we use the correct network name for external ones.
- Make the default network overridable and only creates networks that
are used by services — so that default network is only created if a
service doesn't declare a network.
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: 3191f5809bc1233bbf2103d2432b75cac93567bb
Component: engine
2017-01-10 10:29:09 +01:00
3229d5a2cb
Fix issues of multiple published ports mapping to the same target port
...
This fix tries to address the issue raised in docker/docker-29730
where a service with multiple published ports mapping to the same target
port (e.g., `--publish 5000:80 --publish 5001:80`) can't be allocated.
The reason for the issue is that, `getPortConfigKey` is used for both
allocated ports and configured (may or may not be allocated) ports.
However, `getPortConfigKey` will not take into consideration the
`PublishedPort` field, which actually could be different for different
allocated ports.
This fix saves a map of `portKey:portNum:portState`, instead of currently
used `portKey:portState` so that multiple published ports could be processed.
Signed-off-by: Yong Tang <yong.tang.github@outlook.com >
Upstream-commit: cb59bd0c5194f3f74cd405a87b562465219cad8a
Component: engine
2017-01-10 00:46:18 -08:00
b3e47ec408
Merge pull request #29564 from aaronlehmann/getter-types
...
plugingetter: Avoid all caps for constant declarations
Upstream-commit: 9c96768eae4b3a65147b47a55c850c103ab8972d
Component: engine
2017-01-10 09:35:19 +01:00
8f27f74ad0
Update docs and code to use application/x-tar in the build API
...
At the "Build image from Dockerfile" section in the API docs
the Content-Type header is missing.
In addition, some parts in the code are still setting the
Content-Type header to application/tar while it was changed
to application/x-tar since 16th September 2015.
Signed-off-by: Boaz Shuster <ripcurld.github@gmail.com >
Upstream-commit: b1996728aaeaa147c2045c8be79373d59ce7117a
Component: engine
2017-01-10 06:40:06 +02:00
1f4bebfb09
Merge pull request #30005 from dnephin/fix-stack-deploy-resources
...
Fix parsing resources from compose file for stack deploy.
Upstream-commit: 8563492eefb1653c7e83b539a254446a555961e3
Component: engine
2017-01-09 22:50:01 +01:00
96ecd9523f
Merge pull request #30002 from Microsoft/jjh/registerdiffids
...
Windows: Remove dead code RegisterDiffIDs
Upstream-commit: c0e679660f26e1e3b90904365dd253613e7bccba
Component: engine
2017-01-09 22:43:54 +01:00
acc7a7c5ca
Merge pull request #29918 from dongluochen/service_inspect_pretty
...
add port PublishMode to service inspect --pretty output
Upstream-commit: d6c8391bf680b1f7995e0390a346f10b114d1990
Component: engine
2017-01-09 22:43:41 +01:00
a164ad0f0e
Merge pull request #29802 from thaJeztah/fix-secret-rm-consistency
...
Update order of '--secret-rm' and '--secret-add'
Upstream-commit: cd82a31edbae37c31212ac8b23180d90735ceab4
Component: engine
2017-01-09 21:34:05 +01:00
ddcbfb5519
Merge pull request #29143 from vdemeester/node-cli-unit-tests
...
Add some unit tests to the node and swarm cli code
Upstream-commit: 38f766ae0e4b80d452a3825c42a7ac9fee965790
Component: engine
2017-01-09 20:52:23 +01:00
4184bed437
Merge pull request #29953 from williammartin/truncindex-iterate-lock
...
Fix non thread-safe Iteration around go-patricia
Upstream-commit: fe9f5610c49b1a6ca2ebbb68c1478fc7f106eaa8
Component: engine
2017-01-09 20:23:35 +01:00
6300d8ca1e
Fix parsing resources from compose file for stack deploy.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: e3f083530f27bc57fceab684fb3182b79a960e79
Component: engine
2017-01-09 14:22:02 -05:00
14d2d11c3d
Merge pull request #30001 from runcom/fix-format
...
devmapper: fixup error formatting
Upstream-commit: 45e88e995a3b48c7434e9338c3651a5168c630df
Component: engine
2017-01-09 10:32:35 -08:00
ccb8041876
add port PublishMode to service inspect --pretty output
...
Signed-off-by: Dong Chen <dongluo.chen@docker.com >
Upstream-commit: 5470312d236445b54bb6723f47c0966d3b057658
Component: engine
2017-01-09 10:30:28 -08:00
f34f548a3b
Merge pull request #29955 from vieux/improve_secret_Create
...
remove -f on secret create and unify usage with other commands
Upstream-commit: 3e298f46a2318c792dc476a178c3df34d1247fa4
Component: engine
2017-01-09 10:22:39 -08:00
f6ad06ceb6
Add some unit tests to the node and swarm cli code
...
Start work on adding unit tests to our cli code in order to have to
write less costly integration test.
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: f151c297eb268e22dc1eb36ded0e356885f40739
Component: engine
2017-01-09 18:30:15 +01:00
f2e905cf82
Merge pull request #29793 from thaJeztah/improve-run-usage-output
...
Improve usage output for docker run
Upstream-commit: f199fadc7a713932fc827c63accbd67843d17691
Component: engine
2017-01-09 18:15:25 +01:00
782c3f08db
Fix non thread-safe Iteration around go-patricia
...
* Unlike other methods in truncindex, Iterate was not locking before
using the Trie, making it potentially race e.g. Delete could result in
setting a child to nil, while Iterate dereferenced that node
while walking the Trie.
Signed-off-by: Petar Petrov <pppepito86@gmail.com >
Upstream-commit: 57dada53382106952d287dd1f16773e08213ae8d
Component: engine
2017-01-09 17:06:50 +00:00
701de0a381
Merge pull request #29226 from yongtang/28535-prune-until-follow-up
...
Add `--filter until=<timestamp>` for `docker container/image prune`
Upstream-commit: f1fdbeca2a39c7189b1ca8db4e4543fe77ff1150
Component: engine
2017-01-09 17:58:01 +01:00
2401da5f36
Windows: Remove dead code RegisterDiffIDs
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: 02ed83aee95e506ace3a994bb2ebb7e94df5a438
Component: engine
2017-01-09 08:56:34 -08:00
03f18af38a
Merge pull request #29846 from thaJeztah/dont-create-init-path
...
do not create init-dir if not needed
Upstream-commit: 9248351992fb0dacc490d4f83eb15085fb6a187e
Component: engine
2017-01-09 08:47:51 -08:00
c41fd16fe5
Merge pull request #29996 from thaJeztah/unfork-go-memdb
...
un-fork go-memdb
Upstream-commit: edcfb83b836e8fbee225988b601bc9e45ab30028
Component: engine
2017-01-09 08:01:06 -08:00
15e349bb0f
devmapper: fixup error formatting
...
Signed-off-by: Antonio Murdaca <runcom@redhat.com >
Upstream-commit: 8bcbc6711ffa253968c30ebf1366e79dfd08e205
Component: engine
2017-01-09 16:58:09 +01:00
a688a9fc84
Attempts -> MaxAttempts in /services/create
...
Signed-off-by: Lars-Magnus Skog <ralphtheninja@riseup.net >
Upstream-commit: 778eeaea2089eed1f0f113bdc73f427b4e68c572
Component: engine
2017-01-09 16:04:34 +01:00
