0ce7aa426e
Vendor swarmkit in master
...
Also, update libnetwork and grpc.
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com >
Upstream-commit: 12a4ed03178982fec44b75479c3e63a316503d90
Component: engine
2016-10-20 13:49:22 -07:00
56af301200
Merge pull request #27287 from mavenugo/pluginv2-sk2
...
Allow multiple handlers to support network plugins in swarm-mode
Upstream-commit: 2c620d0aa24c5f774a9115449a86b158b005bba8
Component: engine
2016-10-20 13:43:04 -07:00
63025d814f
Merge pull request #27560 from mstanleyjones/sync_docs_master
...
Sync docker/docker refs with files mistakenly edited in docker.github.io repo
Upstream-commit: 790629c02168f712884f181a9392df36de7abc20
Component: engine
2016-10-20 13:42:40 -07:00
2f7fc91dd4
Merge pull request #27470 from runcom/expose-exec-pid
...
record pid of exec'd process
Upstream-commit: 13fd75c3dd18e6d57b6b28097fd7e0d0989c1b9e
Component: engine
2016-10-20 21:36:21 +02:00
1943bac573
Merge pull request #22337 from allencloud/support-insecure-registry-config-reload
...
support insecure registry in configuration reload
Upstream-commit: c18fbc945514f32379ac2638c3f4fff67e9aa040
Component: engine
2016-10-20 11:41:23 -07:00
b2f3f16f09
Sync docker/docker refs with files mistakenly edited in docker.github.io repo
...
Signed-off-by: Misty Stanley-Jones <misty@docker.com >
Upstream-commit: 3b36f02c03ec050aa46f9a01cd2d6c60ffd93652
Component: engine
2016-10-20 10:51:30 -07:00
0a853bdac1
Merge pull request #27556 from LK4D4/unify_install
...
project: unify way of installing runc and containerd
Upstream-commit: ffa0446e8b8a190cb42f6ff6d54acb8d65995e49
Component: engine
2016-10-20 10:13:40 -07:00
f52344ca81
Merge pull request #27516 from allencloud/change-remove-multi-nodes
...
make every node and plugin removal call api
Upstream-commit: a67a9773055b757b8b5b7b6937a6983d023688bf
Component: engine
2016-10-20 10:10:52 -07:00
0c230bcf48
Merge pull request #27327 from flixr/deb_armhf_ubuntu-trusty_buildtags
...
debian package: update buildtags for armhf ubuntu-trusty
Upstream-commit: 6698a66be705039f44688d4476f5016145184259
Component: engine
2016-10-20 09:52:43 -07:00
5391fe7296
change created description in api change
...
Signed-off-by: allencloud <allen.sun@daocloud.io >
Upstream-commit: c37d6bf2a08c9ae05ebf16522b33b95d389642c1
Component: engine
2016-10-21 00:10:16 +08:00
e50d97d8c8
project: unify way of installing runc and containerd
...
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
Upstream-commit: 179479c6cdf44a2fd3d4ba2ce5dc176bc22ca9bf
Component: engine
2016-10-20 08:50:02 -07:00
dd35c23542
record pid of exec'd process
...
Signed-off-by: Antonio Murdaca <runcom@redhat.com >
Upstream-commit: 18083481361a4053d1081a201120a916239fc0ed
Component: engine
2016-10-20 17:06:11 +02:00
774705a707
Merge pull request #27514 from crosbymichael/update-init-oct18
...
Update docker-init to 74341e923bdf06cfb6b70cf54089
Upstream-commit: a4125e2265ef8994e666af667e64b9a9a4133c73
Component: engine
2016-10-20 16:58:26 +02:00
0c6f5e2158
Merge pull request #27535 from YuPengZTE/dev
...
Fix the typo of URLs
Upstream-commit: f529f2a0d527209bcf4bcded98057c5ae04b7256
Component: engine
2016-10-20 16:51:50 +02:00
31b0e9e411
Merge pull request #27465 from anusha-ragunathan/plugins_APIVer
...
Add plugin API version.
Upstream-commit: e174a4358dd05f9ef6193912cd6a296ae2ba61b6
Component: engine
2016-10-20 16:48:26 +02:00
50b0849c18
Merge pull request #26671 from yongtang/25545-docker-volume-inspect-volume-options
...
Show volume options for `docker volume inspect`
Upstream-commit: 78624ec81a3df2fd95df1a2902c5bc1fa9db0cd7
Component: engine
2016-10-20 16:10:23 +02:00
6b3066953c
Show volume options for docker volume inspect
...
This fix tries to address the issue raised in 25545 where
volume options at the creation time is not showed up
in `docker volume inspect`.
This fix adds the field `Options` in `Volume` type and
persist the options in volume db so that `volume inspect`
could display the options.
This fix adds a couple of test cases to cover the changes.
This fix fixes 25545.
Signed-off-by: Yong Tang <yong.tang.github@outlook.com >
Upstream-commit: 9ce8aac55e6df65bbf49c682374871a94d379bf3
Component: engine
2016-10-20 05:14:27 -07:00
54cf8aade9
Merge pull request #27558 from LK4D4/update_go
...
project: update Go to 1.7.3
Upstream-commit: 11d52b085c58965a4c85b3f06bfa3d445f9dc398
Component: engine
2016-10-20 14:13:41 +02:00
7fbcf96052
Merge pull request #24594 from jwendell/24355
...
Exec: Add ability to set environment variables
Upstream-commit: 1b677816f50d09650044a7dbda3807bddffdad8d
Component: engine
2016-10-20 13:26:48 +02:00
76d3fdc69b
Merge pull request #27451 from vincentbernat/fix/zsh-complete-empty
...
zsh: fix completion when docker output only has the header line
Upstream-commit: f6e9f71e706d0c456977a0a29a65ce52f63c49f9
Component: engine
2016-10-19 23:34:16 -07:00
64bb155742
Merge pull request #27534 from yuexiao-wang/fix-link-image-repo
...
Update the link for sharing images via repositories
Upstream-commit: adaea58b205e8499c09b6ff35a912fd085ac890f
Component: engine
2016-10-19 20:37:22 -07:00
686178dec7
Merge pull request #27542 from albers/completion-comments
...
Improve comments in bash completion
Upstream-commit: 5023d3aa7ae3fa76ee0679f5633a57259beb3b47
Component: engine
2016-10-19 20:36:40 -07:00
146d61be30
support insecure registry in configuration reload
...
Signed-off-by: allencloud <allen.sun@daocloud.io >
Upstream-commit: 582803f00addb597efbfc64a5143f2f848b76ae6
Component: engine
2016-10-20 07:54:31 +08:00
5d03410dc2
project: update Go to 1.7.3
...
List of milestone issues https://github.com/golang/go/issues?q=milestone%3AGo1.7.3
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
Upstream-commit: 7d8831c0914b8016daee5c0b90496b581d61522d
Component: engine
2016-10-19 13:55:01 -07:00
4fa4bc496e
Update the link for sharing images via repositories
...
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn >
Upstream-commit: e1c849cc576cf2ee62fb91548aafb74f1a017d2c
Component: engine
2016-10-20 01:39:41 +08:00
5d48ce28d0
Merge pull request #26983 from aaronlehmann/logrus-wrapped-errors
...
Fix problems with wrapped errors in logrus
Upstream-commit: 9f30c28d2176b2822b7e66e4b0f462bb6a2cbe36
Component: engine
2016-10-19 10:16:01 -07:00
f4d76afea5
Add bash completion for dockerd --shutdown-timeout
...
Signed-off-by: Harald Albers <github@albersweb.de >
Upstream-commit: c24c1bd87f7e188012705b4d95c1f66ace59f44d
Component: engine
2016-10-19 18:59:01 +02:00
5af5baf527
Merge pull request #27438 from yuexiao-wang/update-volume
...
Update the link for understand data volumes
Upstream-commit: 2bf4a39161d0280066459d1059afbeb20e4eec8d
Component: engine
2016-10-19 09:56:05 -07:00
74ef1fda6a
Update the link for understand data volumes
...
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn >
Upstream-commit: b1c2d425e167e6f939a192c87a7a40f449f07e32
Component: engine
2016-10-20 01:25:59 +08:00
f6f92180d7
Merge pull request #23036 from yongtang/22471-daemon-shutdown-timeout-daemon
...
Add config parameter to change stop timeout during daemon shutdown
Upstream-commit: 4a4f028c47046d9b166d35c631ae794000385b70
Component: engine
2016-10-19 18:47:50 +02:00
bf1e1cd730
Exec: Add ability to set environment variables
...
Keeping the current behavior for exec, i.e., inheriting
variables from main process. New variables will be added
to current ones. If there's already a variable with that
name it will be overwritten.
Example of usage: docker exec -it -e TERM=vt100 <container> top
Closes #24355 .
Signed-off-by: Jonh Wendell <jonh.wendell@redhat.com >
Upstream-commit: e03bf1221ee2c863f25a57af4d415e2d8ff4f26c
Component: engine
2016-10-19 12:39:25 -02:00
e4a5c6f7fb
Merge pull request #26965 from Microsoft/jjh/rootpath
...
Windows: Set correct root path logic
Upstream-commit: 15fb3fd9da06c73c4efd88140f6fc12130f361a9
Component: engine
2016-10-19 15:50:37 +02:00
aaf05c1203
Merge pull request #27387 from talex5/health-restart
...
Reset health status to starting when a container is restarted
Upstream-commit: 7a4d286ddd78aff567c21bdd0a54d7765488ca64
Component: engine
2016-10-19 15:48:59 +02:00
6553369753
Merge pull request #26130 from AkihiroSuda/networkcreationtime
...
add creation timestamp to `docker network inspect`
Upstream-commit: f279c11a7724abbec80a4cb215dccaeebe13edae
Component: engine
2016-10-19 15:48:29 +02:00
d54e2cee24
Improve comments in bash completion
...
Signed-off-by: Harald Albers <github@albersweb.de >
Upstream-commit: b0987b799ea6da792a10f8a6b065b3d7a92b0cb7
Component: engine
2016-10-19 15:35:56 +02:00
28791e5b60
Merge pull request #27316 from albers/completion-plugins
...
Align bash completion of plugins to completion of nodes and services
Upstream-commit: ff43982fbbbca71bcd9625ccc50fa8d5fb547228
Component: engine
2016-10-19 12:17:12 +02:00
2b55f480a4
Merge pull request #26984 from thaJeztah/update-triage-process
...
[RFC] Update triage process with more labels
Upstream-commit: d2ccc8007a46fce925b20ec678b5068bfd0f9fb1
Component: engine
2016-10-19 12:12:50 +02:00
8fb804fc58
Fix the typo of URLs
...
Signed-off-by: YuPengZTE <yu.peng36@zte.com.cn >
Upstream-commit: fa378413f88054d0a336d675e7280930ddc86cb2
Component: engine
2016-10-19 17:46:27 +08:00
a787673664
Merge pull request #27501 from aaronlehmann/remove-resolveindex
...
registry: Remove unused method ResolveIndex
Upstream-commit: f11a588d751cb7f82e2291ae1d5d5c0a3743e8fb
Component: engine
2016-10-19 00:30:55 -07:00
0138b61d5e
Merge pull request #27523 from lixiaobing10051267/masterInstall
...
Remove invalid installation content because there is no corresponding files
Upstream-commit: e319954229358caede53bb64c336fa116e9159c2
Component: engine
2016-10-18 23:51:28 -07:00
df687714f9
Remove invalid installtion content because there is no corresponding files
...
Signed-off-by: lixiaobing10051267 <li.xiaobing1@zte.com.cn >
Upstream-commit: 9146ac50c451da95898b216be4fe772168d5edd6
Component: engine
2016-10-19 15:12:55 +08:00
a9ca455bda
add creation timestamp to docker network inspect
...
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp >
Upstream-commit: b5bb7de5d26a49c8a3789cfcaeb8ff3e6153e708
Component: engine
2016-10-19 06:38:39 +00:00
7003dd5887
Merge pull request #27502 from dnephin/fix-dockerd-help-text
...
Update sfp13/pflag
Upstream-commit: 024b97bf0fa7babd68948ce9c9dc38deba74e5ed
Component: engine
2016-10-18 23:27:54 -07:00
79977cb0e7
Merge pull request #27520 from dmcgowan/fix-27384
...
Add limit to page size used by overlay2 driver
Upstream-commit: 74f486cd71e99e5e7a04a98e941841af48771c5d
Component: engine
2016-10-18 23:11:17 -07:00
3643ef102a
Merge pull request #27267 from ezrasilvera/plugin_fix
...
Call the AuthZRes function also when the daemon returns error
Upstream-commit: 194f04bbbe5b4de06235bf56b8842cadac0294dc
Component: engine
2016-10-18 21:53:43 -07:00
ed569140d9
Add limit to page size used by overlay2 driver
...
Go can falsely report a larger page size than supported,
causing overlay2 mount arguments to be truncated. When overlay2
detects the mount arguments have hit the page limit, it will
switch to using relative paths. If this limit is smaller than
the actual page size there is no behavioral problems, but if it
is larger mounts can fail for images with many layers.
Closes #27384
Signed-off-by: Derek McGowan <derek@mcgstyle.net > (github: dmcgowan)
Upstream-commit: 520034e35b463e8c9d69ac78b52a4e5df958bc04
Component: engine
2016-10-18 17:34:19 -07:00
f7298ec9d2
Update sfp13/pflag
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: 4e4da146ecc726f9fb78553710e019edb4685d18
Component: engine
2016-10-18 17:17:22 -07:00
9fcbef44d7
Fix problems with wrapped errors in logrus
...
This vendors a fork of logrus with fixes to deal with errors generated
by the github.com/pkg/errors package. Without these fixes, the errors
are mishandled when passed to WithError:
- When printing to a terminal (colors enabled), stack traces are
included in the error fields on a log line.
- When printing to a file (or with colors disabled), the error value is
missing entirely.
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com >
Upstream-commit: 738131faae42760957abdaa5a64648ed481eee71
Component: engine
2016-10-18 17:14:59 -07:00
8b5b6bf896
make every node and plugin removal call api
...
Signed-off-by: allencloud <allen.sun@daocloud.io >
Upstream-commit: c6d57ca0768fc1e89f6fe63e535c7d92610b3773
Component: engine
2016-10-19 06:40:30 +08:00
b2f5d14643
Merge pull request #26421 from aaronlehmann/update-thresholds-rollbacks
...
Service update failure thresholds and rollback
Upstream-commit: 3b0660da30a23b86a2f29f1ecf3ded52ab7fe577
Component: engine
2016-10-18 15:26:24 -07:00
