0ct0pu5/moby
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
30267 commits 14 branches 412 tags 338 MiB
Commit graph

30267 commits

This branch
This branch
All branches
Author SHA1 Message Date
msabansal
e6962481a0 Added support for dns-search and fixes #30102 
Signed-off-by: msabansal <sabansal@microsoft.com>
 2017-01-13 12:01:10 -08:00
Tõnis Tiigi
27695cd751 Merge pull request #27903 from kim0/master 
zfs: expose mountpoint/dataset on inspection
 2017-01-12 11:28:07 -08:00
Kenfe-Mickaël Laventure
f018c0dfff Merge pull request #30088 from tonistiigi/fifo-close-early 
Close stdout/stderr fifo as soon as possible
 2017-01-12 09:29:39 -08:00
Vincent Demeester
06e3812b6e Merge pull request #29485 from ericcurtin/remove-prompt-add-docker-group 
Don't encourage adding user to docker group
 2017-01-12 18:28:16 +01:00
Vincent Demeester
e880120fe2 Merge pull request #28500 from rhvgoyal/remove-unused-param 
devmapper: get rid of unused device id argument in unregisterDevice()
 2017-01-12 18:02:00 +01:00
Vincent Demeester
1d40e9cb18 Merge pull request #27928 from erikh/fix-docs 
api/types/client.go: documentation fix for ImageImportSource
 2017-01-12 17:36:36 +01:00
Brian Goff
bf71db7a12 Merge pull request #30010 from thaJeztah/master-revert-27146 
Revert "Require continuation char to be last char in a line"
 2017-01-12 09:17:08 -05:00
Sebastiaan van Stijn
af5323f958 Merge pull request #30077 from tonistiigi/fix-test-leaks 
Fix leaked connections in integration tests
 2017-01-12 11:35:02 +01:00
John Howard
e48937fb99 Merge pull request #30085 from swernli/skip_push_base 
storeLayer.Parent should return describableStoreLayers
 2017-01-11 23:37:50 -08:00
Tonis Tiigi
5a6184a535 Close stdout/stderr fifo as soon as possible 
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
 2017-01-11 22:11:13 -08:00
Stefan J. Wernli
d14b7212ad 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>
 2017-01-11 19:01:13 -08:00
Akihiro Suda
d9a4bba398 Merge pull request #30073 from albers/completion-swarm-join--availability 
Add bash completion for `swarm join --availability`
 2017-01-12 10:37:02 +09:00
Tibor Vass
640a5c1a38 Merge pull request #30079 from tonistiigi/debug-trusttest 
Print daemon stacktrace when trust test times out
 2017-01-11 17:06:33 -08:00
Tõnis Tiigi
acaf3cf870 Merge pull request #30065 from dnephin/fix-extends-error-message 
Improve the error message for extends in stack deploy.
 2017-01-11 15:27:01 -08:00
Tonis Tiigi
e533685d13 Print daemon stacktrace when trust test times out 
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
 2017-01-11 15:14:36 -08:00
Tonis Tiigi
1e98fb5ad9 Fix leaked connections in integration tests 
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
 2017-01-11 14:48:48 -08:00
Sebastiaan van Stijn
de54284bd7 Merge pull request #29891 from sanimej/libnvendor 
vendorin libnetwork @f9fa6e0
 2017-01-11 19:55:00 +01:00
Harald Albers
f487b268f9 Add bash completion for swarm join --availability 
Signed-off-by: Harald Albers <github@albersweb.de>
 2017-01-11 10:30:56 -08:00
Brian Goff
c38bb7a725 Merge pull request #30060 from xulike666/fix-typo 
Fix typo in libcontainerd/client.go
 2017-01-11 12:13:35 -05:00
Daniel Nephin
46422df490 Improve the error message for extends in stack deploy. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2017-01-11 11:57:24 -05:00
Sebastiaan van Stijn
66aba12df2 Merge pull request #24993 from yongtang/24596-swarm-join-with-drain 
Allow swarm join with `--availability=drain`
 2017-01-11 17:39:01 +01:00
Aaron.L.Xu
39a24019e3 fix typo in libcontainerd/client.go 
Signed-off-by: Aaron.L.Xu <likexu@harmonycloud.cn>
 2017-01-11 23:10:02 +08:00
Vincent Demeester
24e9ac1575 Merge pull request #29206 from ripcurld0/doc_api_update 
Specify content type in the build request
 2017-01-11 08:41:39 +01:00
Tibor Vass
696ef7a19e Merge pull request #30014 from tiborvass/plugin-devices-redone-master 
Plugins: Rename DeviceCreation to AllowAllDevices
 2017-01-10 17:24:38 -08:00
Brian Goff
a02b1215c2 Merge pull request #30035 from aaronlehmann/vendor-swarmkit-62d835f 
Update vendored swarmkit to 62d835f
 2017-01-10 20:13:12 -05:00
