Commit graph

29797 commits

Author SHA1 Message Date
Arnaud Porterie
07489b8e79 Merge pull request #29090 from vieux/update_poule_config
update poule.yml
2016-12-02 15:06:26 -08:00
Sebastiaan van Stijn
ab56641ab5 Merge pull request #28964 from Microsoft/jjh/make
Windows: make.ps1 and dockerfile for native builds
2016-12-02 23:56:42 +01:00
Victor Vieux
d2920bb311 update poule.yml
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
2016-12-02 14:54:34 -08:00
Andrew Hsu
bfe5cab13b get rhel7.3 selinux-policy-devel pkg for centos-7
Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
2016-12-02 14:39:24 -08:00
Andrew Hsu
09e68fdd52 add extra docker.te lines from rhel7.3 docker.spec
Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
2016-12-02 14:18:58 -08:00
Yong Tang
8a226ed643 Add ID field for docker plugin ls
This fix tries to address the enhancement proposed in 28708 to display
ID field for the output of `docker plugin ls`.

This fix add `ID` field to the output of `docker plugin ls`

Related docs has been updated.

This fix fixes 28708.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
2016-12-02 13:42:50 -08:00
Alexander Morozov
0fb0d67008 Merge pull request #29075 from cpuguy83/29070_fix_tmpfs_opts
Fix issue where TmpfsOptions are not sent to swarm
2016-12-02 13:40:20 -08:00
Yong Tang
90bb2cdb9f Support plugins in docker inspect
This fix tries to address the proposal raised in 28946
to support plugins in `docker inspect`.

The command `docker inspect` already supports
"container", "image", "node", "network", "service", "volume", "task".
However, `--type plugin` is not supported yet at the moment.

This fix address this issue by adding the support of `--type plugin`
for `docker inspect`.

An additional integration test has been added to cover the changes.

This fix fixes 28946.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
2016-12-02 11:33:29 -08:00
Brian Goff
bed5a0bc2c Merge pull request #29077 from dnephin/fix-swagger-gen-validate
Fix swagger-gen validation
2016-12-02 14:08:46 -05:00
John Howard
155435b6ce Windows: make.ps1 and Dockerfile for native builds
Signed-off-by: John Howard <jhoward@microsoft.com>
2016-12-02 10:46:15 -08:00
Andrew Hsu
e0852bec96 add selinux policy for centos-7
This policy is from commit
583a67ffdf

Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
2016-12-02 10:26:00 -08:00
Brian Goff
fddb5a7f2a Merge pull request #29069 from vdemeester/29031-manpages-buildarg
Use DOCKER_BUILD_ARGS on manpages make target
2016-12-02 12:30:36 -05:00
Alexander Morozov
6e023ac748 Merge pull request #29039 from thaJeztah/fix-restart-limit-validation
Fix restartpolicy max-retry validation
2016-12-02 09:19:54 -08:00
Daniel Nephin
334366cdd9 Merge pull request #29071 from bfirsh/29045-use-singular-tag-names-in-swagger
Use singular tag names in swagger.yaml
2016-12-02 12:13:20 -05:00
Daniel Nephin
f247a99c6d Fix swagger-gen validation.
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2016-12-02 12:11:35 -05:00
Anusha Ragunathan
57ace38103 Merge pull request #28789 from yongtang/28735-plugin-inspect-id-or-name
Allow `docker plugin inspect` to search based on ID or name
2016-12-02 08:46:47 -08:00
Brian Goff
a5b3649bfa Fix issue where TmpfsOptions are not sent to swarm
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2016-12-02 11:43:47 -05:00
Vincent Demeester
1c69680641 Merge pull request #28738 from sathieu/debootstrap_errors
Improve error reporting in mkimage/debootstrap
2016-12-02 17:41:08 +01:00
Alexander Morozov
8895ee0b4d Merge pull request #29043 from duglin/Issue29014
Fix use of **/ in .dockerignore
2016-12-02 08:34:45 -08:00
Kenfe-Mickaël Laventure
2a3bbe571e Merge pull request #29066 from albers/completion-deploy
Add bash completion for experimental `docker deploy`
2016-12-02 07:54:42 -08:00
Kenfe-Mickaël Laventure
1603547700 Merge pull request #25851 from KingEmet/master
Add registry-specific credential helper support, take 2
2016-12-02 07:32:45 -08:00
Ben Firshman
30a9249e15
Use singular tag names in swagger.yaml
This is required to make the type generation put things in the
correct directory, but unfortunately makes the names in the
documentation menu look a bit crap.

