6aae774656
Merge pull request #27863 from Microsoft/jjh/clarifyworkdir
...
Windows: Clarify WORKDIR in docs
Upstream-commit: beccf0f8986d1182fc2b3e192508d1309d5fc5c1
Component: engine
2016-10-28 14:07:03 -07:00
7523d02582
Merge pull request #27800 from lilybguo/group-add-rm
...
Service create --group param
Upstream-commit: 91f477b8309fd09f27d613c1c3bfc7afb2fd137c
Component: engine
2016-10-28 14:01:53 -07:00
d280390d0c
Merge pull request #24725 from yongtang/24693-dockerfile-empty-line-after-escape
...
Fix dockerfile parser with empty line after escape
Upstream-commit: c5adc271b2991c1eb8a25cdab14e425edb2cd99b
Component: engine
2016-10-28 13:53:15 -07:00
ed2e1f6e2b
Service create --group param
...
--group-add was used for specifying groups for both service create
and service update. For create it was confusing since we don't have
an existing set of groups. Instead I added --group to create, and
moved --group-add to service update only, like --group-rm
This deals with issue 27646
Signed-off-by: Lily Guo <lily.guo@docker.com >
Update flag documentation
Specify that --group, --group-add and --groupd-rm refers to
supplementary user groups
Signed-off-by: Lily Guo <lily.guo@docker.com >
Fix docs for groups and update completion scripts
Signed-off-by: Lily Guo <lily.guo@docker.com >
Upstream-commit: 2f58494ae6e796325329f849cf547bcf94bb68e3
Component: engine
2016-10-28 13:26:31 -07:00
94a4717dfa
Merge pull request #27758 from anusha-ragunathan/fix-overflow
...
Fix stack overflow in ErrInAdequateCapacity.
Upstream-commit: c73dd3fe7b0ef6c8e4e16a72b22f32f33113fac1
Component: engine
2016-10-28 13:10:54 -07:00
41f493236b
Merge pull request #27819 from lixiaobing10051267/masterDirInvalid
...
fill all the rest invalid address because no related directory
Upstream-commit: 010ee5a8e84b3bb5f5a79690e77fd9b135643641
Component: engine
2016-10-28 13:05:18 -07:00
b0519ec516
Merge pull request #27815 from lixiaobing10051267/masterDocsDel
...
fill the complete address because of no userguide directory
Upstream-commit: cfe7cb0292eb9654fba13d380ead30f2525d09df
Component: engine
2016-10-28 13:04:04 -07:00
86df94b9ba
Merge pull request #27369 from cezarsa/hc
...
Add --health-* flags to service create and update
Upstream-commit: f860289131e36ad2dde5ebe60d15a86fd97934b5
Component: engine
2016-10-28 21:59:52 +02:00
c8cb7f1f85
Merge pull request #27842 from Microsoft/jjh/supportdiff
...
Windows: support docker diff
Upstream-commit: 9aa75016967ef36753f7e270bed03d9805b84ad8
Component: engine
2016-10-28 12:41:08 -07:00
929d4f87ec
Merge pull request #27700 from Microsoft/jjh/servicerestart
...
Windows: Set service recovery options
Upstream-commit: f81c538fec66e1dc63fd74054b9a7245d5c00e3a
Component: engine
2016-10-28 12:06:24 -07:00
500367df6e
Merge pull request #27860 from vdemeester/update-go-connections-vendor
...
Update go-connections vendoring
Upstream-commit: f391f9c3b9e3db1149e6bc13ee2117cb69e6a617
Component: engine
2016-10-28 12:01:59 -07:00
a83a8ad571
Merge pull request #27865 from Microsoft/jjh/builderdocsnanoserver
...
Update examples in builder.md
Upstream-commit: 7c809039f5efe5ac22194f229dd4951cd6d831f6
Component: engine
2016-10-28 11:44:38 -07:00
7e8bfe389f
Update examples in builder.md
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: 744cf2c9718a43aad21c6dee53a07856ef06fc79
Component: engine
2016-10-28 11:36:11 -07:00
9988859ce7
Merge pull request #27394 from Microsoft/jjh/runelevated
...
Windows: Hint to run client elevated
Upstream-commit: 8a99bf6fa9d7efe4dea275a610824d01ed969b9b
Component: engine
2016-10-28 11:25:04 -07:00
3ea22f139e
Merge pull request #26709 from boucher/checkpoint-dir
...
Allow providing a custom storage directory for docker checkpoints
Upstream-commit: b57f321a4a6ee3e14079b2913d5f90df0be49689
Component: engine
2016-10-28 11:12:44 -07:00
3b745bdb00
Merge pull request #26464 from vdemeester/11065-stop-signal-and-restart-policies
...
Taking stop-signal into account when docker kill
Upstream-commit: 9e436c9aad389de27f008cbf404fd907b23baa25
Component: engine
2016-10-28 11:08:55 -07:00
22458c8162
Windows: support docker diff
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: 4fac603682747476a12dba0df79c10e919eddefb
Component: engine
2016-10-28 11:06:54 -07:00
28336d95ca
Merge pull request #26659 from yongtang/26341-fixed-cidr-multiple-addresses-bridge
...
Fix issue for `--fixed-cidr` when bridge has multiple addresses
Upstream-commit: 1e989abefba1a424b95d3fc1474e489ace747598
Component: engine
2016-10-28 11:05:01 -07:00
62e380aa24
Merge pull request #27731 from albers/completion-export--output
...
Add bash completion for `docker export --output`
Upstream-commit: 9842f019ec458ee4a5f892a08e76c319bd2c6a24
Component: engine
2016-10-28 10:59:05 -07:00
a4d5c582a1
Merge pull request #27732 from albers/completion-pause-multiple-containers
...
Add support for multiple containers to bash completion for `docker pause`
Upstream-commit: a52b9b4591b6146436d55d6579790fe6e842a714
Component: engine
2016-10-28 10:58:34 -07:00
d16a71e0f2
Windows: Clarify WORKDIR in docs
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: e87c6dd3e48135637d12067dd158252b5c27349b
Component: engine
2016-10-28 10:28:38 -07:00
bf7ee1cb20
Merge pull request #26837 from AkihiroSuda/newtmpfs
...
api: add TypeTmpfs to api/types/mount
Upstream-commit: 87ddc8b0a51248da4f9ab60b92901425c888282f
Component: engine
2016-10-28 19:21:26 +02:00
c05d99582c
Add --health-* commands to service create and update
...
A HealthConfig entry was added to the ContainerSpec associated with the
service being created or updated.
Signed-off-by: Cezar Sa Espinola <cezarsa@gmail.com >
Upstream-commit: 7bd2611789e6898576f7229255c238f7c1129293
Component: engine
2016-10-28 15:19:08 -02:00
0befe9514a
Fix stack overflow in ErrInAdequateCapacity.
...
fmt package formats an error by calling its Error() method.
This results in recursion. Fix this. Also remove dead code.
Signed-off-by: Anusha Ragunathan <anusha@docker.com >
Upstream-commit: 4db753c0174420152957224d38fb6e8b6ae6908e
Component: engine
2016-10-28 10:02:48 -07:00
98f1727b06
Merge pull request #27856 from albers/completion-service-create--env-file
...
Add bash completion for `docker service create --env-file`
Upstream-commit: 1462ea37d0014ef5f7f3e4bd9d174bcd0185e71d
Component: engine
2016-10-28 19:00:06 +02:00
1fa0d4beb8
Update go-connections vendoring
...
This makes possible to use IPv6 addresses in the `--publish` flag of
docker (`run`, …)
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: 609c183ae7092c60b61021e61f181ae67dea331a
Component: engine
2016-10-28 09:35:30 -07:00
df07501298
Merge pull request #27850 from sdurrheimer/zsh-completion-service-create-env-file
...
Add zsh completion for 'docker service create --env-file'
Upstream-commit: b5d37a4242e259a80f7a9420740352e6a9dfa182
Component: engine
2016-10-28 17:50:59 +02:00
1b3846de44
Merge pull request #27852 from yuexiao-wang/modfiy-its
...
Fix some typos
Upstream-commit: dd344aabb2476428ee699cb3db245e95d3476c16
Component: engine
2016-10-28 05:57:56 -07:00
0bd2417b94
Fix some typos
...
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn >
Upstream-commit: 4d2af4430080e9c7ed5badc465be0e8f04b4b1a4
Component: engine
2016-10-29 00:46:16 +08:00
0e3402d520
Allow providing a custom storage directory for docker checkpoints
...
Signed-off-by: boucher <rboucher@gmail.com >
Upstream-commit: bd7d51292c399edba5f339e6be55fac6c0811ff5
Component: engine
2016-10-28 07:56:05 -04:00
b1f2523820
Add bash completion for docker service create --env-file
...
Signed-off-by: Harald Albers <github@albersweb.de >
Upstream-commit: b2db0cdae7b353c7bd4608579758f6c4a272f9fe
Component: engine
2016-10-28 12:53:32 +02:00
ecffd5b73a
api: add TypeTmpfs to api/types/mount
...
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp >
Upstream-commit: 18768fdc2e76ec6c600c8ab57d2d487ee7877794
Component: engine
2016-10-28 08:38:32 +00:00
c162aa9149
Add zsh completion for 'docker service create --env-file'
...
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com >
Upstream-commit: 60813045c128b43cdd31f938a452abab9e9ebbc1
Component: engine
2016-10-28 08:10:42 +02:00
0b8e22519c
Merge pull request #27845 from cpuguy83/experimental_checks_daemon
...
error out if checkpoint specified on non-experimental
Upstream-commit: 0aaef963a880476d6637ad798c30520193ee04e3
Component: engine
2016-10-27 20:42:09 -07:00
ef5cf518c7
Merge pull request #27654 from gaocegege/add-quiet-mode-to-service-ps
...
Add -q option to `docker service ps`
Upstream-commit: 89011970e04614dd285ea4c3423ec7a86602488b
Component: engine
2016-10-28 05:21:03 +02:00
dad340cfb8
Merge pull request #25800 from vdemeester/25798-fix-event-actions
...
Fix 25798 : Allow "partial/prefix" filter for health_status, exec_create and exec_start events
Upstream-commit: 10d77b878c473d5e85318aa889a74f1a31559bea
Component: engine
2016-10-28 05:20:49 +02:00
e39e12ad3b
Merge pull request #27839 from vdemeester/lets-clise-this
...
Small log formatting fixes
Upstream-commit: 5945ba64b28a371d9f82232890c8b92e8355971d
Component: engine
2016-10-28 05:20:24 +02:00
17e336a83a
fill all the rest invalid address because no related directory
...
Signed-off-by: lixiaobing10051267 <li.xiaobing1@zte.com.cn >
Upstream-commit: 7d1eb5ea1bcf68391576f92a0660ac785a498fd4
Component: engine
2016-10-28 11:12:54 +08:00
810cfad17d
fill the complete address because of no userguide directory
...
Signed-off-by: lixiaobing10051267 <li.xiaobing1@zte.com.cn >
Upstream-commit: 97c00f9754271bbc03c6309793482e11920e4f3e
Component: engine
2016-10-28 10:57:37 +08:00
4432c92e1d
vendor: update swarmkit
...
Signed-off-by: Cezar Sa Espinola <cezarsa@gmail.com >
Upstream-commit: fd657a10d093d5dc838a07098054d0b855718f3b
Component: engine
2016-10-28 00:37:39 -02:00
5c99e2a951
Merge pull request #27805 from Microsoft/jjh/fixbuildercache
...
Windows: Fix builder cache bug
Upstream-commit: 9e206b551288c5197a2523ad0f887341972d75c8
Component: engine
2016-10-28 02:49:40 +02:00
4168a25419
error out if checkpoint specified on non-experimental
...
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
Upstream-commit: 3c0a2bb289994b190356a9753658e4cbe81a25bb
Component: engine
2016-10-27 17:43:57 -07:00
52c41330fb
Merge pull request #27774 from runcom/vendor-distr
...
vendor docker/distribution fbb70dc3a14ca65cdac3aaf5e5122b03b42f6fbc
Upstream-commit: 4e6cb66ecc401bb748bb0db69b1925ca22867d6a
Component: engine
2016-10-27 17:07:03 -07:00
0df16199a0
fixes #27643
...
Signed-off-by: Ce Gao <ce.gao@outlook.com >
Upstream-commit: 9efa472bd1cfe1274248612c952937334ea3e252
Component: engine
2016-10-28 08:02:57 +08:00
c04a526463
Merge pull request #26988 from thaJeztah/remove-service-update-name-flag
...
Remove service update name flag
Upstream-commit: 3a3a87bff8dcc2f880e849e186bda02a8cee8d90
Component: engine
2016-10-27 16:55:47 -07:00
fede704b07
Merge pull request #25820 from crosbymichael/prom
...
Add metrics output to docker
Upstream-commit: 33474a11fea50d50c1d365b29b94b978b2b6fff7
Component: engine
2016-10-27 16:44:26 -07:00
781e5170af
Fix some event filtering
...
Make it possible to use health_status, exec_start and exec_create as
is in event filter. This way, using `health_status` as filter will allow
to get all health_status events (healthy, unhealthy, …) instead of
having to us all combination (`health_status: healthy`, `health_status:
unhealthy`, …). Same goes for `exec_start` and `exec_create`.
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: 71d8313ad415b8ec6efff3e88f48b5465f30c9a9
Component: engine
2016-10-27 16:14:13 -07:00
d028e5fe61
Merge pull request #27806 from erikh/stdcopy-logrus
...
stdcopy: remove logrus debug messages; makes it easier to vendor without the dependency.
Upstream-commit: 3a4ae1f661ac9c542d16f9086dd9b6ab21ef2666
Component: engine
2016-10-27 16:00:01 -07:00
eac48da2d6
Small log formatting fixes
...
… and clise to close 👼
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: 2f7e9078466f0d1b3a6a83cc269bce4e0a3b05f0
Component: engine
2016-10-27 15:29:24 -07:00
27c2f54d06
Merge pull request #27701 from ripcurld00d/unit_test_formatter_stats
...
Add unit tests to cli/command/formatter/stats.go
Upstream-commit: a3525d6f1f93a3d02f33919f5d845107dab6560e
Component: engine
2016-10-27 15:10:47 -07:00
