Commit graph

29914 commits

Author SHA1 Message Date
Sebastiaan van Stijn
92e63977d9 Merge pull request #27938 from AkihiroSuda/ovlnw-27866
api: allow NW name that is the prefix of a swarm NW ID
2016-12-16 10:40:46 +01:00
yuexiao-wang
082f4919ca Fix inconsistency for pause and unpause
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn>
2016-12-16 17:27:28 +08:00
Vincent Demeester
e9d403ab36 Merge pull request #29462 from vieux/fix_devices_plugins
fix devices in plugins
2016-12-16 08:03:15 +01:00
lixiaobing10051267
e5ada578c3 rectify function and variable referred in pkg/archive/changes_linux.go
Signed-off-by: lixiaobing10051267 <li.xiaobing1@zte.com.cn>

Signed-off-by: lixiaobing10051267 <li.xiaobing1@zte.com.cn>
2016-12-16 14:58:47 +08:00
Akihiro Suda
eb11a10ddf update experimental/README.md
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
2016-12-16 04:03:02 +00:00
Victor Vieux
a59625d912 Merge pull request #29302 from cpuguy83/graphdriver_plugin_use_propagated_mount
Make graphdriver plugin use plugin BasePath
2016-12-15 18:53:03 -08:00
Yong Tang
3003ae1d8b Allow containers to continue even if mount failed after live restore
This fix is a follow up to #29365. In #29365 a bug was fixed for
`docker exec -u user` after live restore by remounting.
However, #29365 will prevent containers from restored if mount failed.

In this fix, containers will be restored even if mount in that step failed.
Some functionalities might be missing (like `docker exec -u user`) but
at least it is possible to do certain operations like stop/restart/delete.

This fix is related to #29365.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
2016-12-15 15:48:14 -08:00
Victor Vieux
6f00601c9f fix devices in plugins
Signed-off-by: Victor Vieux <vieux@docker.com>
2016-12-15 15:35:53 -08:00
Sebastiaan van Stijn
5e176022f4 Merge pull request #29446 from ddingel/s390_slim_dockerfile
Dockerfile.s390x: Change base to debian jessie
2016-12-15 23:47:17 +01:00
Sebastiaan van Stijn
d52494252d Merge pull request #29437 from yuexiao-wang/remove-unuse-slice
Remove unuse slice in registry
2016-12-15 22:23:01 +01:00
Brian Goff
500210475f Make graphdriver plugin use plugin BasePath
Also enables `PropagatedMount` for graphdrivers.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2016-12-15 16:22:13 -05:00
Tibor Vass
8899c62ecf Merge pull request #29457 from tiborvass/poule_fix_docker_service
poule: do not treat "docker service" keyword as a swarm feature
2016-12-15 11:07:55 -08:00
Tibor Vass
59ca288c89 poule: do not treat "docker service" keyword as a swarm feature
"docker service" can also refer to an init system's service named docker
This would prevent labeling e.g. systemd related issues to swarm.

Signed-off-by: Tibor Vass <tibor@docker.com>
2016-12-15 10:41:54 -08:00
Andrew Hsu
ef98091a90 remove fedora-23 because eol
Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
2016-12-15 09:44:34 -08:00
yuexiao-wang
3ed06f9670 Remove unuse slice in registry
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn>
2016-12-16 00:51:10 +08:00
Akihiro Suda
edfbc3b876 api: allow creating a network of which name is the prefix of the ID of a swarm network
Previously, it doesn't allow creating such a network:

e.g.

    $ docker network inspect -f '{{.Id}}' ingress
    84xh9knigj6zyt00u31e26nj3
    $ docker network create 84
    Error response from daemon: network with name 84 already exists

Fix #27866

Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
2016-12-15 15:09:06 +00:00
Sebastiaan van Stijn
e9a69316b8 Merge pull request #29383 from yuexiao-wang/add-logs-link
Add the link for service logs
2016-12-15 13:23:18 +01:00
yuexiao-wang
54d38fe115 Add the link for service logs
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn>
2016-12-15 17:43:51 +08:00
Dominik Dingel
1bd6836a42 Dockerfile.s390x: Change base to debian jessie
With commit ee59f25c2d we changed from
gcc-go to golang 1.7. By switching to debian we can reduce the base
layer from 1.4 GB to around 130 MB.