I think the best solution would be to add a `x-display-name`
extension to tags to determine how the tags show up in the menu,
rather than it depend on the name of the tag. I shall do this in
a follow-up PR - for now, let's fix the breakage.

Fixes #29045

Signed-off-by: Ben Firshman <ben@firshman.co.uk>
2016-12-02 14:14:36 +00:00
Brian Goff
3d1383f834 Merge pull request #29046 from thaJeztah/pin-swagger-version
pin go-swagger 0.7.4
2016-12-02 08:41:21 -05:00
Vincent Demeester
58505ffdee
Use DOCKER_BUILD_ARGS on manpages make target
This make it more consistent with the other image builds and allow to
build manpages behind a proxy for example.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2016-12-02 14:20:30 +01:00
Vincent Demeester
6e0666e622
Revert "Fix dockerfile parser with empty line after escape"
This reverts commit 3e1b539e8d.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2016-12-02 14:15:55 +01:00
Harald Albers
10f567ec6a Add bash completion for experimental docker deploy
Signed-off-by: Harald Albers <github@albersweb.de>
2016-12-02 04:28:10 -08:00
Harald Albers
af84b7e441 Allow selective activation of experimental features in bash completion
Signed-off-by: Harald Albers <github@albersweb.de>
2016-12-02 04:28:10 -08:00
Doug Davis
376bb84c5c Fix use of **/ in .dockerignore
.dockerignore pattern of **/.foo incorrectly matched **/bar.foo
because **/.foo was getting converted into a .*\.foo regex
instead of (.*/)*\.foo

Closes #29014

Signed-off-by: Doug Davis <dug@us.ibm.com>
2016-12-02 03:58:54 -08:00
Arash Deshmeh
f1df2d5a2e Print checkpoint id when creating a checkpoint
Signed-off-by: Arash Deshmeh <adeshmeh@ca.ibm.com>
2016-12-01 23:30:14 -05:00
allencloud
9a1f7b6b0b add missing status code in api docs
Signed-off-by: allencloud <allen.sun@daocloud.io>
2016-12-02 11:24:45 +08:00
Yong Tang
c4d773cdfe Return error for incorrect argument of service update --publish-rm <TargetPort>
Currently `--publish-rm` only accepts `<TargetPort>` or `<TargetPort>[/Protocol]`
though there are some confusions.

Since `--publish-add` accepts `<PublishedPort>:<TargetPort>[/Protocol]`, some user
may provide `--publish-rm 80:80`. However, there is no error checking so the incorrect
provided argument is ignored silently.

This fix adds the check to make sure `--publish-rm` only accepts `<TargetPort>[/Protocol]`
and returns error if the format is invalid.

The `--publish-rm` itself may needs to be revisited to have a better UI/UX experience,
see discussions on:
https://github.com/docker/swarmkit/issues/1396
https://github.com/docker/docker/issues/25200#issuecomment-236213242
https://github.com/docker/docker/issues/25338#issuecomment-240787002

This fix is short term measure so that end users are not misled by the silently ignored error
of `--publish-rm`.

This fix is related to (but is not a complete fix):
https://github.com/docker/swarmkit/issues/1396

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
2016-12-01 17:46:53 -08:00
Sebastiaan van Stijn
9db5d649ae
Fix restartpolicy max-retry validation
the restart policy validation was moved from
the client to the daemon in 94e95e4711

As part of that change, retry-counts < 1
were marked as "invalid".

However, the default is 0 (unlimited), causing

    docker run -d --restart=on-failure nginx

To fail.

This changes the validation to only invalidate
retry-counts < 0.

