343586bbdc
Fix volume plugin refecounting on daemon restart
...
Ensures all known volumes (known b/c they are persisted to disk) have
their volume drivers refcounted properly.
In testing this, I found an issue with `--live-restore` (required since
currently the provided volume plugin doesn't keep state on restart)
where restorted plugins did not have a plugin client loaded causing a
panic when trying to use the plugin.
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
Upstream-commit: 6ef1060cd0acb847e06db890abb335faa837a9e2
Component: engine
2016-12-16 10:14:06 -05:00
c9c422e83a
Merge pull request #29455 from andrewhsu/f23-eol
...
Remove fedora-23 because eol
Upstream-commit: e43566565887f58edf3b2eb1bf43ca9e6846bfc1
Component: engine
2016-12-16 12:40:26 +01:00
c0af0489e6
Merge pull request #29474 from yuexiao-wang/add-link-node
...
Add the whole related information for node
Upstream-commit: ddcb9996211fb0a2f33e35bc094a2fcfd12edf08
Component: engine
2016-12-16 11:26:16 +01:00
668e4bdf14
Add the whole related information for node
...
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn >
Upstream-commit: b67b0949ed4b528fef6c3dc059a4bd16d5f2a929
Component: engine
2016-12-16 22:21:52 +08:00
847dc629c8
Merge pull request #27938 from AkihiroSuda/ovlnw-27866
...
api: allow NW name that is the prefix of a swarm NW ID
Upstream-commit: 92e63977d9ed258c905ea5d073f9e04f631471f4
Component: engine
2016-12-16 10:40:46 +01:00
c936f080d2
Merge pull request #29462 from vieux/fix_devices_plugins
...
fix devices in plugins
Upstream-commit: e9d403ab365ce1930e38756bfbf31d1986447387
Component: engine
2016-12-16 08:03:15 +01:00
6675fa1137
Merge pull request #29302 from cpuguy83/graphdriver_plugin_use_propagated_mount
...
Make graphdriver plugin use plugin BasePath
Upstream-commit: a59625d912c5596f1ba0bf12cdaac227b5234614
Component: engine
2016-12-15 18:53:03 -08:00
eff605432a
fix devices in plugins
...
Signed-off-by: Victor Vieux <vieux@docker.com >
Upstream-commit: 6f00601c9fb7886547334f80a250bac5e226aad7
Component: engine
2016-12-15 15:35:53 -08:00
dd09f146eb
Merge pull request #29446 from ddingel/s390_slim_dockerfile
...
Dockerfile.s390x: Change base to debian jessie
Upstream-commit: 5e176022f4e48f818060689d3b085727bc26526f
Component: engine
2016-12-15 23:47:17 +01:00
529749c0f0
Merge pull request #29437 from yuexiao-wang/remove-unuse-slice
...
Remove unuse slice in registry
Upstream-commit: d52494252dd4f677c9e75c6540175d033da9dcb1
Component: engine
2016-12-15 22:23:01 +01:00
b70f98ab3e
Make graphdriver plugin use plugin BasePath
...
Also enables `PropagatedMount` for graphdrivers.
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
Upstream-commit: 500210475f6d841b2eacb42fb495e90108db2733
Component: engine
2016-12-15 16:22:13 -05:00
a0d7d8f97c
Merge pull request #29457 from tiborvass/poule_fix_docker_service
...
poule: do not treat "docker service" keyword as a swarm feature
Upstream-commit: 8899c62ecfe74f5d08ab35d137b254a6674f220b
Component: engine
2016-12-15 11:07:55 -08:00
9aea8838d5
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 >
Upstream-commit: 59ca288c890393214832938aaf48c476574a0346
Component: engine
2016-12-15 10:41:54 -08:00
29ad604435
remove fedora-23 because eol
...
Signed-off-by: Andrew Hsu <andrewhsu@docker.com >
Upstream-commit: ef98091a901cd9926d307ed622de088c90da2ef3
Component: engine
2016-12-15 09:44:34 -08:00
36b9fe6ae8
Remove unuse slice in registry
...
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn >
Upstream-commit: 3ed06f96706887e491f8acdb72c5704022504fa9
Component: engine
2016-12-16 00:51:10 +08:00
1f59facb6e
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 >
Upstream-commit: edfbc3b8767ab2e89e73ba3142d2ddad295001e9
Component: engine
2016-12-15 15:09:06 +00:00
fd62091f94
Merge pull request #29383 from yuexiao-wang/add-logs-link
...
Add the link for service logs
Upstream-commit: e9a69316b8245413eec9ac4fb8b2267883855b74
Component: engine
2016-12-15 13:23:18 +01:00
3baf7d2e75
Add the link for service logs
...
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn >
Upstream-commit: 54d38fe115e0183af7d862e54ba6e58c347e2a8d
Component: engine
2016-12-15 17:43:51 +08:00
64dd08bc1d
Dockerfile.s390x: Change base to debian jessie
...
With commit ee59f25c2d503cd68262679250387e140171c685 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 >
Upstream-commit: 1bd6836a4249210090ed99c4e281374e9e16e138
Component: engine
2016-12-15 10:40:33 +01:00
d40021472d
Merge pull request #29422 from unclejack/daemon_return_directly
...
daemon: return directly without ifs where possible
Upstream-commit: 6e6016f5813ab99293c0d96c664b4f74ff561a1b
Component: engine
2016-12-15 09:46:53 +01:00
15f4ce0b26
Merge pull request #29419 from trapier/reference_service_create_typo
...
fix typo in reference for service create
Upstream-commit: 31eea90f523e6033951176719594b7a477a17e74
Component: engine
2016-12-15 09:45:17 +01:00
058553376b
Merge pull request #29412 from albers/docs-network-create--attachable
...
Add docs for `docker network create --attachable`
Upstream-commit: aac75aca776597aa31fbbe2c078eb6bf0ffde58b
Component: engine
2016-12-15 09:44:20 +01:00
087a421c22
Merge pull request #29372 from tophj-ibm/fix-plugin-disable-error
...
[plugins] return err when failing remove
Upstream-commit: d0ab04ac1622cd7659e4853414b6c9daa116ffaa
Component: engine
2016-12-15 09:18:35 +01:00
7c00bda66d
Merge pull request #29365 from yongtang/29342-exec-user-after-restart
...
Fix `docker exec -u` issue after docker daemon restart
Upstream-commit: a60be6bfe38d70608bb389a14e3eb2357454099e
Component: engine
2016-12-15 09:16:17 +01:00
8ef71fe7c8
Merge pull request #29391 from lixiaobing10051267/masterTypeWin
...
fix some typos in libcontainer\types_windows.go
Upstream-commit: ec8b286dd347d8c71b2c62d3793d7276a6e2b16c
Component: engine
2016-12-15 13:26:58 +09:00
9883fe32f2
Merge pull request #29413 from albers/completion-deploy-experimental
...
Make bash completion for `docker stack deploy --bundle-file` available only in experimental mode
Upstream-commit: 9a30560fdaf1b86f58ae776d9578589752bbc5e5
Component: engine
2016-12-14 17:24:50 -08:00
7ced24be6f
Merge pull request #29156 from aaronlehmann/trusted-service-create
...
Content trust for swarm services
Upstream-commit: ba368baea123dc5a852fcb7b3f1f1ab1e4ad26b6
Component: engine
2016-12-14 16:04:50 -08:00
613c321d34
[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 >
Upstream-commit: fb11164c4f71315c96ddf3de46ff4689a5bac59c
Component: engine
2016-12-14 15:10:29 -06:00
62b7ace712
daemon: return directly without ifs where possible
...
Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com >
Upstream-commit: 3a42518042b36ad90950a3abf0aa125c0342b2c4
Component: engine
2016-12-14 22:36:58 +02:00
e09abd9511
Merge pull request #29366 from unclejack/pkg_return_directly
...
pkg: return directly without ifs where possible
Upstream-commit: 8415aeb39ae45e4414785f76ee63438ffc9517eb
Component: engine
2016-12-14 21:20:26 +01:00
91cbeaba53
fix typo in reference for service create
...
Signed-off-by: Trapier Marshall <trapier.marshall@docker.com >
Upstream-commit: 90c680ad259057d0065662a1a6fdad779bde6082
Component: engine
2016-12-14 14:56:55 -05:00
3159d1f79d
Merge pull request #29380 from vieux/skip_empty_network_plugin
...
skip empty networks in plugin install
Upstream-commit: 738769d23cc69f3185931a1e71b387d0ca09d71d
Component: engine
2016-12-14 11:53:42 -08:00
c5bc1e412f
integration-cli: Add integration tests for swarm services + content trust
...
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com >
Upstream-commit: 62cd3b39f901d14f984f1176ef0844918c145d21
Component: engine
2016-12-14 10:50:23 -08:00
8bf34c7522
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 >
Upstream-commit: d4d6f8c0d0c6cd0ba6dc96ab7a9ed07e1e766074
Component: engine
2016-12-14 10:49:33 -08:00
87aafbf002
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 >
Upstream-commit: 4b8c79f25ee00ca5dfe22271c166938009bda976
Component: engine
2016-12-14 10:49:32 -08:00
eaf703fbda
Merge pull request #29387 from vicamo/add-debian-security-updates-when-available
...
mkimage: add debian security updates source when available
Upstream-commit: b6f870a27816a90517f43b828d6a7d99303fe824
Component: engine
2016-12-14 09:54:50 -08:00
e2664ec347
Merge pull request #28943 from vdemeester/publish-long-short-syntax
...
Remove --port and update --publish for services to support syntaxes
Upstream-commit: 2fe62f2395b966af7f38e442a91c75d042bb3b65
Component: engine
2016-12-14 17:55:48 +01:00
5a6d6a9103
Make bash completion for docker stack deploy --bundle-file experimental
...
Signed-off-by: Harald Albers <github@albersweb.de >
Upstream-commit: a53bdfa3be6a821b5093919c55f6995e1df35680
Component: engine
2016-12-14 08:52:07 -08:00
e1cfecec53
Add docs for docker network create --attachable
...
Signed-off-by: Harald Albers <github@albersweb.de >
Upstream-commit: 7433d3acf61142bb1abbf7928ff0e20acf3eda56
Component: engine
2016-12-14 08:39:10 -08:00
53db845317
mkimage: add debian security updates source when available
...
Signed-off-by: You-Sheng Yang (楊有勝) <vicamo@gmail.com >
Upstream-commit: e2e5d4bc9da5ba17bb2822909611f8300fdd80f0
Component: engine
2016-12-14 23:23:00 +08:00
6abf315fff
Merge pull request #29382 from yuexiao-wang/fix-wait-man
...
Update the manual for docker wait
Upstream-commit: 2333af9e594560528419174fbd345265019c5e12
Component: engine
2016-12-14 15:29:33 +01:00
4734e1c8cf
Merge pull request #29401 from bfirsh/add-swagger-display-name
...
Add display name for tags in swagger.yaml
Upstream-commit: 1474a451b14fb164a20de7f64a07ab7c0e526a36
Component: engine
2016-12-14 15:28:22 +01:00
752649946b
Merge pull request #29078 from bfirsh/add-swagger-docs
...
Add make command for previewing API docs
Upstream-commit: c856c0c77752d347c52e4fb7386c53ff26c7db13
Component: engine
2016-12-14 08:42:35 -05:00
e56158d95b
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 >
Upstream-commit: 27ca33e965b78df4d0e7be5597c2f48d9286775f
Component: engine
2016-12-14 12:27:32 +00:00
7025bc9a7b
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 >
Upstream-commit: 0caa6c218c89147b2d61a1bbb87c48ad16495a11
Component: engine
2016-12-14 12:00:04 +00:00
a3abb2b59e
Update the manual for docker wait
...
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn >
Upstream-commit: 303ff807f2690c1f572439bb5bc53a9ba89bf48f
Component: engine
2016-12-14 18:22:59 +08:00
c493517769
fix some typos in libcontainer\types_windows.go
...
Signed-off-by: lixiaobing10051267 <li.xiaobing1@zte.com.cn >
Upstream-commit: f385846d6ff48c17b7fc8173b8370df17c76ad40
Component: engine
2016-12-14 16:33:03 +08:00
4bd3e0fe3d
Fix docker exec -u issue after docker daemon restart
...
This fix tries to address the issue raised in 29342 where
`docker exec -u` after docker daemon restart returns an error:
```
unable to find user test: no matching entries in passwd file
```
The reason was that `container.BaseFS` is not present after restart.
This fix adds the `daemon.Mount` during the restore to bring up the
`container.BaseFS`.
An integration test has been added to cover the changes.
This fix fixes 29342.
Signed-off-by: Yong Tang <yong.tang.github@outlook.com >
Upstream-commit: 7feb2a17e4b9d1a5305a8a44004e916b79cbdd97
Component: engine
2016-12-13 22:36:30 -08:00
b35ecdcd72
Merge pull request #29374 from mavenugo/exp
...
Add the missing experimental ipvlan network driver
Upstream-commit: 98fef1cb0b22b8dca2f88d637e01cf0a5df94798
Component: engine
2016-12-13 20:03:24 -08:00
f541c344f4
Merge pull request #29008 from cpuguy83/refcount_graphdriver
...
Refcount graphdriver plugins properly
Upstream-commit: af50cefe6cdf07e2028b9ad934a2cb5818a935eb
Component: engine
2016-12-13 19:24:46 -08:00
