Commit Graph

31487 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
f5fe2997fb Merge pull request #31941 from felicianotech/fix/cli-build-heading
Fix 'Specify a Dockerfile (-f)' heading in Engine CLI Docs.
Upstream-commit: a8b20f47895a8d7a65ee270090ec0db92ebca977
Component: engine
2017-03-20 12:51:47 +01:00
4d5a6fd5d8 Merge pull request #31933 from cooltoast/master
Add Johannes Kepler and Mary Jackson to name generator
Upstream-commit: 5aa44cdf132788cc0cd28ce2393b44265dd400e9
Component: engine
2017-03-20 11:27:17 +01:00
366968b59a Merge pull request #31882 from unclejack/fix_Dockerfile
Dockerfile: move comments to fix build error
Upstream-commit: 3794e190ff17c96ffc5c0dc46bfb501057f32d69
Component: engine
2017-03-20 11:08:45 +01:00
d823652d21 profiles: seccomp: allow clock_settime when CAP_SYS_TIME is added
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
Upstream-commit: 3ab4961032315abb4fd4ed813034a114d1d55699
Component: engine
2017-03-20 11:05:23 +01:00
3e18c0a07b fixed:go vetting warning unkeyed fields
Signed-off-by: Aaron.L.Xu <liker.xu@foxmail.com>
Upstream-commit: 2333b39b37cb7db80c66269d48c6f22dabf8973c
Component: engine
2017-03-20 16:30:01 +08:00
5e80470f62 Fix 'Specify a Dockerfile (-f)' heading in Engine CLI Docs.
Signed-off-by: Ricardo N Feliciano <FelicianoTech@gmail.com>
Upstream-commit: 0bd77d238137091b45b94dd8df6e4cb2151e44f5
Component: engine
2017-03-19 18:05:12 -04:00
6d6cf437f8 Add format to secret ls
Signed-off-by: Boaz Shuster <ripcurld.github@gmail.com>
Upstream-commit: e281fe9c3a0034e119e7718a142133e86f38a4f2
Component: engine
2017-03-19 09:22:30 +02:00
600635fabb Add Johannes Kepler and Mary Jackson to name generator
Signed-off-by: cooltoast <mpatel678@gmail.com>
Upstream-commit: 234b2203e576fa40236d388f79b5ccefd3558147
Component: engine
2017-03-17 20:36:12 -07:00
d24d60de69 Merge pull request #31891 from ngaro/master
Fix zsh-completion for containers in status 'created'
Upstream-commit: 04da4041757370fb6f85510c8977c5a18ddae380
Component: engine
2017-03-18 03:09:29 +01:00
476e7d708e Fix zsh-completion for containers in status 'created'
This patch makes sure that containers in the created-stated are
counted as stopped containers. Otherwise if you create a container,
don't run it and type: "docker rm ", followed by pressing tab in zsh, it won't show up.

Signed-off-by: Nikolas Garofil <nikolas.garofil@uantwerpen.be>
Signed-off-by: Nikolas Garofil <nikolas@garofil.be>
Upstream-commit: e5a327ff2fd0b129edf982dab113a39cd91471df
Component: engine
2017-03-18 02:09:34 +01:00
998da3bcb0 Merge pull request #31914 from albers/completion-rm-created
Improve bash completion for `docker rm`
Upstream-commit: a99c3bcd7f323ae64287af8b1d3b9d8e4fd87fed
Component: engine
2017-03-17 15:08:02 -04:00
ab5fc16144 Merge pull request #31905 from anusha-ragunathan/unmount-disable
Wait to unmount propagatedmount before marking plugin as disabled.
Upstream-commit: 108dccaf514b86c6d30c2c4e08af606fa2a4b5f1
Component: engine
2017-03-17 14:37:40 -04:00
bddb190597 Merge pull request #30781 from AkihiroSuda/fix-stack-env
compose: fix environment interpolation from the client
Upstream-commit: 8bc703804de45bafe4e6362d150d6c74db8dd7db
Component: engine
2017-03-17 15:56:50 +01:00
996aa3fb64 Merge pull request #31820 from ehazlett/secrets-restrict
Restrict secret view to node level in controller
Upstream-commit: 0fe41cc4db65372f66d79721344522159c173ae5
Component: engine
2017-03-17 14:25:32 +01:00
a7a954d57a Bash completion for docker node update completes only one node
`docker node update` accepts only one node.
Before this change, bash completion would complete additional nodes.

Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: aea95471c44defe7c3f9d4e8adc22f7dfdc237ab
Component: engine
2017-03-17 09:33:55 +01:00
b1ada390df Improve bash completion for docker rm
`docker rm` can delete containers in state=created, too.

Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: cac3775de8aa34bdff39db84239b86035eabe70b
Component: engine
2017-03-17 09:21:37 +01:00
95c8df3265 compose: update the comment about MappingWithEquals
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
Upstream-commit: 2cdc9c42eb138bcaffb1cbd4172bd18b69446394
Component: engine
2017-03-17 06:21:55 +00:00