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
4425fecafd
Fix indenting in table of contents
...
Fixes #30841 . The "filter" section had the wrong header size, which
caused sections following it to have the wrong indentation in the
right-side table of contents.
Signed-off-by: Greg Pflaum <gpflaum@users.noreply.github.com >
Upstream-commit: 44cdab1fc51558ff7d608d777549bd1e81b36ab8
Component: engine
2017-03-22 23:31:13 -04: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
cbbcce0bc9
Merge pull request #32022 from sdurrheimer/zsh-completion-service-create-update-stop-signal
...
Add zsh completion for 'docker service {create,update} --stop-signal'
Upstream-commit: 7a607efcd64874c242dc0795ac20ba42ebd05fc2
Component: engine
2017-03-22 22:01:15 -04:00
b82363b6c6
Merge pull request #32026 from sdurrheimer/zsh-completion-network-inspect-verbose
...
Add zsh completion for 'docker network inspect --verbose'
Upstream-commit: 18cf0a59103a89e896dccefc7114295452f9623e
Component: engine
2017-03-22 21:59:26 -04:00
8f0cf5fe95
Merge pull request #32017 from sdurrheimer/zsh-completion-build-add-host
...
Add zsh completion for 'docker build --add-host'
Upstream-commit: b573c23e6b898dd449d28b3c644b8d99c39ad187
Component: engine
2017-03-22 21:58:47 -04:00
99e2b2fba6
Merge pull request #32024 from sdurrheimer/zsh-completion-service-create-update-placement-ref
...
Add zsh completion for 'docker service {create,update} --placement-pref'
Upstream-commit: 9e538fb4b0708af893b3fc8c0b5943eabc95f149
Component: engine
2017-03-22 21:58:26 -04:00
0e21058181
Merge pull request #31631 from aaronlehmann/swarm-failure-on-startup
...
cluster: Proceed with startup if cluster component can't be created
Upstream-commit: 9b33edfa7e1f8fcd32b1c19120bc591ae22a5a8f
Component: engine
2017-03-22 16:40:49 -07:00
ffaf7e6335
Add zsh completion for 'docker secret ls --format'
...
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com >
Upstream-commit: 414704825679cbc5d340306934404002569adc1f
Component: engine
2017-03-22 23:56:29 +01:00
a4e552e0fc
Add zsh completion for 'docker service ls --filter mode'
...
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com >
Upstream-commit: 94b6e810e0cae6ff96e54846b8ca31972bb87084
Component: engine
2017-03-22 23:52:36 +01:00
ef52126a2e
Add zsh completion for 'docker network inspect --verbose'
...
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com >
Upstream-commit: b30906e29ccfd0b75a1b7215e8377ece4b4cb061
Component: engine
2017-03-22 23:35:07 +01:00
b9bc0edbea
Add zsh completion for 'docker service {create,update} --placement-pref'
...
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com >
Upstream-commit: 415e453a55faa8c3b60559ff360735caa6753f60
Component: engine
2017-03-22 23:30:22 +01:00
68e9275441
Add zsh completion for 'docker logs --no-task-ids --no-trunc'
...
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com >
Upstream-commit: 516edbcabbba2e3e4ba38d7b9fbda927a92de8eb
Component: engine
2017-03-22 23:26:33 +01:00
0e04cd7ace
Merge pull request #32002 from vdemeester/compose-remove-type-dict
...
Remove compose types.Dict alias
Upstream-commit: bb1ae453a6f8b8bc1c5d03972d3223e6d9f70c40
Component: engine
2017-03-22 23:08:09 +01:00
fafd64c2a3
Add zsh completion for 'docker service {create,update} --stop-signal'
...
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com >
Upstream-commit: 6121a011ba1db455626c823d1660aee473c45df6
Component: engine
2017-03-22 22:49:57 +01:00
0fbaab526f
[ppc64le] fix notary vendor link
...
Notary switched to vendor a while ago, so make that change here. Change
is consistent with all other dockerfiles.
Signed-off-by: Christopher Jones <tophj@linux.vnet.ibm.com >
Upstream-commit: 28b99648aea000b01eb9634743110900d025238c
Component: engine
2017-03-22 17:47:23 -04:00
00a9f5f73c
Add zsh completion for 'docker service {create,update} --rollback-*'
...
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com >
Upstream-commit: 169745ce29ac735b4c6c5c810224e50eebfb8f01
Component: engine
2017-03-22 22:40:46 +01:00
d6f71ce6ed
Add missing test for daemon kill with plugins running.
...
Signed-off-by: Anusha Ragunathan <anusha.ragunathan@docker.com >
Upstream-commit: b748debb76110e577cfde7c5d5c362e69ddf86ce
Component: engine
2017-03-22 14:38:55 -07:00
4fb897d687
Add zsh completion for 'docker build --add-host'
...
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com >
Upstream-commit: fbedc588bec4f6b4669e744450eded9f5e4bf799
Component: engine
2017-03-22 22:28:09 +01:00
30a11974ed
Merge pull request #31930 from anusha-ragunathan/authz-disable
...
When authz plugin is disabled, remove from authz middleware chain.
Upstream-commit: bbce24997c7a31454edd1d3d979823582bcdd95d
Component: engine
2017-03-22 14:17:38 -07:00
ed9e56a592
Merge pull request #31715 from anusha-ragunathan/ipc-host
...
Add support in plugin config for accessing host ipc and pid namespace.
Upstream-commit: 0caced4644c0b188b9644e9ab5fe7a31ac855968
Component: engine
2017-03-22 14:17:21 -07:00
df8db8303f
remove the duplicate line from doc and rebase with master for 'example of ADD and COPY with special characters file name'
...
Signed-off-by: Foysal Iqbal <foysal.iqbal.fb@gmail.com >
Upstream-commit: dacf8fa27c576512cecea4a15b9adb93808c9743
Component: engine
2017-03-22 15:08:17 -04:00
2034662b7a
When authz plugin is disabled, remove from authz middleware chain.
...
When the daemon is configured to run with an authorization-plugin and if
the plugin is disabled, the daemon continues to send API requests to the
plugin and expect it to respond. But the plugin has been disabled. As a
result, all API requests are blocked. Fix this behavior by removing the
disabled plugin from the authz middleware chain.
Tested using riyaz/authz-no-volume-plugin and observed that after
disabling the plugin, API request/response is functional.
Fixes #31836
Signed-off-by: Anusha Ragunathan <anusha.ragunathan@docker.com >
Upstream-commit: 38de272bd4dfea945985b7031cd353ac5f6507c5
Component: engine
2017-03-22 12:07:39 -07:00
3866c616c0
Merge pull request #31980 from JohnMaguire/doc-update
...
Add note regarding Windows VOLUME limitations
Upstream-commit: c33c457852bd6901ecc1f81449b59984a555a963
Component: engine
2017-03-22 12:01:36 -07:00
c8fe0a8414
Add note regarding Windows VOLUME limitations
...
Signed-off-by: John Maguire <jmaguire@duosecurity.com >
Upstream-commit: 020ec88542e88bb561c30a1ec984d0a17c74b7f9
Component: engine
2017-03-22 14:57:42 -04:00
1ac065d3b7
Remove undeeded and broken selinux relabel call
...
The call is not needed here and wouldn't really work since `Source` in
this case is a volume name.
Further we don't neccessarily even have a volume path at this time since
the volume hasn't been mounted yet.
The volume will be relabled either:
1. When data gets copied to it from the image (if applicable) -- https://github.com/docker/docker/blob/master/container/container_unix.go#L196
2. When the container is started -- https://github.com/docker/docker/blob/master/daemon/oci_linux.go#L737
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
Upstream-commit: 898e84d5fd1ad502632eb4082b7be37a65599a3b
Component: engine
2017-03-22 14:43:33 -04:00
fde81cc335
Merge pull request #31992 from tonistiigi/fix-builder-exit-code
...
Return proper exit code on builder panic
Upstream-commit: 0f9ec7e47072b0c2e954b5b821bde5c1fe81bfa7
Component: engine
2017-03-22 19:04:09 +01:00
e82f1456b4
Embed DockerVersion in plugin config.
...
Embedding DockerVersion in plugin config when the plugin is created,
enables users to do a docker plugin inspect and know which version
the plugin was built on. This is helpful in cases where users are
running a new plugin on older docker releases and confused at
unexpected behavior.
By embedding DockerVersion in the config, we claim that there's no
guarantee that if the plugin config's DockerVersion is greater that
the version of the docker engine the plugin is executed against, the
plugin will work as expected.
For example, lets say:
- in 17.03, a plugin was released as johndoe/foo:v1
- in 17.05, the plugin uses the new ipchost config setting and author
publishes johndoe/foo:v2
In this case, johndoe/foo:v2 was built on 17.05 using ipchost, but is
running on docker-engine version 17.03. Since 17.05 > 17.03, there's
no guarantee that the plugin will work as expected. Ofcourse, if the
plugin did not use newly added config settings (ipchost in this case)
in 17.05, it would work fine in 17.03.
Signed-off-by: Anusha Ragunathan <anusha.ragunathan@docker.com >
Upstream-commit: 342ed107bc6283cfc9b3301142e71f20aae0aaca
Component: engine
2017-03-22 10:26:20 -07:00
f3536ca0df
Remove compose types.Dict alias
...
It is just an alias type and make the code a little bit more complex
and hard to use from outside `compose` package.
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: d3dc27d145a36b3c81fd5999f2c525af95d9596a
Component: engine
2017-03-22 16:16:20 +01:00
dfbe94cc62
Merge pull request #31996 from aboch/drst
...
Fix stop/start/restart of detached container
Upstream-commit: d8406fd7a029f38ece55421294568045d1c9de92
Component: engine
2017-03-22 10:24:45 -04:00
b712c62d15
Merge pull request #31973 from wsong/update_df_docs
...
Update system df docs to call out performance implications
Upstream-commit: f453412bd8f161453981a828e989209c6cdf32f5
Component: engine
2017-03-22 13:46:48 +01:00
c6d39324f1
Merge pull request #31988 from thaJeztah/fix-deprecation-version
...
update "docker daemon" deprecation message for new version scheme
Upstream-commit: 57a82c4190e5c87264fbdc2d5703f51ffc26a0b0
Component: engine
2017-03-22 11:26:54 +01:00
09b605e914
Fix start/restart of detached container
...
Signed-off-by: Alessandro Boch <aboch@docker.com >
Upstream-commit: 4ca7d4f0c1490845cbf04220a408f67c006af248
Component: engine
2017-03-22 02:38:26 -07:00
1b669489a6
Merge pull request #31584 from dave-tucker/ignore-default-build-args
...
Exclude “default” build-args from image history
Upstream-commit: c497499cde5b2f3fa408fe4a1b0fdfec4a61d5c5
Component: engine
2017-03-22 10:07:22 +01:00
65c978bb84
Merge pull request #31749 from yallop/docs-31047
...
Add documentation for bind mount consistency flags (#31047 ).
Upstream-commit: 94394026a8c6d99e13d7fb369698e2673ebfc722
Component: engine
2017-03-22 10:06:50 +01:00
10622096c6
Update system df docs to call out performance implications
...
Signed-off-by: Wayne Song <wsong@docker.com >
Upstream-commit: d8a49c322ad08815c7321e411e036782db18d314
Component: engine
2017-03-22 09:49:03 +01:00
65906b40c8
Fix nw sandbox leak when stopping detached container
...
Signed-off-by: Ryan Liu <ryanlyy@me.com >
Upstream-commit: 786f30107b0c63e8a42ca4b0d8d40621f45861c6
Component: engine
2017-03-21 23:51:52 -07:00
b53e61fcff
Return proper exit code on builder panic
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com >
Upstream-commit: 385f1174ff6905243c51d97d641d815a520229ff
Component: engine
2017-03-21 19:09:23 -07:00
d51f2e6afd
Add testcase for build arg without value
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com >
Upstream-commit: 8f37715af28acaf1e88b057f6d385b500736c53c
Component: engine
2017-03-21 18:59:42 -07:00
042f28b7a4
cli: Wrong error message from "node ps" outside swarm mode
...
"docker node ps" behaves strangely outside swarm mode:
$ docker node ps
ID NAME IMAGE NODE DESIRED STATE CURRENT STATE ERROR PORTS
Error: No such node:
It should explain that the node is not a swarm manager.
The reason this happens is that the argument to "docker node ps" defaults
to "self". The first thing the command does is try to resolve "self" to
a node ID using the /info endpoint. If there is no node ID, it tries to
use the empty string as an ID, and tries to GET /nodes/, which is not a
valid endpoint.
Change the command to check if the node ID is present in the /info
response. If it isn't, a swarm API endpoint can supply a useful error
message.
Also, avoid printing the column headers if the only following text is an
error.
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com >
Upstream-commit: ad1c96c6a72a503df956b220b3f8752683bc0896
Component: engine
2017-03-21 17:01:07 -07:00
7bf0179b13
update "docker daemon" deprecation message for new version scheme
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: ba76a0c91212d47ae797848802595eef92fa07fa
Component: engine
2017-03-22 00:21:15 +01:00
8df09e0187
Windows: Don't close client stdin handle to avoid hang
...
Signed-off-by: John Howard (VM) <jhoward@microsoft.com >
Upstream-commit: 91e971c0feeb507fdf728db1c10bd7c5e328e007
Component: engine
2017-03-21 16:00:17 -07:00
John Howard (VM)
Vincent Demeester
John Howard (VM)
Sebastiaan van Stijn
Greg Pflaum
Brian Goff
Aaron Lehmann
Steve Durrheimer
Christopher Jones
Anusha Ragunathan
Tibor Vass
Foysal Iqbal
John Howard
John Maguire
Alessandro Boch
Wayne Song
Ryan Liu
Tonis Tiigi
Sebastiaan van Stijn