Antonio Murdaca
9ce11130e0
cli/info: fix seccomp warning
...
also reword seccomp warning around default seccomp profile
Signed-off-by: Antonio Murdaca <runcom@redhat.com >
Upstream-commit: c68e75e51d58167b5b21e77bbc7b701fe0888096
Component: engine
2016-11-04 19:25:51 +01:00
Antonio Murdaca
04676aa104
docs: update for new secopts struct in GET /info
...
Signed-off-by: Antonio Murdaca <runcom@redhat.com >
Upstream-commit: e6ec90608ca06431920afa6d4c56130af9c02a28
Component: engine
2016-11-04 19:25:51 +01:00
Michael Crosby
3f43af0758
Merge pull request #27958 from yongtang/27921-cpus
...
Add `--cpus` flag to control cpu resources
Upstream-commit: 6572c467164f99ae00150def4ac282bb46f85bce
Component: engine
2016-11-04 11:18:17 -07:00
Harald Albers
889abdab10
Add bash completion for docker service create --hostname
...
Signed-off-by: Harald Albers <github@albersweb.de >
Upstream-commit: 42f8562984809b26bbae541cc005e36a2febc1cb
Component: engine
2016-11-04 19:08:17 +01:00
Justin Cormack
b865964d4d
Use runc version built without ambient capabilities
...
Until we can support existing behaviour with `sudo` disable
ambient capabilities in runc build.
Add tests that non root user cannot use default capabilities,
and that capabilities are working as expected.
Test for #27590
Update runc.
Signed-off-by: Justin Cormack <justin.cormack@docker.com >
Upstream-commit: c5251f7116e3d9095a7169fc31bd170dff997c2e
Component: engine
2016-11-04 17:25:28 +00:00
John Howard
46c5a7990c
Windows: Allow API v1.24
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: e4af39aeb311a08fd2d15e01eabd6bae9db36382
Component: engine
2016-11-04 10:10:42 -07:00
Derek McGowan
b6c8ff694d
Use sha512 when gpg signing builds
...
Signed-off-by: Derek McGowan <derek@mcgstyle.net > (github: dmcgowan)
Upstream-commit: 201f8043102efbbb624b3d70001878328cbbf655
Component: engine
2016-11-04 09:45:13 -07:00
Yong Tang
133eec9cfa
Add --cpus flag to control cpu resources
...
This fix tries to address the proposal raised in 27921 and add
`--cpus` flag for `docker run/create`.
Basically, `--cpus` will allow user to specify a number (possibly partial)
about how many CPUs the container will use. For example, on a 2-CPU system
`--cpus 1.5` means the container will take 75% (1.5/2) of the CPU share.
This fix adds a `NanoCPUs` field to `HostConfig` since swarmkit alreay
have a concept of NanoCPUs for tasks. The `--cpus` flag will translate
the number into reused `NanoCPUs` to be consistent.
This fix adds integration tests to cover the changes.
Related docs (`docker run` and Remote APIs) have been updated.
This fix fixes 27921.
Signed-off-by: Yong Tang <yong.tang.github@outlook.com >
Upstream-commit: 846baf1fd3efcbfbf9d3eb99e436ca9a59d3e185
Component: engine
2016-11-04 09:43:10 -07:00
Justin Cormack
71fb2940a4
Merge pull request #26276 from runcom/seccomp-conf
...
daemon: add a flag to override the default seccomp profile
Upstream-commit: efa5e85cf7c6d91fbc8003770fee14bd716a2fdd
Component: engine
2016-11-04 15:45:30 +00:00
Vincent Demeester
bf52c4c327
Merge pull request #27857 from vasil-yordanov/docker-service-hostname-2
...
Adding the hostname option to docker service command
Upstream-commit: b4e14c6edcd201f0b5fade154714218a41005d77
Component: engine
2016-11-04 15:22:55 +01:00
Christopher Jones
4ca3d7782b
switch all go download links to https://golang.org/dl
...
this switches all go download links to use a redirect,
https://golang.org/dl/ instead of the direct source.
Signed-off-by: Christopher Jones <tophj@linux.vnet.ibm.com >
Upstream-commit: 732d1035d2f1d8f0b6f3410035fa393431b93d89
Component: engine
2016-11-04 09:03:41 -05:00
lixiaobing10051267
062deefffb
add error information to distinguish different test scene
...
Signed-off-by: lixiaobing10051267 <li.xiaobing1@zte.com.cn >
Upstream-commit: 925c1427a8ed308ce55a0eed709c56515aeabcc4
Component: engine
2016-11-04 17:16:11 +08:00
lixiaobing10051267
92845e354d
modify URL because installation directory removed
...
Signed-off-by: lixiaobing10051267 <li.xiaobing1@zte.com.cn >
Upstream-commit: 56cca9292252efbcecad69fc965d63d99fda5e5e
Component: engine
2016-11-04 16:40:15 +08:00
Steve Durrheimer
217225ece0
Cleanup after moving all zsh completion logics for the new container command
...
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com >
Upstream-commit: 94863d8c63dbdb811afba20b79d0502903fdd313
Component: engine
2016-11-04 08:55:16 +01:00
Steve Durrheimer
5f2dda8fc5
Move zsh completion logic to new subcommand: wait
...
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com >
Upstream-commit: 6a662de9650c19d8ada575badee4a5e4f3290e5d
Component: engine
2016-11-04 08:55:13 +01:00
Steve Durrheimer
6ffd295baf
Move zsh completion logic to new subcommand: update
...
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com >
Upstream-commit: b25603391c3ed562d136aa0eafcd7b35ff6c686a
Component: engine
2016-11-04 08:55:12 +01:00
Steve Durrheimer
a02dd8aa90
Move zsh completion logic to new subcommand: top
...
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com >
Upstream-commit: 07a3ccec0a677aa198afa8b407f75c48cebd033a
Component: engine
2016-11-04 08:55:10 +01:00
Steve Durrheimer
0dca92ce6c
Move zsh completion logic to new subcommand: stop
...
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com >
Upstream-commit: 6aff1be4303aff902a1997a300d910a6bfd19445
Component: engine
2016-11-04 08:55:09 +01:00
Steve Durrheimer
09263a74a2
Move zsh completion logic to new subcommand: stats
...
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com >
Upstream-commit: d0e4f7fbe69d189a39a2c35584aee12dfe1cec2f
Component: engine
2016-11-04 08:55:07 +01:00
Steve Durrheimer
f0856717ce
Move zsh completion logic to new subcommand: start
...
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com >
Upstream-commit: 8e5285c283ac352702689a652eab13ba93d4bb41
Component: engine
2016-11-04 08:55:05 +01:00
Steve Durrheimer
413c4301a9
Move zsh completion logic to new subcommand: run
...
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com >
Upstream-commit: dcc5b72020382d2b379c26d25d6e173609e1c2fc
Component: engine
2016-11-04 08:55:04 +01:00
Steve Durrheimer
78134a2469
Move zsh completion logic to new subcommand: rm
...
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com >
Upstream-commit: 1df32a4f6c3160a6bbe7ab5a36be6e10ea51616f
Component: engine
2016-11-04 08:55:02 +01:00
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
lixiaobing10051267
10bbdb2391
Rectify Images display information for docker 1.10.3
...
Signed-off-by: lixiaobing10051267 <li.xiaobing1@zte.com.cn >
Upstream-commit: 1a43f5c396106884742eab6db84703db7d5617a7
Component: engine
2016-11-04 13:04:20 +08:00
Aaron Lehmann
c5466cbef3
Run lint on most of api/types
...
The validate-lint script excludes any package names that match
api/types. However, the only subpackage that appears to cause issues is
api/types/container (due to stuttering names). Tighten the filtering so
that other code inside api/types is validated.
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com >
Upstream-commit: efa7068133f224386dbcceb19a6dd31d1d2e9404
Component: engine
2016-11-03 19:08:24 -07: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
Kunal Kushwaha
12c98acb61
correct handling of volumes while service update.
...
Updating a service to replace a volume is handled properly now.
Fixes bug#25772
Signed-off-by: Kunal Kushwaha <kushwaha_kunal_v7@lab.ntt.co.jp >
Upstream-commit: 630613d69ef111ce4090d35dc74669dff5966d57
Component: engine
2016-11-04 10:15:18 +09: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
Victor Vieux
9d6e24532c
always add but hide experimental cmds and flags
...
Signed-off-by: Victor Vieux <vieux@docker.com >
Upstream-commit: 3e43fa28ecc265ebbb95afd94017e7e3d5ccfdc0
Component: engine
2016-11-03 17:31:12 -07: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