3ee40f07d5
Merge pull request #30974 from erxian/add-new-cli-argument-squash-to-docker-build
...
add docs to describe experimental CLI argument --squash to docker build
Upstream-commit: 91f3f992f156bebb79d80f022c111943dea0f5b0
Component: engine
2017-03-27 17:09:54 +02:00
51025ebc27
Merge pull request #31714 from aboch/cingr
...
Allow user to replace ingress network
Upstream-commit: 04295d26df3034a9a92da8400418f843d7c48780
Component: engine
2017-03-27 07:30:42 -07:00
9d93e56a18
Merge pull request #32044 from jonisar/patch-1
...
Readme grammer fix
Upstream-commit: 1bb6a53e767f883cc58c716a477b27383b185833
Component: engine
2017-03-27 16:20:45 +02:00
617bd84818
Merge pull request #32119 from nogoegst/fix-openbsd-cli
...
Fix building client on OpenBSD
Upstream-commit: dc1f036772439d08c81cd8eef92d661b7fafbd0e
Component: engine
2017-03-27 09:52:50 +02:00
1499a412b6
Merge pull request #31755 from miaoyq/heartbeat-maybe-zero
...
The variable heartbeat might be 0
Upstream-commit: e2f60837ebbf432b89af900105afe73121cf6c05
Component: engine
2017-03-27 09:39:01 +02:00
9d1e7a4f10
Merge pull request #32121 from allencloud/remove-redundant-comment-in-test-build
...
remove redundant comments in test build.go
Upstream-commit: e5d474e856623fbd35a01387b6580fbfcaa30d05
Component: engine
2017-03-27 14:40:37 +09:00
d840f6fbf0
remove redundant comments in test build.go
...
Signed-off-by: allencloud <allen.sun@daocloud.io >
Upstream-commit: 32b81dae29fbb6f831cda5e9db1c120f78cd4a91
Component: engine
2017-03-27 10:59:13 +08:00
92497be019
The variable heartbeat might be 0
...
Signed-off-by: Yanqiang Miao <miao.yanqiang@zte.com.cn >
perfect the test case for 'discoveryOpts'
Signed-off-by: Yanqiang Miao <miao.yanqiang@zte.com.cn >
Upstream-commit: fb2bc3521069b55bbb342305e533e78682fbcc65
Component: engine
2017-03-27 10:07:58 +08:00
d79afa43f8
Allow user to modify ingress network
...
Signed-off-by: Alessandro Boch <aboch@docker.com >
Upstream-commit: d59d19c32818ed73cc6b4d153f2858c4fe97f50e
Component: engine
2017-03-26 15:46:18 -07:00
d50bce7193
Fix building client on OpenBSD
...
Signed-off-by: Ivan Markin <twim@riseup.net >
Upstream-commit: 925bc27b8108a154161b578e176d2b7d79e8002c
Component: engine
2017-03-26 20:47:18 +00:00
f1d1b03a72
Readme grammer fix
...
"Giving THE developer...." -> "to express all THEIR application's.."
A developer is single.
"Their" refers to plural (multiple developers).
So, adjusted to plural ("developers") so that the two will match.
* The alternative would be to use "his / her" but that leads to gender reference issues, so the former alternative works better
Signed-off-by: Jonathan Saring <yoni@cocycles.com >
Upstream-commit: ce08e2a107bd43829ca6f7f394a10956c03ebe28
Component: engine
2017-03-26 14:59:14 +03:00
6a15e35779
Merge pull request #32098 from anusha-ragunathan/volume-panic
...
Add non-nil check before logging volume errors.
Upstream-commit: 08544b1912734d31dac9632e9bfba07ed9601ff4
Component: engine
2017-03-26 12:45:22 +02:00
ee135bdc50
Merge pull request #31976 from Microsoft/jjh/csbooboo
...
Windows: Remove --credentialspec flag
Upstream-commit: ab08a571d1181833c5598ed3d27f9d2a924762d0
Component: engine
2017-03-26 12:44:27 +02:00
0c4052f0d9
Merge pull request #32075 from uhayate/update_old_docs
...
update 3 old docs about secret in docs/reference/commandline/
Upstream-commit: a0b6edeb332e639dba35c53bda399dd56812a654
Component: engine
2017-03-26 12:41:37 +02:00
d81627e7d7
Merge pull request #32052 from Microsoft/jjh/revendorhcsshim
...
Revendor HCSShim @ v0.5.13
Upstream-commit: e065acc5fa2bf727ab72918e9a555571d83028be
Component: engine
2017-03-26 12:04:30 +02:00
9ede945f94
Merge pull request #32099 from dnephin/fix-test-stack-remove
...
Fix flaky TestStackRemove test
Upstream-commit: 773d3bb5a0693fb20f1f1c6a9713ebe180c808bf
Component: engine
2017-03-24 23:23:25 -07:00
250a383735
Add non-nil check before logging volume errors.
...
Signed-off-by: Anusha Ragunathan <anusha.ragunathan@docker.com >
Upstream-commit: b1570baadd76377aaeb7199c95ad6dc11b38f302
Component: engine
2017-03-24 16:34:11 -07:00
b690579b15
Merge pull request #32095 from anusha-ragunathan/set-state
...
Explictly set state of a disabled plugin.
Upstream-commit: cddffe327ebdf88df94618babbb1206b3ac7c629
Component: engine
2017-03-24 14:03:32 -07:00
c23fd44111
Fix flaky TestStackRemove test.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: 73e6135458cfa09171526467b41b18890dc8b3d3
Component: engine
2017-03-24 15:31:08 -04:00
9e044dac67
Explictly set state of a disabled plugin.
...
While restoring plugins during daemon restart, some plugins can fail to
respond to net.Dial. These plugins should be explicitly set to disabled,
else they will retain their original state of enabled, which is
incorrect.
Tested with a plugin that fails to restart and observed that the state
was set to disabled.
Signed-off-by: Anusha Ragunathan <anusha.ragunathan@docker.com >
Upstream-commit: bbbf64f7128c3784f500cd15a994f20ab5d80920
Component: engine
2017-03-24 12:07:12 -07:00
49cfd2488d
Vendor libnetwork @b6cb1ee
...
Signed-off-by: Alessandro Boch <aboch@docker.com >
Upstream-commit: ff049a4d4d6ab98d6a49631f29c346ab6086cb84
Component: engine
2017-03-24 11:07:33 -07:00
c2f1681e6f
Vendoring swarmkit @9fdea50
...
Signed-off-by: Alessandro Boch <aboch@docker.com >
Upstream-commit: 434e9695e42f9399c627d433972dbd73f7c8502f
Component: engine
2017-03-24 11:07:33 -07:00
e4f4018baa
Merge pull request #32087 from dnephin/check-secrets-against-defined
...
Cleanup compose convert error messages
Upstream-commit: 3c22c7d5e98c349d18c245f8436f60723cb5a903
Component: engine
2017-03-24 17:41:53 +01:00
2c87cf80c3
Cleanup compose convert error messages.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: b03a18572363560845439eec041502014da85128
Component: engine
2017-03-24 10:43:28 -04:00
6c6bf44620
Merge pull request #32081 from albers/completion-network-ls--filter-scope
...
Add bash completion for `network ls --filter scope`
Upstream-commit: b86efd2707f83165b8b87e654f601740d5756959
Component: engine
2017-03-24 14:52:03 +01:00
2d2f5a3bba
Add bash completion for network ls --filter scope
...
Signed-off-by: Harald Albers <github@albersweb.de >
Upstream-commit: 4dd461a6bfc77a652ea08744741e64c3ae5f13a3
Component: engine
2017-03-24 13:06:26 +01:00
fd9c0e1e49
Merge pull request #31529 from yongtang/31324-network-ls-filter-scope
...
Add `--filter scope=swarm|local` for `docker network ls`
Upstream-commit: 4e290f7a2b9fb1fc808cece50dc7d8e31da0f963
Component: engine
2017-03-24 12:26:10 +01:00
3747c785b6
update 3 old docs about secret in docs/reference/commandline/
...
Signed-off-by: uhayate <uhayate.gong@daocloud.io >
Upstream-commit: 208653e712dfaf4ee3be0cf5c33cbb8cbfa7421d
Component: engine
2017-03-24 18:42:38 +08:00
48a5bc9c2a
Merge pull request #32071 from tonistiigi/fix-integration-tests
...
Fix integration tests build errors
Upstream-commit: 9a2dcf6a15f6b7b46349a1d3b84388b4d37dc154
Component: engine
2017-03-24 10:30:42 +01:00
d952883696
Merge pull request #32042 from vdemeester/compose-interpolate-error-instead-of-panic
...
[compose/interpolation] Make sure we error out instead of panic during interpolation
Upstream-commit: 8d2a82853c3401bdffbcc91b12399ef6589d26d0
Component: engine
2017-03-24 09:00:06 +01:00
703c536b96
Fix integration tests build errors
...
Caused by a merge conflict.
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com >
Upstream-commit: 4c7710d5d02acf42efa667fc33cb877385f2bbeb
Component: engine
2017-03-24 00:27:32 -07:00
dd50f0df64
Merge pull request #31608 from vdemeester/integration-cli-package
...
[test-integration] Introduce a `cli` package for test-integration
Upstream-commit: 8008f6529394d8c458ccf58f4763754681568b57
Component: engine
2017-03-24 13:04:47 +09:00
c90ad1369f
Merge pull request #31257 from tonistiigi/nested-build
...
build: add multi-stage build support
Upstream-commit: 2fa8fe400d926b3ceb0c84640a8f4e0f36e51463
Component: engine
2017-03-23 19:14:13 -07:00
d918c4ba81
Add --filter scope=swarm|local for docker network ls
...
This fix tries to address the request in 31324 by adding
`--filter scope=swarm|local` for `docker network ls`.
As `docker network ls` has a `SCOPE` column by default,
it is natural to add the support of `--filter scope=swarm|local`.
This fix adds the `scope=swarm|local` support for
`docker network ls --filter`.
Related docs has been updated.
Additional unit test cases have been added.
This fix fixes 31324.
Signed-off-by: Yong Tang <yong.tang.github@outlook.com >
Upstream-commit: 704ea8f6b4ad6f43c348affe357994d440aaf3de
Component: engine
2017-03-23 18:48:11 -07:00
9a572f349e
Merge pull request #31629 from darrenstahlmsft/ShutdownLock
...
Windows: Stop holding client container lock during shutdown
Upstream-commit: caf8d884aadd4cc56c1ffb524ce9b6d51ad63d88
Component: engine
2017-03-23 18:16:56 -07:00
dc0d47d701
Fix relative path on windows for uuid paths
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com >
Upstream-commit: 684633f734f86b6a66873b42c9356eb543e12917
Component: engine
2017-03-23 15:12:19 -07:00
e59b5a1439
Add support for COPY from previous rootfs
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com >
Upstream-commit: f95f58283b2a69f4fd06d01de2281641e09b06bb
Component: engine
2017-03-23 15:12:15 -07:00
1faeba234d
Merge pull request #31668 from Microsoft/jjh/nopidfileasservice
...
Windows: no pidfile when service
Upstream-commit: b47c50cf11a48c068e8794af1cd2bfebdae90995
Component: engine
2017-03-23 17:10:35 -04:00
80cfdf07d5
Merge pull request #31626 from darrenstahlmsft/WindowsUpdateContainer
...
Windows: Add missing HostConfig fields to update block
Upstream-commit: c1d40ade5d99f6886cd9ac7b1d26e4db29eaac30
Component: engine
2017-03-23 16:54:03 -04:00
d4d4f16a60
Merge pull request #32019 from anusha-ragunathan/plugin-sigkill
...
Add missing test for daemon kill with plugins running.
Upstream-commit: fd56e8ffa14399c8a5d65598de70c4692f222d8f
Component: engine
2017-03-23 15:46:59 -04:00
9b0f5fcb58
Revendor HCSShim @ v0.5.13
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: 4f7db6739d859614e519ac10ec516f11096734fd
Component: engine
2017-03-23 11:47:05 -07:00
9210b1bdbd
Introduce a cli package for test-integration
...
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: 50c4475df6304e0cf12ea95217eb00ab5d572e34
Component: engine
2017-03-23 18:35:22 +01:00
50d77b4c9e
Windows: Remove --credentialspec flag
...
Signed-off-by: John Howard (VM) <jhoward@ntdev.microsoft.com >
Upstream-commit: 53d6aadda5f5bef3af7fb1f9362dbd81189e8374
Component: engine
2017-03-23 10:01:04 -07:00
e1610cddb8
Merge pull request #31986 from Microsoft/jjh/fix28267
...
Windows: Don't close client stdin handle to avoid hang
Upstream-commit: ad530ffee09a4ca6b87a2b009f86b4651653e29a
Component: engine
2017-03-23 16:35:54 +01:00
229e8f9746
Make sure we error out instead of panic during interpolation
...
Use type assertion to error out if the type isn't the right one
instead of panic as before this change.
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: c165a8bfa1419724eb504f3cb7fdf3ca1b97483b
Component: engine
2017-03-23 16:09:57 +01:00
2bc10a312a
Merge pull request #32028 from sdurrheimer/zsh-completion-service-ls-mode-filter
...
Add zsh completion for 'docker service ls --filter mode'
Upstream-commit: d9ecb1b8fec139a6c814cdc94f4fe1b46989221b
Component: engine
2017-03-23 14:19:36 +01:00
7dca954f71
Merge pull request #32029 from sdurrheimer/zsh-completion-secret-ls-format
...
Add zsh completion for 'docker secret ls --format'
Upstream-commit: f438cf6c7aa3b782fc7aeb15f6b668d723eeb5ca
Component: engine
2017-03-23 14:19:14 +01:00
fb95fcbdfc
Merge pull request #32021 from tophj-ibm/fix-notary-vendor-p
...
[ppc64le] fix notary vendor
Upstream-commit: 64eff3e218cedfdf162414c721e3b8d7d5a1fe76
Component: engine
2017-03-22 22:08:42 -04:00
14a9300f18
Merge pull request #32020 from sdurrheimer/zsh-completion-service-create-update-rollback-on-failure
...
Add zsh completion for 'docker service {create,update} --rollback-*'
Upstream-commit: 6fe5eb010e59dbe32c0a443b6a641280019a4609
Component: engine
2017-03-22 22:02:51 -04:00
42ae1bde5b
Merge pull request #32025 from sdurrheimer/zsh-completion-service-logs-formatting
...
Add zsh completion for 'docker logs --no-task-ids --no-trunc'
Upstream-commit: cf4589666b2b3a6c0e3ca6743f064dc62af133d7
Component: engine
2017-03-22 22:02:14 -04:00