Signed-off-by: Dominik Dingel <dingel@linux.vnet.ibm.com>
2016-12-15 10:40:33 +01:00
Vincent Demeester
6e6016f581 Merge pull request #29422 from unclejack/daemon_return_directly
daemon: return directly without ifs where possible
2016-12-15 09:46:53 +01:00
Vincent Demeester
31eea90f52 Merge pull request #29419 from trapier/reference_service_create_typo
fix typo in reference for service create
2016-12-15 09:45:17 +01:00
Vincent Demeester
aac75aca77 Merge pull request #29412 from albers/docs-network-create--attachable
Add docs for `docker network create --attachable`
2016-12-15 09:44:20 +01:00
Vincent Demeester
d0ab04ac16 Merge pull request #29372 from tophj-ibm/fix-plugin-disable-error
[plugins] return err when failing remove
2016-12-15 09:18:35 +01:00
Vincent Demeester
a60be6bfe3 Merge pull request #29365 from yongtang/29342-exec-user-after-restart
Fix `docker exec -u` issue after docker daemon restart
2016-12-15 09:16:17 +01:00
Akihiro Suda
ec8b286dd3 Merge pull request #29391 from lixiaobing10051267/masterTypeWin
fix some typos in libcontainer\types_windows.go
2016-12-15 13:26:58 +09:00
Victor Vieux
9a30560fda Merge pull request #29413 from albers/completion-deploy-experimental
Make bash completion for `docker stack deploy --bundle-file` available only in experimental mode
2016-12-14 17:24:50 -08:00
Aaron Lehmann
2a97ea9a6e Publish installed v2 plugins to manager
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
2016-12-14 17:02:56 -08:00
Aaron Lehmann
423ba6f223 Revendor swarmkit
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
2016-12-14 17:02:48 -08:00
Tibor Vass
ba368baea1 Merge pull request #29156 from aaronlehmann/trusted-service-create
Content trust for swarm services
2016-12-14 16:04:50 -08:00
unclejack
2c187a24e0 return directly without ifs in remaining packages
Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com>
2016-12-14 23:28:27 +02:00
Christopher Jones
fb11164c4f
[plugins] return err when failing remove
Fixes a case where removing the plugin from disk would
fail silently. Also moves pluginStore remove after we
remove from disk, so 'docker plugin ls' doesn't isn't
empty in case it errors out.

Signed-off-by: Christopher Jones <tophj@linux.vnet.ibm.com>
2016-12-14 15:10:29 -06:00
unclejack
3a42518042 daemon: return directly without ifs where possible
Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com>
2016-12-14 22:36:58 +02:00
Phil Estes
8415aeb39a Merge pull request #29366 from unclejack/pkg_return_directly
pkg: return directly without ifs where possible
2016-12-14 21:20:26 +01:00
Trapier Marshall
90c680ad25 fix typo in reference for service create
Signed-off-by: Trapier Marshall <trapier.marshall@docker.com>
2016-12-14 14:56:55 -05:00
Anusha Ragunathan
738769d23c Merge pull request #29380 from vieux/skip_empty_network_plugin
skip empty networks in plugin install
2016-12-14 11:53:42 -08:00
Aaron Lehmann
62cd3b39f9 integration-cli: Add integration tests for swarm services + content trust
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
2016-12-14 10:50:23 -08:00
Aaron Lehmann
d4d6f8c0d0 cli: Pin image to digest using content trust
Implement notary-based digest lookup in the client when
DOCKER_CONTENT_TRUST=1.

Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
2016-12-14 10:49:33 -08:00
Aaron Lehmann
4b8c79f25e cli: Split out GetNotaryRepository and associated functions
Split these into cli/trust so that other commands can make use of them.

Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
2016-12-14 10:49:32 -08:00
Kenfe-Mickaël Laventure
b6f870a278 Merge pull request #29387 from vicamo/add-debian-security-updates-when-available
mkimage: add debian security updates source when available
2016-12-14 09:54:50 -08:00
Sebastiaan van Stijn
2fe62f2395 Merge pull request #28943 from vdemeester/publish-long-short-syntax
Remove --port and update --publish for services to support syntaxes
2016-12-14 17:55:48 +01:00
Harald Albers
a53bdfa3be Make bash completion for docker stack deploy --bundle-file experimental
Signed-off-by: Harald Albers <github@albersweb.de>
2016-12-14 08:52:07 -08:00
Harald Albers
7433d3acf6 Add docs for docker network create --attachable
Signed-off-by: Harald Albers <github@albersweb.de>
2016-12-14 08:39:10 -08:00
You-Sheng Yang (楊有勝)
e2e5d4bc9d mkimage: add debian security updates source when available
Signed-off-by: You-Sheng Yang (楊有勝) <vicamo@gmail.com>
2016-12-14 23:23:00 +08:00
Sebastiaan van Stijn
2333af9e59 Merge pull request #29382 from yuexiao-wang/fix-wait-man
Update the manual for docker wait
2016-12-14 15:29:33 +01:00
Vincent Demeester
1474a451b1 Merge pull request #29401 from bfirsh/add-swagger-display-name
Add display name for tags in swagger.yaml
2016-12-14 15:28:22 +01:00
Brian Goff
c856c0c777 Merge pull request #29078 from bfirsh/add-swagger-docs
Add make command for previewing API docs
2016-12-14 08:42:35 -05:00
Ben Firshman
27ca33e965
Add make command for previewing API docs
Much easier than the previous method of copying over to the docs
repository and generating the docs.

And, as @cpuguy83 pointed out, that actually didn't work
because the PR that adds Swagger docs isn't merged yet. Oopsy.

Signed-off-by: Ben Firshman <ben@firshman.co.uk>
2016-12-14 12:27:32 +00:00
Ben Firshman
0caa6c218c
Add display name for tags in swagger.yaml
In #29071, we made the tags the correct name for generating types,
at the expense of the menu in the documentation looking good.

ReDoc now has support for tag display names
( https://github.com/Rebilly/ReDoc/pull/152 ), so we can assign
a more human-friendly name to the menu items.

Signed-off-by: Ben Firshman <ben@firshman.co.uk>
2016-12-14 12:00:04 +00:00
yuexiao-wang
303ff807f2 Update the manual for docker wait
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn>
2016-12-14 18:22:59 +08:00
Vincent Demeester
cf2ea76138
Remove some fmt.Printf from integration-cli/daemon…
… to flood a little bit less the integration cli output. Now use any
testing framework that has a LogF function.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2016-12-14 10:52:51 +01:00