Commit Graph
29201 Commits
Author SHA1 Message Date
Sebastiaan van Stijn 97826ed120 Merge pull request #28081 from LK4D4/update_for_solaris
vendor: update package for solaris support
Upstream-commit: 1c62d8619d3b629cd8aae3bf44a5eb3e17c1cfb9
Component: engine
2016-11-04 17:01:16 -07:00
Sebastiaan van Stijn 8491327d68 Merge pull request #24194 from Microsoft/WindowsCpuCount
Windows: Added processor count option
Upstream-commit: e8c9063353e8afa26a8aea796893a78ba8fcc41c
Component: engine
2016-11-04 16:13:43 -07:00
Alexander Morozov 0606b2f6d5 Merge pull request #28077 from aluzzardi/swarmkit-revendoring
Revendor swarmkit to 2eaae1ab6800f8521236e01bafb2667d2ec5371f
Upstream-commit: bb1153a613933dc25e2a112416ead9106ed00f4c
Component: engine
2016-11-04 14:59:05 -07:00
Alexander Morozov 3db46dc6b5 vendor: update package for solaris support
Update includes next packages:
* golang.org/x/sys 8f0908ab3b2457e2e15403d3697c9ef5cb4b57a9
* github.com/fsnotify/fsnotify v1.2.11
* github.com/tonistiigi/fifo b4c3a126bac4051ae3fa83bfcb3c60ab7a9da0dd

Signed-off-by: Alexander Morozov <lk4d4@docker.com>
Upstream-commit: 553b0b9731c5b2b75af1fa27c17f2a19cf2a0160
Component: engine
2016-11-04 14:39:47 -07:00
Sebastiaan van Stijn cdb85c6084 Merge pull request #28068 from tophj-ibm/switch-all-golang-download-links
switch all go download links to https://golang.org/dl
Upstream-commit: 6087185676ef838c20af3dace1bbd442b6bdb53c
Component: engine
2016-11-04 14:21:58 -07:00
Kenfe-Mickaël Laventure 854000b31e Merge pull request #28074 from dmcgowan/force-sha512-sign-repos
Use sha512 when gpg signing builds
Upstream-commit: 3a9322e9ec9ed64b1e165fb901fde0f8021471d3
Component: engine
2016-11-04 14:08:52 -07:00
Victor Vieux 20cafdbd7e Merge pull request #28010 from vieux/fix_experimental_client
always add but hide experimental cmds and flags
Upstream-commit: f6edbdf8835359a83e9d5786ffe09d176609fb07
Component: engine
2016-11-04 13:49:19 -07:00
Darren Stahl c8300bf35f Windows: Add cpu count option
Signed-off-by: Darren Stahl <darst@microsoft.com>
Upstream-commit: 4e15420b9be50ddd7fa65e5c7f9b732777f9cc35
Component: engine
2016-11-04 13:38:50 -07:00
Justin Cormack 425de017f6 Merge pull request #28070 from runcom/seccomp-path-fixes
Seccomp path fixes
Upstream-commit: d7d0bc1d583c544b72e3a41827d9cc6ccb964438
Component: engine
2016-11-04 20:36:35 +00:00
Michael Crosby ac2b6ee292 Merge pull request #27737 from justincormack/no-ambient-1.13
Revert ambient capabilities for 1.13
Upstream-commit: cac13fc131c4e539a412ef46d3828dc79453c524
Component: engine
2016-11-04 12:52:21 -07:00
Andrea Luzzardi fc88fcd016 Revendor swarmkit to 2eaae1ab6800f8521236e01bafb2667d2ec5371f
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
Upstream-commit: 014eeb539beaf84c69dc2a97b8ffd32551219d0e
Component: engine
2016-11-04 12:26:37 -07:00
Andrea Luzzardi 9dcd59a93e Revendor go-memdb to floridoo/go-memdb's fork (608dda3b1410a73eaf3ac8b517c9ae7ebab6aa87)
We are temporarily using a fork containing a PR that hasn't been merged
upstream yet.

Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
Upstream-commit: 9322636c8926f155a10d9679e364e3f8e86203d6
Component: engine
2016-11-04 12:26:37 -07:00
Misty Stanley-Jones a4610ccc0a Merge pull request #28064 from lixiaobing10051267/masterInstallation
modify URL because installation directory removed
Upstream-commit: da499758b8f4fd96213889964ca206b2396bed48
Component: engine
2016-11-04 12:06:37 -07:00
Victor Vieux ffbf855e39 update cobra and use Tags
Signed-off-by: Victor Vieux <vieux@docker.com>
Upstream-commit: d34ca0178e42cddc760316bbcb6a3aa8bea8b3ed
Component: engine
2016-11-04 12:04:14 -07:00
Sebastiaan van Stijn 44dc3f21c6 Merge pull request #28072 from Microsoft/jjh/api124
Windows: Allow API v1.24
Upstream-commit: 24d822d179df9a7ab668d280efbd64a8b1735fe2
Component: engine
2016-11-04 11:57:42 -07:00
Sebastiaan van Stijn cee03f5dd3 Merge pull request #28073 from albers/completion-service-create--hostname
Add bash completion for `docker service create --hostname`
Upstream-commit: c859a9ff1fe6a1caa384c012bc007ab601e50ed7
Component: engine
2016-11-04 11:57:08 -07:00
Aaron Lehmann 20a1f51ba7 Merge pull request #28057 from aaronlehmann/lint-api
Run lint on most of api/types
Upstream-commit: ab2593457991fa037346544b91d0bdb64963d5e2
Component: engine
2016-11-04 11:56:02 -07:00
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