Commit Graph

31121 Commits

Author SHA1 Message Date
Arnaud Porterie (icecrime) 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
Akihiro Suda 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
Yong Tang 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
Victor Vieux 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
Victor Vieux 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
Victor Vieux 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
Tibor Vass 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
Yong Tang 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
WangPing 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
Michael Crosby 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
Tonis Tiigi 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
Tõnis Tiigi 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
Misty Stanley-Jones 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
Ben Firshman 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
Ben Firshman 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
Ben Firshman 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
Aaron Lehmann 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
John Stephens 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
Amit Krishnan 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
Christopher Jones 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
Vincent Demeester 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
Yong Tang 77f8e3ea0c Fix /proc/<pid>/oom_score_adj: invalid argument error caused by empty env name
This fix is part of the fix for issue 25099. In 25099, if an env
has a empty name, then `docker run` will throw out an error:
```
ubuntu@ubuntu:~/docker$ docker run -e =A busybox true
docker: Error response from daemon: invalid header field value "oci runtime error:
container_linux.go:247: starting container process caused \"process_linux.go:295:
setting oom score for ready process caused \\\"write /proc/83582/oom_score_adj:
invalid argument\\\"\"\n".
```

This fix validates the Env in the container spec before it is sent
to containerd/runc.

Integration tests have been created to cover the changes.

This fix is part of fix for 25099 (not complete yet, non-utf case
may require a fix in `runc`).
This fix is related to 25300.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
Upstream-commit: 818d55c34bed99b108e6102ef6aa6ef181567ce3
Component: engine
2016-11-07 08:15:26 -08:00
Sebastiaan van Stijn 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
Brian Goff 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
Madhu Venugopal 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
Antonio Murdaca 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
Antonio Murdaca 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
Akihiro Suda 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
Akihiro Suda 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
Akihiro Suda 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
Vincent Demeester cd10215557 Merge pull request #28096 from albers/completion-prune
Add bash completion for new prune commands
Upstream-commit: afb1119c851c5da7b85bc5d51f9d642113f994a5
Component: engine
2016-11-07 09:30:56 +01:00
Vincent Demeester 88cb957770 Merge pull request #28097 from albers/completion-fix-inspect--type
Fix bash completion for `docker inspect --type`
Upstream-commit: d049c6f8a147ed4dd0a7806eb14d4ae8f5f6a722
Component: engine
2016-11-07 09:30:04 +01:00
Vincent Demeester cdf2135b1c Merge pull request #28102 from yongtang/11052016-docs-build-Step
Update docs for the output of `docker build` (Step 1/...)
Upstream-commit: 5b2cedf11edf095b1de17d43752edacd5a2e6669
Component: engine
2016-11-07 09:28:08 +01:00
Vincent Demeester bd9109a83b Merge pull request #28075 from yongtang/27958-docs-follow-up
Follow up docs update for PR #27958
Upstream-commit: b8140249b45712e667fa7ab1ea5d4997bb533f69
Component: engine
2016-11-07 09:21:40 +01:00
Vincent Demeester 26a4e23cf3 Merge pull request #28065 from lixiaobing10051267/masterServerEror
add error information to distinguish different test scene
Upstream-commit: 325eaa7ba475233586d74831c446bb341f48fe8a
Component: engine
2016-11-07 09:16:16 +01:00
Vincent Demeester 3a37a471f0 Merge pull request #28020 from YuPengZTE/devArg
Align arg with other cli
Upstream-commit: 6e0893f304ec5dd994f81ef4c41cc174d35d6a1d
Component: engine
2016-11-07 08:58:51 +01:00
Alicia Lauerman 5de88667b4 remove COMMAND column from service ls output. closes #27994
Signed-off-by: Alicia Lauerman <alicia@eta.im>
Upstream-commit: 6ad95c4dad4aa58d4288b43b58044de0d439d3ad
Component: engine
2016-11-06 13:32:44 -05:00
Josh Horwitz b9b5178daa Add -a option to service/node ps
Signed-off-by: Josh Horwitz <horwitzja@gmail.com>
Upstream-commit: 139fff2bf0ebe12b61871ba8ec8be8d51c2338db
Component: engine
2016-11-06 07:40:39 -05:00
John Howard a017bc90a9 Don't set GOROOT in dockerfile.Windows
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: 3e75c5b68e8d311f4a29cca285560d2e49eae769
Component: engine
2016-11-05 21:14:12 -07:00
John Howard c6c5a0aaa0 Remove Windows CI stubs from hack/
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: d945441e23e8c7a5ccd541062da8e206264127fb
Component: engine
2016-11-05 21:01:06 -07:00
Yong Tang 8c052677e4 Update docs for the output of docker build (Step 1/...)
PR 24978 adds hint of of progress to the output of `docker build`
for 1.13, in the format of
```
Step 1/5 ...
...
Step 2/5 ...
...
```

Though some of the docs hasn't been updated.

This fix did a grep in docs and updated the related places.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
Upstream-commit: 7d529492cc8b902bbf2e1f293546e3b19134db1b
Component: engine
2016-11-05 19:05:19 -07:00
Harald Albers e3849dda91 Fix bash completion for docker inspect --type
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: d65934a8b85b961b95fcb1443f2191bef23df17b
Component: engine
2016-11-05 11:22:47 -07:00
Harald Albers f51ce2d41b Add bash completion for new prune commands
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: 8099280cd81bf1e6e0cbaf8a3ba728ec1ccb1d50
Component: engine
2016-11-05 10:39:33 -07:00
Harald Albers e6605af98d Add bash completion for docker system df
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: 09172051fc90c55bb06359b60918d15feb9aecc4
Component: engine
2016-11-05 10:12:35 -07:00
Harald Albers 4a58c855ef Add bash completion for docker {run,create} --cpus
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: 9268bbaeeaebe68a5ccd2f32277059e80aac2d8c
Component: engine
2016-11-05 09:59:55 -07:00
yupeng 705e095e8b Align arg with other cli
Signed-off-by: yupeng <yu.peng36@zte.com.cn>
Upstream-commit: c09277d5c336594fe384cf3ae5fc76eafdb80728
Component: engine
2016-11-05 13:47:02 +08:00
Dong Chen b91cea3478 Vendor libnetwork a98901aebe7ce920b6fbf02ebe5c3afc9ca975b8.
Signed-off-by: Dong Chen <dongluo.chen@docker.com>
Upstream-commit: aba4190612a2e4f0400e0e992de81aa382299f9b
Component: engine
2016-11-04 21:50:56 -07:00
Dong Chen 393d61cc88 dynamic service binding.
Signed-off-by: Dong Chen <dongluo.chen@docker.com>
Upstream-commit: ca81f6ee7c74a3bf27dc9b044742961f4ef78094
Component: engine
2016-11-04 21:50:56 -07:00
Yong Tang 0453189408 Follow up docs update for PR 27958
This fix is a follow up for any additional docs update for PR 27958.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
Upstream-commit: f82f8eeaf8bffffbea9a05fb061a3bf528432a78
Component: engine
2016-11-04 20:18:40 -07:00
Sebastiaan van Stijn d2784c37b9 Merge pull request #28085 from aaronlehmann/remove-comment
distribution: Remove misleading comment
Upstream-commit: c5ceb0f945d390500a0045b14ffe4dcecfe46a85
Component: engine
2016-11-04 19:57:57 -07:00