Vincent Demeester
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
Vincent Demeester
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
Alessandro Boch
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
Vincent Demeester
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
Vincent Demeester
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
Vincent Demeester
990ce22e58
Merge pull request #31991 from tonistiigi/add-build-arg-testcase
...
Add testcase for build arg without value
Upstream-commit: 2b478686beadd49bc68f56fdf308112442758cad
Component: engine
2017-03-22 09:55:45 +01:00
Wayne Song
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
Ryan Liu
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
Tonis Tiigi
1d07f176cb
Return proper exit code on builder panic
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com >
Upstream-commit: 82b04969b7
Component: cli
2017-03-21 19:09:23 -07:00
Tonis Tiigi
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
Tonis Tiigi
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
Aaron Lehmann
eb1ed29f05
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: d59f6d0933
Component: cli
2017-03-21 17:01:07 -07:00
Aaron Lehmann
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
Sebastiaan van Stijn
f91e9b960b
update "docker daemon" deprecation message for new version scheme
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: b83bf0a4fd
Component: cli
2017-03-22 00:21:15 +01:00
Sebastiaan van Stijn
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
John Howard (VM)
748bae2fe6
Windows: Don't close client stdin handle to avoid hang
...
Signed-off-by: John Howard (VM) <jhoward@microsoft.com >
Upstream-commit: e8be542957
Component: cli
2017-03-21 16:00:17 -07:00
John Howard (VM)
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
Anusha Ragunathan
559dd7f06c
Add pid host support
...
Tested using global-net-plugin-ipc which sets PidHost in config.json.
Plugins might need access to host pid namespace. Add support for that.
Tested using aragunathan/global-net-plugin-ipc which sets "pidhost" in
config.json. Observed using `readlink /proc/self/ns/pid` that plugin and
host have the same ns.
Signed-off-by: Anusha Ragunathan <anusha.ragunathan@docker.com >
Upstream-commit: 4d1edcb2cce34bd86d2602923872f8b5c80560c8
Component: engine
2017-03-21 13:39:01 -07:00
Anusha Ragunathan
c15d33bf9c
Add support in plugin config for accessing host ipc namespace.
...
Plugins might need access to host ipc namespace. A good usecase is
a volume plugin running iscsi multipath commands that need access to
host kernel locks.
Tested with a custom plugin (aragunathan/global-net-plugin-full) that's
built with `"ipchost" : true` in config.json. Observed using
`readlink /proc/self/ns/ipc` that plugin and host have the same ns.
Signed-off-by: Anusha Ragunathan <anusha.ragunathan@docker.com >
Upstream-commit: 6d6185c2577c473fa9046d73a850c09a254e9a81
Component: engine
2017-03-21 13:39:01 -07:00
Sebastiaan van Stijn
2cd240f5cd
Merge pull request #31966 from runcom/seccomp-clock-settime
...
profiles: seccomp: allow clock_settime when CAP_SYS_TIME is added
Upstream-commit: fd3aef5ec222e87af34df42d9fcad8e427880760
Component: engine
2017-03-21 20:22:22 +01:00
Victor Vieux
392ffd1e6e
Merge pull request #31705 from cyli/bump-go-connections
...
Use either a system pool or custom CA pool when connecting from client->daemon (+go-connections version bump)
Upstream-commit: afe1c5c2ebbe2d5448668761f722b0f5d2def9a5
Component: engine
2017-03-21 10:36:41 -07:00
Victor Vieux
0cae42f93c
Merge pull request #31705 from cyli/bump-go-connections
...
Use either a system pool or custom CA pool when connecting from client->daemon (+go-connections version bump)
Upstream-commit: 6bc233965e
Component: cli
2017-03-21 10:36:41 -07:00
Dave Tucker
cc2d5e2aaf
Ignore built-in allowed build-args in image history
...
Removes the build-args from the image history if they are in the
BuiltinAllowedBuildArgs map unless they are explicitly defined in an ARG
instruction.
Signed-off-by: Dave Tucker <dt@docker.com >
Upstream-commit: 89a2a885c82bade2774f4b669b4e09ede8f840c3
Component: engine
2017-03-21 16:36:48 +00:00
Sebastiaan van Stijn
57f09755b9
Merge pull request #31969 from vdemeester/fix-images-reference-docs-filter-list
...
Add `reference` filter to the list of available filters
Upstream-commit: 4c7941d391cad0e496379d12d76b0fb794f80e8d
Component: engine
2017-03-21 16:14:07 +01:00
Vincent Demeester
1ec4220e3a
Add reference filter to the list of available filters
...
The `reference` filter is documented in the file, but is not present
in the list of available filters.
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: 8e7e6bdb73fc050ca23a910b767fcb58197eed00
Component: engine
2017-03-21 16:11:11 +01:00
Vincent Demeester
b846e86fc9
Merge pull request #31962 from dgageot/fix-31922
...
Windows: Fix Docker hanging with named pipes and stdin
Upstream-commit: b82f9622dcac9d3d8ec60c78619bfcfc37284f01
Component: engine
2017-03-21 16:02:29 +01:00
Vincent Demeester
ad7ff06c3f
Merge pull request #31621 from dnephin/cleanup-container-run-command
...
Some cleanup of container run command
Upstream-commit: 250c3f0db2
Component: cli
2017-03-21 16:01:11 +01:00
Vincent Demeester
bd926fecd3
Merge pull request #31621 from dnephin/cleanup-container-run-command
...
Some cleanup of container run command
Upstream-commit: f965aab5e95b52a5c44f4b4412bb0202adcf3174
Component: engine
2017-03-21 16:01:11 +01:00
Jeremy Yallop
260796fd5f
Documentation for bind mount consistency flags.
...
Signed-off-by: Jeremy Yallop <yallop@docker.com >
Upstream-commit: 1a710c16600c76ec62ff468f99534e3779efa4a7
Component: engine
2017-03-21 11:55:33 +00:00
David Gageot
7ea495470a
Windows: Fix Docker hanging with named pipes and stdin
...
Fixes #31922
Vendor a fork of Microsoft/go-winio that has this
PR (https://github.com/Microsoft/go-winio/pull/43 )
merged
Signed-off-by: David Gageot <david@gageot.net >
Upstream-commit: 97b572ea1ba05fadbae5e29335489a04b5b3b123
Component: engine
2017-03-21 11:49:57 +01:00
Vincent Demeester
4b6db08e9a
Merge pull request #31928 from Microsoft/jjh/cleanupremoving
...
Windows: graph cleanup '-removing'
Upstream-commit: 58ccdfe00c4e47f1f1d3aabff40189c3aea64b65
Component: engine
2017-03-21 09:43:38 +01:00
Akihiro Suda
b8b27f2f65
Merge pull request #29779 from thaJeztah/do-not-return-incorrect-error
...
NetworksPrune: do not return warnings as error
Upstream-commit: 9a5bf4b5ad10c7f0363a20d9781d4050d9de142e
Component: engine
2017-03-21 16:28:54 +09:00
Sebastiaan van Stijn
70819077bf
Merge pull request #31596 from rootsongjc/dry-run-test
...
Wrong entrypoint in docker plugin example
Upstream-commit: 0bc84fc06c4be2b48afd3e50f199316e2d4d94fb
Component: engine
2017-03-20 23:38:15 +01:00
Sebastiaan van Stijn
70615a5680
Merge pull request #31552 from ripcurld0/add_format_secretls
...
Add format to secret ls
Upstream-commit: e1409013e5
Component: cli
2017-03-20 20:20:45 +01:00
Sebastiaan van Stijn
730ccc302a
Merge pull request #31552 from ripcurld0/add_format_secretls
...
Add format to secret ls
Upstream-commit: 1ec77baed9f87c9c7cb64ddd2ad203d800ba7efa
Component: engine
2017-03-20 20:20:45 +01:00
Tonis Tiigi
00541f8de2
Fix cache for dockerfiles with multiple FROM
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com >
Upstream-commit: acad599210b5c00a4f3a8eae05de21d0d9ef8a88
Component: engine
2017-03-20 11:24:50 -07:00
Tonis Tiigi
fb83132fe7
Fix ARG scoping for Dockerfiles with multiple FROM
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com >
Upstream-commit: 09f308ce211cd00f24d4e0f8cc797816b4fff1b6
Component: engine
2017-03-20 11:24:44 -07:00
Vincent Demeester
b5ecd1b831
Merge pull request #31948 from vdemeester/compose-typo
...
Fixing a small typo in compose loader package
Upstream-commit: 586412ce39
Component: cli
2017-03-20 17:48:50 +01:00
Vincent Demeester
f75a21c954
Merge pull request #31948 from vdemeester/compose-typo
...
Fixing a small typo in compose loader package
Upstream-commit: 550b06ab6a9e9e0200b9b5d2f5cb5b7b7b4bb16a
Component: engine
2017-03-20 17:48:50 +01:00
Daniel Nephin
1373ab0988
Create a new ServerType struct for storing details about the server on the client.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: 749d8b2bdc
Component: cli
2017-03-20 12:48:25 -04:00
Daniel Nephin
6c48ab35fe
Create a new ServerType struct for storing details about the server on the client.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: 4ab8463fed
Component: cli
2017-03-20 12:48:25 -04:00
Daniel Nephin
5ed1f03370
Create a new ServerType struct for storing details about the server on the client.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: 41522439859b5d62651e71a424c03f96be26aec3
Component: engine
2017-03-20 12:48:25 -04:00
Vincent Demeester
dbaf00790d
Merge pull request #31669 from tonistiigi/files-filter
...
Fix inefficient file paths filter
Upstream-commit: 2422d5ad35345e0ab24d3f22b96c1271f7c1e07d
Component: engine
2017-03-20 17:43:47 +01:00
John Howard (VM)
c8585d779a
Windows: graph cleanup '-removing'
...
Signed-off-by: John Howard (VM) <jhoward@ntdev.microsoft.com >
Upstream-commit: 9910b9a7f02f6991d55abcc4ea57ec78d3b3675f
Component: engine
2017-03-20 09:15:27 -07:00
Vincent Demeester
75c49bae2f
Merge pull request #31943 from liker12134/fix-go-vetting-warning-unkeyed-fields
...
Fixed:go vetting warning unkeyed fields
Upstream-commit: 1bb4eae43f4422e3ee6ea878f972d21dcf062fa4
Component: engine
2017-03-20 15:51:32 +01:00
Vincent Demeester
eea1dff191
Merge pull request #31946 from fate-grand-order/fixed
...
fix misspell in utils.go
Upstream-commit: 93eaec90aa679d13c777efec59891a2ff325d571
Component: engine
2017-03-20 15:41:54 +01:00
Vincent Demeester
589b564e68
Fixing a small typo in compose loader package
...
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: 4826a5c3af
Component: cli
2017-03-20 15:39:57 +01:00
Vincent Demeester
8e8d5b8f70
Fixing a small typo in compose loader package
...
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: b8c45c3a570ad96ca59763361f6902ac694336d9
Component: engine
2017-03-20 15:39:57 +01:00
Sebastiaan van Stijn
90c9dd45cd
Merge pull request #31915 from albers/fix-completion-node-update
...
Bash completion for `docker node update` completes only one node
Upstream-commit: 1ed277a268948f67d142b69f44591998c35d1454
Component: engine
2017-03-20 14:10:25 +01:00
fate-grand-order
a835f1babb
fix misspell in utils.go
...
Signed-off-by: Helen Xie <chenjg@harmonycloud.cn >
Upstream-commit: 2b79dbc89bf15c276145a0fa3d3728308349f86e
Component: engine
2017-03-20 19:52:00 +08:00