Commit graph

28607 commits

Author SHA1 Message Date
Vincent Demeester
acf7ce1aa0
Remove use of pkg/integration in pkg/idtools
This remove a dependency on `go-check` (and more) when using
`pkg/idtools`. `pkg/integration` should never be called from any other
package then `integration`.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2016-11-08 17:21:02 +01:00
Akihiro Suda
189727581b Merge pull request #28158 from lixiaobing10051267/masterMakeSum
fix using wrong function name for MakeTarSumContext
2016-11-08 22:37:23 +09:00
Akihiro Suda
cbc511720a Merge pull request #28157 from yuexiao-wang/update-checkpoint
Update for docker checkpoint
2016-11-08 22:36:22 +09:00
Sebastiaan van Stijn
14a06cbb29 Merge pull request #28143 from icecrime/poule
Add poule.yml
2016-11-08 13:09:09 +01:00
Vincent Demeester
ec22164358 Merge pull request #28153 from YuPengZTE/devCtx
context.Context should be the first parameter of a function
2016-11-08 12:40:32 +01:00
Vincent Demeester
2fa63c90de Merge pull request #28144 from yongtang/11072016-swarmkit-update
Revendor swarmkit to 29950a4e9912178cadb72abc5a445e3a857cb2b0
2016-11-08 12:39:03 +01:00
Vincent Demeester
d46c7109b5 Merge pull request #27888 from sdurrheimer/zsh-completion-container-subcommand
Add zsh completion for new 'docker container' subcommands
2016-11-08 11:24:28 +01:00
Vincent Demeester
9075aa4ddd Merge pull request #28038 from bfirsh/add-validate-swagger
Validation for swagger.yaml
2016-11-08 10:57:01 +01:00
lixiaobing10051267
71f144648a fix using wrong function name for MakeTarSumContext
Signed-off-by: lixiaobing10051267 <li.xiaobing1@zte.com.cn>
2016-11-08 17:16:13 +08:00
yuexiao-wang
90ce77e46a Update for docker checkpoint
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn>
2016-11-08 16:56:29 +08:00
Sebastiaan van Stijn
f5283bd253 Merge pull request #28117 from ping035627/ping035627-patch-1107
Modify to improve code readability
2016-11-08 09:44:45 +01:00
Sebastiaan van Stijn
c48c44371b Merge pull request #28156 from albers/completion-service-create--tty
Add bash completion for `docker service {create,update} --tty`
2016-11-08 09:35:17 +01:00
Harald Albers
bfd8f7a7e1 Add bash completion for docker service {create,update} --tty
Signed-off-by: Harald Albers <github@albersweb.de>
2016-11-08 09:13:23 +01:00
yupeng
4b86bd050b context.Context should be the first parameter of a function
Signed-off-by: yupeng <yu.peng36@zte.com.cn>
2016-11-08 14:51:17 +08:00
Daniel Nephin
69efb4652c Merge pull request #28076 from yongtang/25644-docker-service-tty
Add `--tty` to `docker service create/update`
2016-11-07 22:15:27 -05:00
Arnaud Porterie (icecrime)
7cb1fad4a5
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>
2016-11-07 19:06:35 -08:00
Akihiro Suda
8937b35936 Merge pull request #28132 from johnstep/win2lin
TestRunDuplicateMount requires the same host
2016-11-08 11:32:39 +09:00
Yong Tang
f0e2eb24cf 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>
2016-11-07 17:57:20 -08:00
Victor Vieux
03da822ee9 Merge pull request #27923 from vieux/plugin_set_gogogo
support env for docker plugin set
2016-11-07 17:07:14 -08:00
Victor Vieux
efbed4500e support env for docker plugin set
Signed-off-by: Victor Vieux <vieux@docker.com>
2016-11-07 16:59:29 -08:00
Victor Vieux
8442db9830 Merge pull request #27993 from thaJeztah/add-yakkety-yak
Add Ubuntu 16.10 Yakkety Yak
2016-11-07 16:47:12 -08:00
Tibor Vass
109c26bd74 Merge pull request #28056 from LK4D4/solaris_me
Add functional support for Docker sub commands on Solaris
2016-11-07 16:46:18 -08:00
Yong Tang
599be5a551 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>
2016-11-07 16:42:32 -08:00
WangPing
2bfd1495de 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>
2016-11-08 08:37:44 +08:00
Michael Crosby
05b249e70f Merge pull request #28118 from runcom/fix-secopts-types
Fix secopts types
2016-11-07 16:32:21 -08:00
Tõnis Tiigi
67b0311c8c Merge pull request #27615 from darrenstahlmsft/ExecCloseAsync
Asynchronously close streams to prevent holding container lock
2016-11-07 16:16:21 -08:00
Misty Stanley-Jones
c16860b649 Merge pull request #28029 from tealtail/27994-add-service-ls-truncate-opt
remove COMMAND column from `service ls` output. closes #27994
2016-11-07 14:39:16 -08:00
Ben Firshman
5c4abd107a
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>
2016-11-07 11:03:21 -08:00
Ben Firshman
e5e1c7feef
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>
2016-11-07 11:03:10 -08:00
Ben Firshman
cd0c0d0666
Add logo to swagger.yaml
Signed-off-by: Ben Firshman <ben@firshman.co.uk>
2016-11-07 11:03:09 -08:00
Aaron Lehmann
c1cdfe78f6 Merge pull request #25974 from kunalkushwaha/mount-add
correct handling of volumes while service update.
2016-11-07 10:34:22 -08:00
John Stephens
bc87ec3815 TestRunDuplicateMount requires the same host
Signed-off-by: John Stephens <johnstep@docker.com>
2016-11-07 10:19:06 -08:00
Amit Krishnan
934328d8ea 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>
2016-11-07 09:06:34 -08:00
Vincent Demeester
89ef0f2151 Merge pull request #25983 from jhorwit2/jah/ps-refactor
Add -a option to service/node ps
2016-11-07 17:33:10 +01:00
Sebastiaan van Stijn
27beb64d46
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>
2016-11-07 15:14:36 +01:00
Brian Goff
e00e7e9582 Merge pull request #28059 from lixiaobing10051267/masterDockerInfo
Rectify Images display information for docker 1.10.3
2016-11-07 09:05:34 -05:00
Madhu Venugopal
bee2beeaad Merge pull request #27279 from dongluochen/lbapi_integration
Support health aware load balancing
2016-11-07 02:42:51 -08:00
Antonio Murdaca
42a1f7cdf9
client: bump default version to v1.25
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
2016-11-07 10:01:28 +01:00
Antonio Murdaca
667315576f
api: add Info struct for v1.24
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
2016-11-07 10:01:14 +01:00
Akihiro Suda
b34b29e237 Merge pull request #28104 from Microsoft/jjh/nogoroot
Don't set GOROOT in dockerfile.Windows
2016-11-07 17:37:21 +09:00
Akihiro Suda
de78ed432b Merge pull request #28093 from albers/completion-run--cpus
Add bash completion for `docker {run,create} --cpus`
2016-11-07 17:31:40 +09:00
Akihiro Suda
67a247154c Merge pull request #28094 from albers/completion-system-df
Add bash completion for `docker system df`
2016-11-07 17:31:27 +09:00
Vincent Demeester
afb1119c85 Merge pull request #28096 from albers/completion-prune
Add bash completion for new prune commands
2016-11-07 09:30:56 +01:00
Vincent Demeester
d049c6f8a1 Merge pull request #28097 from albers/completion-fix-inspect--type
Fix bash completion for `docker inspect --type`
2016-11-07 09:30:04 +01:00
Vincent Demeester
5b2cedf11e Merge pull request #28102 from yongtang/11052016-docs-build-Step
Update docs for the output of `docker build` (Step 1/...)
2016-11-07 09:28:08 +01:00
Vincent Demeester
b8140249b4 Merge pull request #28075 from yongtang/27958-docs-follow-up
Follow up docs update for PR #27958
2016-11-07 09:21:40 +01:00
Vincent Demeester
325eaa7ba4 Merge pull request #28065 from lixiaobing10051267/masterServerEror
add error information to distinguish different test scene
2016-11-07 09:16:16 +01:00
Vincent Demeester
6e0893f304 Merge pull request #28020 from YuPengZTE/devArg
Align arg with other cli
2016-11-07 08:58:51 +01:00
Daniel Nephin
9c8e1c3c06 Merge pull request #28103 from Microsoft/jjh/removevalidatestubs
Remove Windows CI stubs from hack/
2016-11-06 19:39:18 -05:00
Alicia Lauerman
6ad95c4dad remove COMMAND column from service ls output. closes #27994
Signed-off-by: Alicia Lauerman <alicia@eta.im>
2016-11-06 13:32:44 -05:00