A test was added, and other tests renamed
to allow running just these tests :)

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2016-12-02 02:39:16 +01:00
Sebastiaan van Stijn
ba20c3e65e
pin go-swagger 0.7.4
This pins the version of go-swagger used, because
the results generated by different versions
can differ quite a bit (tested between 0.7.2 - 0.7.4),
and can cause CI / validation to fail.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2016-12-02 01:36:46 +01:00
Aaron Lehmann
0e70d96a68 api: Hide UpdateStatus when it is not present
When UpdateStatus was not present, the empty values of the timestamps
would be present:

        "UpdateStatus": {
            "StartedAt": "0001-01-01T00:00:00Z",
            "CompletedAt": "0001-01-01T00:00:00Z"
        }

To fix this, make the timestamps pointers, so they can be set to nil
when they should not be shown.

Also make UpdateStatus itself a pointer, so an empty object does not
show up when there is no UpdateStatus.

Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
2016-12-01 15:08:41 -08:00
Justin Cormack
a756c1ac65 Merge pull request #28996 from Microsoft/jjh/sqlite-remove-windows
Windows: Factor out sqlite
2016-12-01 13:56:11 -08:00
Mathieu Parent
ee75c3fca2 Improve error reporting in mkimage/debootstrap
Signed-off-by: Mathieu Parent <math.parent@gmail.com>
2016-12-01 21:27:10 +01:00
Aaron Lehmann
0020398c74 Merge pull request #28997 from cyli/fix-flakey-test
Update the `TestSwarmLockUnlockCluster` test to be less flakey.
2016-12-01 11:32:30 -08:00
Yong Tang
0ce6e070f7 Allow docker plugin inspect to search based on ID or name
This fix tries to address the issue raised in discussion of
PR 28735 where it was not possible to manage plugin based on
plugin ID. Previously it was not possible to invoke
`docker plugin inspect` with a plugin ID (or ID prefix).

This fix updates the implementation of `docker plugin inspect`
so that it is possbile to search based on a plugin name, or a
plugin ID. A short format of plugin ID (prefix) is also possible,
as long as there is no ambiguity.

Previously the check of `docker plugin inspect` was mostly done
on the client side. This could potentially cause inconsistency
between API and CMD. This fix move all the checks to daemon side
so that API and CMD will be consistent.

An integration test has been added to cover the changes.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
2016-12-01 10:44:17 -08:00
Jake Sanders
07c4b4124b Add registry-specific credential helper support
Signed-off-by: Jake Sanders <jsand@google.com>
2016-12-01 10:29:00 -08:00
John Howard
3f6127b173 Windows: Factor out sqlite
Signed-off-by: John Howard <jhoward@microsoft.com>
2016-12-01 09:38:08 -08:00
Tõnis Tiigi
0a5cb187b4 Merge pull request #29015 from coolljt0725/fix_restore_panic
Fix docker restart panic on machine ungracefully shutdown
2016-12-01 08:38:02 -08:00
Sebastiaan van Stijn
3879ded936 Merge pull request #29026 from yuexiao-wang/fix-client-test
Optimize the log info for client test
2016-12-01 16:30:07 +01:00
yuexiao-wang
40b8ff6243 Optimize the log info for client test
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn>
2016-12-02 03:32:04 +08:00
Justin Cormack
a227ea62e6 Merge pull request #29027 from runcom/fix-jq
contrib: download-frozen-image-v2.sh requires jq
2016-12-01 06:26:59 -08:00
Justin Cormack
006e23c63a Merge pull request #29028 from yuexiao-wang/fix-func-name
Fix the inconsistent function name for client
2016-12-01 06:26:28 -08:00
yuexiao-wang
16233eb055 Fix the inconsistent function name for client
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn>
2016-12-02 04:18:02 +08:00
Antonio Murdaca
887bc48319
contrib: download-frozen-image-v2.sh requires jq
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
2016-12-01 12:40:58 +01:00
Sebastiaan van Stijn
c34efaeca0 Merge pull request #29025 from lixiaobing10051267/masterManUrl2
rectify several wrong URLs in branch of man
2016-12-01 12:33:35 +01:00
lixiaobing10051267
576780369f rectify several wrong URLs in branch of man
Signed-off-by: lixiaobing10051267 <li.xiaobing1@zte.com.cn>
2016-12-01 19:35:27 +08:00
Justin Cormack
31d4d9e996 Merge pull request #29019 from lixiaobing10051267/masterRunCOnfig
check testing code for runconfig and volume
2016-12-01 03:00:43 -08:00