20482eac18
Update containerd to 8517738ba4b82aff5662c97ca4627e7e4d03b531
...
This version:
- properly follow context cancellation on Start and Exec
- add support for Solaris
- ensure exec exit events are always seen before init's
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com >
Upstream-commit: 0aa17f0f6090ddeefaa6a0bc618aeb8baf3afa3f
Component: engine
2016-11-08 09:47:41 -08:00
5433abf008
Merge pull request #27710 from allencloud/show-num-for-global-service-in-service-ls
...
support show numbers of global service in service ls command
Upstream-commit: a70b1d74a040e2c17bba1fe553ccbd293a64703a
Component: engine
2016-11-08 18:43:53 +01:00
4b60a6ae97
Merge pull request #28140 from tonistiigi/update-fifo
...
vendor: update fifo to 14056439
Upstream-commit: 16ea0806f8c49f7126d0c244ca363d2327ba7e50
Component: engine
2016-11-08 12:31:03 -05:00
e5fe6e7966
Merge pull request #27466 from mrjana/net
...
Retry AttachNetwork when it fails to find network
Upstream-commit: 9a61bd05f8c86be2a7f03d57f29991abaae20e5a
Component: engine
2016-11-08 18:25:45 +01:00
dc4e39cec4
Merge pull request #28130 from tophj-ibm/change-jq-syntax-for-old-version-support
...
[integration-cli] changes syntax to support older version of jq
Upstream-commit: 3a5a0ef1d4df99452da3f21955030abaf29a2642
Component: engine
2016-11-08 14:00:59 +00:00
770f488176
Merge pull request #28152 from AkihiroSuda/fix-tmpfs-ro-mount
...
api: fix ReadOnly support for tmpfs
Upstream-commit: 8a396f90f5ff32aee36ada3cfd0a1ed214f0e88e
Component: engine
2016-11-08 08:59:48 -05:00
d78d9594ad
Merge pull request #28158 from lixiaobing10051267/masterMakeSum
...
fix using wrong function name for MakeTarSumContext
Upstream-commit: 189727581be77049f7f3234894c3966639808e89
Component: engine
2016-11-08 22:37:23 +09:00
988bfccd70
Merge pull request #28157 from yuexiao-wang/update-checkpoint
...
Update for docker checkpoint
Upstream-commit: cbc511720ab13bff05a66c9fa72f5354b2c7bc94
Component: engine
2016-11-08 22:36:22 +09:00
b1990eccbb
Merge pull request #28143 from icecrime/poule
...
Add poule.yml
Upstream-commit: 14a06cbb29b6100e5705d777ce42b3a375a54542
Component: engine
2016-11-08 13:09:09 +01:00
032d1bd1bd
Merge pull request #28153 from YuPengZTE/devCtx
...
context.Context should be the first parameter of a function
Upstream-commit: ec221643587a6c22b7e0ab20087ce97100285fb9
Component: engine
2016-11-08 12:40:32 +01:00
d07b461649
Merge pull request #28144 from yongtang/11072016-swarmkit-update
...
Revendor swarmkit to 29950a4e9912178cadb72abc5a445e3a857cb2b0
Upstream-commit: 2fa63c90de627423be54a929cb6b023e84123b34
Component: engine
2016-11-08 12:39:03 +01:00
379e810a82
Merge pull request #27888 from sdurrheimer/zsh-completion-container-subcommand
...
Add zsh completion for new 'docker container' subcommands
Upstream-commit: d46c7109b520bfe485b4c9ca5f59a3768b444aa0
Component: engine
2016-11-08 11:24:28 +01:00
bea6724b50
Merge pull request #28038 from bfirsh/add-validate-swagger
...
Validation for swagger.yaml
Upstream-commit: 9075aa4ddd9f721fda24704de5d54bf36445e330
Component: engine
2016-11-08 10:57:01 +01:00
7c8e31f530
fix using wrong function name for MakeTarSumContext
...
Signed-off-by: lixiaobing10051267 <li.xiaobing1@zte.com.cn >
Upstream-commit: 71f144648af71d8daa6481464707b4f8a9476a3c
Component: engine
2016-11-08 17:16:13 +08:00
f95b21c73c
Update for docker checkpoint
...
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn >
Upstream-commit: 90ce77e46a7d84ff801624e105b6c00749d3286c
Component: engine
2016-11-08 16:56:29 +08:00
2879129b44
Merge pull request #28117 from ping035627/ping035627-patch-1107
...
Modify to improve code readability
Upstream-commit: f5283bd253868b6f27b833e7eb7b6c36d45d2096
Component: engine
2016-11-08 09:44:45 +01:00
2b57d0c977
support show numbers of global service in service ls command
...
Signed-off-by: allencloud <allen.sun@daocloud.io >
Upstream-commit: ea03f090b8e0d5530c50857f54d8e961f9139b92
Component: engine
2016-11-08 16:17:15 +08:00
08efaac2fe
Add bash completion for docker service {create,update} --tty
...
Signed-off-by: Harald Albers <github@albersweb.de >
Upstream-commit: bfd8f7a7e15a0a4eece33e545368e915470147e0
Component: engine
2016-11-08 09:13:23 +01:00
9cafe2a9d5
context.Context should be the first parameter of a function
...
Signed-off-by: yupeng <yu.peng36@zte.com.cn >
Upstream-commit: 4b86bd050b6e4c944407680d99c9ce6f25b8cc53
Component: engine
2016-11-08 14:51:17 +08:00
e967a9b4b9
api: fix ReadOnly support for tmpfs
...
For `--mount type=tmpfs,target=/foo,readonly`, the `readonly` flag was just ignored.
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp >
Upstream-commit: 3e3d3c8086237f4938e3e13561dbc1d41b5c617b
Component: engine
2016-11-08 06:49:17 +00:00
95849eb6df
Merge pull request #28076 from yongtang/25644-docker-service-tty
...
Add `--tty` to `docker service create/update`
Upstream-commit: 69efb4652c1f619f64148fd21971ff18ac575899
Component: engine
2016-11-07 22:15:27 -05:00
068bff7943
Add poule.yml
...
Add configuration for `poule` (https://github.com/icecrime/poule ) to
manage GitHub automations.
Signed-off-by: Arnaud Porterie (icecrime) <arnaud.porterie@docker.com >
Upstream-commit: 7cb1fad4a5d41c58c8510fe301d929cb4ad6027e
Component: engine
2016-11-07 19:06:35 -08:00
90bd48e381
Merge pull request #28132 from johnstep/win2lin
...
TestRunDuplicateMount requires the same host
Upstream-commit: 8937b3593624f7ffc7bf2e98552c74e6300eb0d2
Component: engine
2016-11-08 11:32:39 +09:00
22b4540407
Revendor swarmkit to 29950a4e9912178cadb72abc5a445e3a857cb2b0
...
This fix revendor swarmkit to 29950a4e9912178cadb72abc5a445e3a857cb2b0.
This fix is related to 28031.
Signed-off-by: Yong Tang <yong.tang.github@outlook.com >
Upstream-commit: f0e2eb24cfb6b1e888a93acc971386130e7e99ba
Component: engine
2016-11-07 17:57:20 -08:00
9254ca1e2c
Merge pull request #27923 from vieux/plugin_set_gogogo
...
support env for docker plugin set
Upstream-commit: 03da822ee9afa1713fe28c3996b0872a0e228c28
Component: engine
2016-11-07 17:07:14 -08:00
a773a75547
support env for docker plugin set
...
Signed-off-by: Victor Vieux <vieux@docker.com >
Upstream-commit: efbed4500e30ff1a0eef4ff71fd46a58363d041b
Component: engine
2016-11-07 16:59:29 -08:00
c56f371dbf
Merge pull request #27993 from thaJeztah/add-yakkety-yak
...
Add Ubuntu 16.10 Yakkety Yak
Upstream-commit: 8442db98306ccb5217daa2caeeb63087588b56c4
Component: engine
2016-11-07 16:47:12 -08:00
f364a8ccb7
Merge pull request #28056 from LK4D4/solaris_me
...
Add functional support for Docker sub commands on Solaris
Upstream-commit: 109c26bd7482280946e356b33f17f4d82112dff3
Component: engine
2016-11-07 16:46:18 -08:00
2a49113fdc
Add --tty to docker service create/update
...
This fix tries to add `--tty` to `docker service create/update`. As was
specified in 25644, `TTY` flag has been added to SwarmKit and is
already vendored.
This fix add `--tty` to `docker service create/update`.
Related document has been updated.
Additional integration tests has been added.
This fix fixes 25644.
Signed-off-by: Yong Tang <yong.tang.github@outlook.com >
Upstream-commit: 599be5a551bbadf23d76677c7d54c338901781f6
Component: engine
2016-11-07 16:42:32 -08:00
abc011e59f
modify to improve code readability
...
Signed-off-by: WangPing <present.wp@icloud.com >
align
Signed-off-by: WangPing <present.wp@icloud.com >
align
Signed-off-by: WangPing <present.wp@icloud.com >
Upstream-commit: 2bfd1495de5f0003eaa93ebbb4df376644cdd618
Component: engine
2016-11-08 08:37:44 +08:00
1c3e0e9032
Merge pull request #28118 from runcom/fix-secopts-types
...
Fix secopts types
Upstream-commit: 05b249e70f0ccaae2acbbb1546f373cb6bfde292
Component: engine
2016-11-07 16:32:21 -08:00
9664466e4b
vendor: update fifo to 14056439
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com >
Upstream-commit: bebfcade04e72e2f8ca91e645a96a3759198232b
Component: engine
2016-11-07 16:19:03 -08:00
395aa9be88
Merge pull request #27615 from darrenstahlmsft/ExecCloseAsync
...
Asynchronously close streams to prevent holding container lock
Upstream-commit: 67b0311c8c77eb8001572148b53410efbaefbdbd
Component: engine
2016-11-07 16:16:21 -08:00
a152887ed4
Merge pull request #28029 from tealtail/27994-add-service-ls-truncate-opt
...
remove COMMAND column from `service ls` output. closes #27994
Upstream-commit: c16860b649ae75f86d085a17958e5397f393c2f1
Component: engine
2016-11-07 14:39:16 -08:00
5a7cb6c536
Add swagger.yaml validation
...
- yamllint to ensure it is a valid YAML file
- go-swagger validate to ensure it is a valid swagger file
Signed-off-by: Ben Firshman <ben@firshman.co.uk >
Upstream-commit: 5c4abd107a4e50b9f2d29f98275a5b5b86c5f50f
Component: engine
2016-11-07 11:03:21 -08:00
fffe24070c
Fix validation errors in swagger.yaml
...
- Some objects were missing `type: "object"`
- Some examples had invalid null values (go-swagger validation
doesn't support x-nullable, so they have just been removed)
- ImageSummary example was out of date
- Removed timeNano because YAML interprets it as a float, not
a long (sigh)
- Tidy up archive errors
Signed-off-by: Ben Firshman <ben@firshman.co.uk >
Upstream-commit: e5e1c7feef3e692c21fc2745368bbcae38e02270
Component: engine
2016-11-07 11:03:10 -08:00
b577b180f8
Add logo to swagger.yaml
...
Signed-off-by: Ben Firshman <ben@firshman.co.uk >
Upstream-commit: cd0c0d06665c98d7c80cf77760dc5043ab72d466
Component: engine
2016-11-07 11:03:09 -08:00
6a317cb5f3
Merge pull request #25974 from kunalkushwaha/mount-add
...
correct handling of volumes while service update.
Upstream-commit: c1cdfe78f6eb71b33afbba4dd2a6a713a959177f
Component: engine
2016-11-07 10:34:22 -08:00
547ab32cd4
TestRunDuplicateMount requires the same host
...
Signed-off-by: John Stephens <johnstep@docker.com >
Upstream-commit: bc87ec381579892642b73b4293886d80403fc2e8
Component: engine
2016-11-07 10:19:06 -08:00
6fb90ed484
Add functional support for Docker sub commands on Solaris
...
Signed-off-by: Amit Krishnan <krish.amit@gmail.com >
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
Upstream-commit: 934328d8ea650bf8a9c3c719999ce2a1f5dd5df6
Component: engine
2016-11-07 09:06:34 -08:00
0430686245
[integration-cli] changes syntax to support older version of jq
...
Fixes a bug where a test would fail due to jq syntax
not being supported on all versions. Changes the syntax
to an equivalent way also supported on older versions.
Signed-off-by: Christopher Jones <tophj@linux.vnet.ibm.com >
Upstream-commit: 1d0a5eb33fc7828301fee6bdf1f5c4987f92c7f4
Component: engine
2016-11-07 10:54:25 -06:00
feddd2acda
Merge pull request #25983 from jhorwit2/jah/ps-refactor
...
Add -a option to service/node ps
Upstream-commit: 89ef0f21510cf14eb78f2c0677cc936882c5a261
Component: engine
2016-11-07 17:33:10 +01:00
549c168518
Add Ubuntu 16.10 Yakkety Yak
...
Ubuntu 16.10 has been released http://releases.ubuntu.com/yakkety/
Note that this is a short-term release, so will
EOL (and removed again) in 9 months
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: 27beb64d468614db0eb7344340d39b5619219a7d
Component: engine
2016-11-07 15:14:36 +01:00
7b37b03f40
Merge pull request #28059 from lixiaobing10051267/masterDockerInfo
...
Rectify Images display information for docker 1.10.3
Upstream-commit: e00e7e9582b53a5e19a7e300b37ecbedf9e4e881
Component: engine
2016-11-07 09:05:34 -05:00
e23667bf0f
Merge pull request #27279 from dongluochen/lbapi_integration
...
Support health aware load balancing
Upstream-commit: bee2beeaad7f466ce05f2d53e0bc41844d212cb3
Component: engine
2016-11-07 02:42:51 -08:00
4233bef46b
client: bump default version to v1.25
...
Signed-off-by: Antonio Murdaca <runcom@redhat.com >
Upstream-commit: 42a1f7cdf98fc97403ad53695d8ccf884e27e59f
Component: engine
2016-11-07 10:01:28 +01:00
fbe06c3bd1
api: add Info struct for v1.24
...
Signed-off-by: Antonio Murdaca <runcom@redhat.com >
Upstream-commit: 667315576fac663bd80bbada4364413692e57ac6
Component: engine
2016-11-07 10:01:14 +01:00
a3e6ad3f37
Merge pull request #28104 from Microsoft/jjh/nogoroot
...
Don't set GOROOT in dockerfile.Windows
Upstream-commit: b34b29e2379b51edcf45bf9cb70cf1cb4a409608
Component: engine
2016-11-07 17:37:21 +09:00
9156f6f7cf
Merge pull request #28093 from albers/completion-run--cpus
...
Add bash completion for `docker {run,create} --cpus`
Upstream-commit: de78ed432ba526ca463d191e3ac143bc107c00f5
Component: engine
2016-11-07 17:31:40 +09:00
a76d4f99db
Merge pull request #28094 from albers/completion-system-df
...
Add bash completion for `docker system df`
Upstream-commit: 67a247154c60ef924ca41a57f4720d4b9f3a5f65
Component: engine
2016-11-07 17:31:27 +09:00
