Steve Durrheimer
5a143d3097
Move zsh completion logic to new subcommand: restart
...
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com >
Upstream-commit: 64b546e7b8e6248eadd4e452d4e91d74f88563f5
Component: engine
2016-11-04 08:55:01 +01:00
Steve Durrheimer
a591b6cdc1
Move zsh completion logic to new subcommand: rename
...
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com >
Upstream-commit: fc6bd2272525772ab5c05cad2679a06afdfabb51
Component: engine
2016-11-04 08:54:59 +01:00
Steve Durrheimer
68f554a891
Move zsh completion logic to new subcommand: port
...
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com >
Upstream-commit: 4ffc37224dbf9bcfe11a3e81c42d090bbe5761e1
Component: engine
2016-11-04 08:54:58 +01:00
Steve Durrheimer
5fd4d1e40f
Move zsh completion logic to new subcommand: pause, unpause
...
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com >
Upstream-commit: e602bfbc34bb69bb2c9f0e08b4bfe31362dd36fc
Component: engine
2016-11-04 08:54:56 +01:00
Steve Durrheimer
f023ac8daf
Move zsh completion logic to new subcommand: ps
...
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com >
Upstream-commit: 44bb318161a0406e121c231b735395536fab27c7
Component: engine
2016-11-04 08:54:55 +01:00
Steve Durrheimer
c4f4b9e65d
Move zsh completion logic to new subcommand: logs
...
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com >
Upstream-commit: 28bd6162126c0d494b2d8379e2608a1fc7017aa7
Component: engine
2016-11-04 08:54:53 +01:00
Steve Durrheimer
03b262c50c
Move zsh completion logic to new subcommand: kill
...
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com >
Upstream-commit: 45fdea257c7ee8c96249a8772809d23768ed7612
Component: engine
2016-11-04 08:54:51 +01:00
Steve Durrheimer
bd9b143f60
Add zsh completion logic to new subcommand: inspect
...
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com >
Upstream-commit: e5424b656b0eeb7006384d8846c8e05e02a9e35f
Component: engine
2016-11-04 08:54:50 +01:00
Steve Durrheimer
4553330ab9
Move zsh completion logic to new subcommand: export
...
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com >
Upstream-commit: 911ef73ee1777eaa7cac08dadaf77bdd9cc9a2e5
Component: engine
2016-11-04 08:54:48 +01:00
Steve Durrheimer
509642ffb2
Move zsh completion logic to new subcommand: exec
...
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com >
Upstream-commit: ee27e97218e2c37bfb3adbef643d671ca75cc18d
Component: engine
2016-11-04 08:54:47 +01:00
Steve Durrheimer
3848320570
Move zsh completion logic to new subcommand: diff
...
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com >
Upstream-commit: 0632c344398ce0b36f14e6c100153892c0933145
Component: engine
2016-11-04 08:54:45 +01:00
Steve Durrheimer
bbacc2e9b9
Move zsh completion logic to new subcommand: create
...
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com >
Upstream-commit: abf2f0087d46a2568b1830a819c99b1fb90de445
Component: engine
2016-11-04 08:54:44 +01:00
Steve Durrheimer
fdac29909c
Move zsh completion logic to new subcommand: cp
...
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com >
Upstream-commit: b067a59bfd8dc8a5758eaa4d03c948b100a4af7b
Component: engine
2016-11-04 08:54:42 +01:00
Steve Durrheimer
15956ca1d6
Move zsh completion logic to new subcommand: commit
...
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com >
Upstream-commit: 89737ea253bad50da4674b708c6e3378d0ebfe42
Component: engine
2016-11-04 08:54:40 +01:00
Steve Durrheimer
ed305ee046
Move zsh completion logic to new subcommand: attach
...
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com >
Upstream-commit: d5ca5c1e084845c8558a598ea7dfde9bfe6cd24d
Component: engine
2016-11-04 08:54:39 +01:00
Steve Durrheimer
2301f39de7
Add zsh completion for 'docker container' subcommands
...
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com >
Upstream-commit: a9443b738856f9562c8e50a8838a79e1378857b0
Component: engine
2016-11-04 08:54:37 +01:00
Steve Durrheimer
1d0f8b0e25
Rename containers complete function in zsh completion
...
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com >
Upstream-commit: 431e9cb27c26be44ea116517635a31745c3f19bc
Component: engine
2016-11-04 08:54:27 +01:00
Vincent Demeester
1931090ba1
Merge pull request #28045 from vincentbernat/fix/inspect-short-description
...
cli: shorten description of "inspect" subcommand
Upstream-commit: 16bcc1afddd83de27e22ac519af62280a968534b
Component: engine
2016-11-04 08:15:49 +01:00
Vincent Demeester
930e01c1dd
Merge pull request #28035 from thaJeztah/add-test-for-long-loglines
...
add tests for long log-lines and trailing lines
Upstream-commit: 9f7cc7d0320b93236169a7e0f6f9d69fa8c91bb8
Component: engine
2016-11-04 07:59:20 +01:00
Alexander Morozov
7379675f65
Merge pull request #27912 from LK4D4/vndr
...
project: use vndr for vendoring
Upstream-commit: c07234707878412eaaeab252af19adac8cf25d6b
Component: engine
2016-11-03 18:30:19 -07:00
Brian Goff
4fb898db56
Merge pull request #28052 from mavenugo/nid
...
Handle NetworkDettach for the case of network-id
Upstream-commit: 7248742ae7127347a52ab9d215451c213b7b59da
Component: engine
2016-11-03 21:00:37 -04:00
Brian Goff
ba87ff5ff2
Merge pull request #28046 from tophj-ibm/make-debs-1610
...
[ppc64le] add yakkety yak to 'make deb'
Upstream-commit: d5c3eb0afb9ccbdb671c4841727bab87a4bb2145
Component: engine
2016-11-03 20:17:36 -04:00
Sebastiaan van Stijn
a512b3ec7d
Merge pull request #28000 from riyazdf/revert-27804
...
Revert "Update authz plugin list on failure."
Upstream-commit: 2793f198deb86e250e769b97fe5a1a729b829ce6
Component: engine
2016-11-03 17:17:22 -07:00
Misty Stanley-Jones
69698a95a6
Merge pull request #28053 from gdevillele/pr_fix_docs_frontmatter_keywords_2
...
fix frontmatter keywords value type (string, instead of []string) in /docs/reference/
Upstream-commit: a89f8f2d9318984dedc291cea8dca6fecf50c9e5
Component: engine
2016-11-03 17:16:40 -07:00
Misty Stanley-Jones
ca48f39ec7
Merge pull request #28049 from gdevillele/pr_fix_docs_frontmatter_keywords
...
fix frontmatter keywords value type (string, instead of []string)
Upstream-commit: 8956853398fc30b08897f6da239d95e0a39ed782
Component: engine
2016-11-03 17:14:11 -07:00
Sebastiaan van Stijn
105f733caf
Merge pull request #26792 from mrunalp/bug/26790
...
Add SELinux options to security opt even when it is not empty
Upstream-commit: 58a930d66b7cada1fbc2490c10890fdc56b4d053
Component: engine
2016-11-03 17:04:36 -07:00
Sebastiaan van Stijn
8ef82a0e0b
Merge pull request #28021 from YuPengZTE/devString
...
Add “” for String
Upstream-commit: 6b3b9d53e1cb0db90d3e25881fcf1e225179040e
Component: engine
2016-11-03 17:03:56 -07:00
Sebastiaan van Stijn
ac87aff1ce
Merge pull request #27707 from FrenchBen/aws-logstream
...
Aws logstream
Upstream-commit: f424b1d8845e8d9c55f379df979ed63eee923a2a
Component: engine
2016-11-03 16:16:02 -07:00
Madhu Venugopal
c790a14c2d
Handle NetworkDettach for the case of network-id
...
When a container is attached to an "--attachable" network, it strictly
forms the attacherKey using either the network-id or network-name
because at the time of attachment, the daemon may not have the network
downloaded locally from the manager. Hence, when the NetworkDettach is
called, it should use either network-name or network-id. This fix
addresses the missing network-id based dettachment case.
Signed-off-by: Madhu Venugopal <madhu@docker.com >
Upstream-commit: 5f17e0f6c91b36a8f33d1efa1be879d6eb80132f
Component: engine
2016-11-03 15:56:35 -07:00
Riyaz Faizullabhoy
abdf1bbec3
Revert "Update authz plugin list on failure."
...
This reverts commit fae904af02a184833d2cd5ce9fdd61a4083707c7.
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com >
Upstream-commit: a64fc8eea3266968c8e0082dbe6a2f5a8a5bbdc0
Component: engine
2016-11-03 15:49:21 -07:00
Gaetan de Villele
062414bb0e
fix frontmatter keywords value type (string, instead of []string) in /docs/reference
...
Signed-off-by: Gaetan de Villele <gdevillele@gmail.com >
Upstream-commit: 248c699ec88bb249ce9fd03001d13f29ac0b4b99
Component: engine
2016-11-03 15:48:30 -07:00
Alexander Morozov
61646d77af
project: use vndr for vendoring
...
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
Upstream-commit: f2614f2107c838d014d31b806e3b8a9f1395cb2b
Component: engine
2016-11-03 15:31:46 -07:00
Alexander Morozov
45ef7232e4
Merge pull request #27964 from dnephin/faster-validate
...
Faster validation scripts
Upstream-commit: f54339dfead48712857d38b6a4ff7f45717a7074
Component: engine
2016-11-03 15:17:34 -07:00
Tianon Gravi
77b454e708
Merge pull request #28044 from tophj-ibm/update-ppc64le-make-deb
...
[ppc64le] update go download link, and improve comments
Upstream-commit: 98c3e0c929f8b68707846cfeead894e0a8a81df1
Component: engine
2016-11-03 14:42:32 -07:00
Madhu Venugopal
d522560d52
Merge pull request #28019 from sanimej/vendor
...
Vendoring libnetwork @9ab6e13
Upstream-commit: 2d676d38a0d69ee2f4b126e8fcd48c830ee3796b
Component: engine
2016-11-03 14:35:28 -07:00
Gaetan de Villele
95b3cc2f00
fix frontmatter keywords value type (string, instead of []string)
...
Signed-off-by: Gaetan de Villele <gdevillele@gmail.com >
Upstream-commit: 4aa6618acb92cd5453c0245e2f4cc8022a2398f7
Component: engine
2016-11-03 14:21:33 -07:00
French Ben
069eefcf38
Updated AWS logstream to understand tags
...
Signed-off-by: French Ben <frenchben@docker.com >
Upstream-commit: 3661510f7f9f389f25a6d6a065509ae224372994
Component: engine
2016-11-03 13:49:40 -07:00
Brian Goff
362409ed3f
Merge pull request #27331 from Microsoft/jjh/spew
...
Add spew debugging
Upstream-commit: 02bc2e652b2a254a1afcc66cb32827fa0e65a6fa
Component: engine
2016-11-03 16:36:20 -04:00
Daniel Nephin
1747fa824e
Add stubs for windows CI
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: 9a2eb8b162e4df0533aeafc2e8d7bb9bbadb8234
Component: engine
2016-11-03 14:24:58 -06:00
Daniel Nephin
dd0403a2eb
Move validation out of hack/make
...
Allow each script to run directly without the hack/make.sh wrapper. These
scripts do not produce artifacts and do not benefit from the "bundles"
framework.
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: 22033e10034884734621f185b60ddaa119014480
Component: engine
2016-11-03 14:24:22 -06:00
Mrunal Patel
a3ad26e4b1
Ensure that SELinux Options are set when seccomp is already set
...
Signed-off-by: Mrunal Patel <mrunalp@gmail.com >
Upstream-commit: 4c10c2ded38031b20f5a0a409dd24643625fa878
Component: engine
2016-11-03 13:23:53 -07:00
Sebastiaan van Stijn
d7dd3c497e
Merge pull request #27383 from runcom/authz-peercerts
...
pkg/authorization: send request's TLS peer certificates to plugins
Upstream-commit: 16f6b3e8a9f22df5cbd3454f6e68a8be7e5f04cf
Component: engine
2016-11-03 13:22:29 -07:00
Victor Vieux
373f6a5b36
Merge pull request #28040 from vieux/fix_prune_container_msg
...
fix double [y/N] in container prune
Upstream-commit: e9158358e5cf227688aaf4529625395559d6bb2d
Component: engine
2016-11-03 13:19:10 -07:00
Christopher Jones
45efa44b4f
[ppc64le] add yakkety yak to 'make deb'
...
This adds 'make deb' support for yakkety yak on ppc64le
Signed-off-by: Christopher Jones <tophj@linux.vnet.ibm.com >
Upstream-commit: da382044d3630bcdeb1eac64f2f7ad476e0cf007
Component: engine
2016-11-03 15:59:59 -04:00
Vincent Bernat
b3ef6232b4
cli: shorten description of "inspect" subcommand
...
The short description should be kept short. Spanning on several lines is
a bit ugly. A user can still get more information in the manual or we
can expand the long description instead if we want (there is currently
none).
This reverts a bit of #26683 .
Signed-off-by: Vincent Bernat <vincent@bernat.im >
Upstream-commit: 3443668e044476869227295a0aabb65c50fdd3ef
Component: engine
2016-11-03 20:46:28 +01:00
Christopher Jones
dc399e49f2
[ppc64le] update make deb go download link
...
Updates the ppc64le `make deb` trusty download link to be
consistent with the other Dockerfiles. Also minor clarification
to how we install go.
Signed-off-by: Christopher Jones <tophj@linux.vnet.ibm.com >
Upstream-commit: 629e85ad8975046eba3a88fdc8448759525e27bd
Component: engine
2016-11-03 15:26:28 -04:00
Santhosh Manohar
1b35413a33
Fix IT case for network name validation
...
Signed-off-by: Santhosh Manohar <santhosh@docker.com >
Upstream-commit: 9cebccfb95b75e7688b897d74c1eee9eb668526f
Component: engine
2016-11-03 11:04:37 -07:00
Santhosh Manohar
2a3ba6c702
Vendoring libnetwork @9ab6e13
...
Signed-off-by: Santhosh Manohar <santhosh@docker.com >
Upstream-commit: 8479a765dd5b4b56acd0815135d201bc98b3709a
Component: engine
2016-11-03 10:58:47 -07:00
Victor Vieux
bff4ddec3e
fix double [y/N] in container prune
...
Signed-off-by: Victor Vieux <vieux@docker.com >
Upstream-commit: eadb5b315be2ca51aa59ce55ef34478fbdceefa2
Component: engine
2016-11-03 10:33:17 -07:00
Sebastiaan van Stijn
6477b96f99
Merge pull request #27910 from dperny/node_ip_in_raft
...
Auto-detect node IP address
Upstream-commit: b2641bd9df5c2511f9af5c811590617884c24a0f
Component: engine
2016-11-03 10:30:55 -07:00