Santhosh Manohar
d5e8d8e1cf Handle IPv6 enabling correctly in the tests 
Signed-off-by: Santhosh Manohar <santhosh@docker.com>
 2017-01-10 16:34:23 -08:00
Yong Tang
0f30c64444 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>
 2017-01-10 16:31:51 -08:00
Yong Tang
a8e7e37aa8 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>
 2017-01-10 16:31:51 -08:00
Tibor Vass
f265727bdf plugins: rename DeviceCreation to AllowAllDevices 
Signed-off-by: Tibor Vass <tibor@docker.com>
 2017-01-10 13:50:30 -08:00
Santhosh Manohar
a0dcdcb95f vendorin libnetwork @d2edad309cc874e865b5ba4d6bd6b276c93451d3 
Signed-off-by: Santhosh Manohar <santhosh@docker.com>
 2017-01-10 13:50:16 -08:00
Aaron Lehmann
f31ed6cb5b Update vendored swarmkit to 62d835f 
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
 2017-01-10 13:00:11 -08:00
Michael Crosby
518945b6bd Merge pull request #29967 from justincormack/gpg-include-keys 
Do not use keyservers to fetch GPG keys for apt
 2017-01-10 11:35:11 -08:00
Vincent Demeester
82dfa6563f Merge pull request #29787 from yongtang/29730-multiple-published-port 
Fix issues of multiple published ports mapping to the same target port
 2017-01-10 18:49:16 +01:00
Sebastiaan van Stijn
2209c9c948 Merge pull request #30021 from vdemeester/29994-followup 
Few stack deploy network fixes
 2017-01-10 16:40:51 +01:00
Sebastiaan van Stijn
e5058ff15c Merge pull request #29947 from vdemeester/integration-some-runCommandWithOutput-clean 
[test-integration] clean some runCommandWithOutput
 2017-01-10 15:56:42 +01:00
Yong Tang
f3a274fa08 Update swarmkit to c97146840a26c9ce8023284d0e9c989586cc1857 
This commit updates swarmkit to c97146840a26c9ce8023284d0e9c989586cc1857

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
 2017-01-10 03:46:42 -08:00
Vincent Demeester
3191f5809b
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>
 2017-01-10 10:29:09 +01:00
Yong Tang
cb59bd0c51 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>
 2017-01-10 00:46:18 -08:00
Vincent Demeester
9c96768eae Merge pull request #29564 from aaronlehmann/getter-types 
plugingetter: Avoid all caps for constant declarations
 2017-01-10 09:35:19 +01:00
Boaz Shuster
b1996728aa 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>
 2017-01-10 06:40:06 +02:00
Sebastiaan van Stijn
c67550414b
Revert "Require continuation char to be last char in a line" 
This reverts commit 105bc63295,
which (although correct), resulted in a backward incompatible
change.

We can re-implement this in future, after this changes goes
through a deprecation cycle

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2017-01-10 00:41:03 +01:00
Sebastiaan van Stijn
8563492eef Merge pull request #30005 from dnephin/fix-stack-deploy-resources 
Fix parsing resources from compose file for stack deploy.
 2017-01-09 22:50:01 +01:00
Vincent Demeester
c0e679660f Merge pull request #30002 from Microsoft/jjh/registerdiffids 
Windows: Remove dead code RegisterDiffIDs
 2017-01-09 22:43:54 +01:00
Vincent Demeester
d6c8391bf6 Merge pull request #29918 from dongluochen/service_inspect_pretty 
add port PublishMode to service inspect --pretty output
 2017-01-09 22:43:41 +01:00
Sebastiaan van Stijn
cd82a31edb Merge pull request #29802 from thaJeztah/fix-secret-rm-consistency 
Update order of '--secret-rm' and '--secret-add'
 2017-01-09 21:34:05 +01:00
Sebastiaan van Stijn
38f766ae0e Merge pull request #29143 from vdemeester/node-cli-unit-tests 
Add some unit tests to the node and swarm cli code
 2017-01-09 20:52:23 +01:00
Vincent Demeester
fe9f5610c4 Merge pull request #29953 from williammartin/truncindex-iterate-lock 
Fix non thread-safe Iteration around go-patricia
 2017-01-09 20:23:35 +01:00
Daniel Nephin
e3f083530f Fix parsing resources from compose file for stack deploy. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2017-01-09 14:22:02 -05:00
Tõnis Tiigi
45e88e995a Merge pull request #30001 from runcom/fix-format 
devmapper: fixup error formatting
 2017-01-09 10:32:35 -08:00
Dong Chen
5470312d23 add port PublishMode to service inspect --pretty output 
Signed-off-by: Dong Chen <dongluo.chen@docker.com>
 2017-01-09 10:30:28 -08:00