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
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
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
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
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
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
8ab5873ed9
Merge pull request #27814 from albers/completion-system
...
Add bash completion for new `docker system` command family
Upstream-commit: 60ef48dd4acab218449d1f64c5fbb0850c493a31
Component: engine
2016-10-27 22:42:47 +02:00
2c36e772da
Merge pull request #24844 from yongtang/24712-create-service-env-file
...
Add `--env-file` flag to `docker create service`
Upstream-commit: 322f88f3679efa3267e3ea01330fbedfeb059e9a
Component: engine
2016-10-27 13:40:51 -07:00
47fed3161f
Merge pull request #26718 from ncdc/add-logs-to-container-attach-options
...
Add Logs to ContainerAttachOptions
Upstream-commit: 4d2e258531a4c3f2e042c6dda79463b46f1b5880
Component: engine
2016-10-27 13:32:50 -07:00
6ef00270be
Windows: Fix builder cache bug
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: 4f3889e4be9fe518e9be73306a8716c3a5f4b1c6
Component: engine
2016-10-27 12:27:30 -07:00
bf6f304cc7
Add --env-file flag to docker create service
...
This fix tries to address the issue in 24712 and add
`--env-file` file to `docker create service`.
Related documentation has been updated.
An additional integration has been added.
This fix fixes 24712.
Signed-off-by: Yong Tang <yong.tang.github@outlook.com >
Upstream-commit: ee3105c68a94411f2c019324bd71c56e9663a80d
Component: engine
2016-10-27 11:48:32 -07:00
2a9003b823
Add basic prometheus support
...
This adds a metrics packages that creates additional metrics. Add the
metrics endpoint to the docker api server under `/metrics`.
Signed-off-by: Michael Crosby <crosbymichael@gmail.com >
Add metrics to daemon package
Signed-off-by: Michael Crosby <crosbymichael@gmail.com >
api: use standard way for metrics route
Also add "type" query parameter
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
Convert timers to ms
Signed-off-by: Michael Crosby <crosbymichael@gmail.com >
Upstream-commit: 3343d234f3b131d4be1d4ca84385e184633a79bd
Component: engine
2016-10-27 10:34:38 -07:00
4cadaabc3f
Remove --name flag from service update
...
The --name flag was inadvertently added to
docker service update, but is not supported,
as it has various side-effects (e.g., existing
tasks are not renamed).
This removes the flag from the service update
command.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: 047e44eeb186a8bde41765a44c5966a150fa84f3
Component: engine
2016-10-27 09:16:29 -07:00
1826752c1b
Vendor libnetwork to f4338b6f1085ccfe5972e655cca8a1d15d73439d
...
This fix updates libnetwork to f4338b6f1085ccfe5972e655cca8a1d15d73439d.
Signed-off-by: Yong Tang <yong.tang.github@outlook.com >
Upstream-commit: fc62ad6b95a19d704bd64bcbe70f355ac2230026
Component: engine
2016-10-27 09:13:25 -07:00
75f125a77f
Add unit tests to cli/command/formatter/stats.go
...
Signed-off-by: Boaz Shuster <ripcurld.github@gmail.com >
Upstream-commit: 51fb35f0b0aa9f9d2fcc00dd08cafc588ee864d2
Component: engine
2016-10-27 18:00:38 +03:00
aa72e9f745
Move bash completion logic to new subcommand: info
...
Signed-off-by: Harald Albers <github@albersweb.de >
Upstream-commit: a3efa05d3ad6e38540c4fa6b55100e7b979cc260
Component: engine
2016-10-27 09:10:39 +02:00
3c813f7ba6
Move bash completion logic to new subcommand: events
...
Signed-off-by: Harald Albers <github@albersweb.de >
Upstream-commit: 1de8e84a5cdc5146bdb75307be02bc881f5fb437
Component: engine
2016-10-27 09:08:18 +02:00
f88d0a2192
Add bash completion for new docker system command family
...
Signed-off-by: Harald Albers <github@albersweb.de >
Upstream-commit: 5290f748789474d9c826e84342f59e6b43e96c4e
Component: engine
2016-10-27 09:05:21 +02:00
72db6e475a
Fix issue for --fixed-cidr when bridge has multiple addresses
...
This fix tries to address the issue raised in 26341
where multiple addresses in a bridge may cause `--fixed-cidr`
to not have the correct addresses.
The issue is that `netutils.ElectInterfaceAddresses(bridgeName)`
only returns the first IPv4 address.
This fix (together with the PR created in libnetwork )
changes `ElectInterfaceAddresses()` and `addresses()`
so that all IPv4 addresses are returned. This will allow the
possibility of selectively choose the address needed.
In `daemon_unix.go`, bridge address is chosen by comparing with
the `--fixed-cidr` first, thus resolve the issue in 26341.
This fix is tested manually, as is described in 26341:
```
brctl addbr cbr0
ip addr add 10.111.111.111/20 dev cbr0 label cbr0:main
ip addr add 10.222.222.222/12 dev cbr0 label cbr0:docker
ip link set cbr0 up
docker daemon --bridge=cbr0 --iptables=false --ip-masq=false --fixed-cidr=10.222.222.222/24
docker run --rm busybox ip route get 8.8.8.8 | grep -Po 'src.*'
src 10.222.222.0
```
This fix fixes 26341.
Signed-off-by: Yong Tang <yong.tang.github@outlook.com >
Upstream-commit: e9c4c513d11e6c3986f8858b9a11535d61cfdf74
Component: engine
2016-10-26 20:11:29 -07:00
a12095fbb1
Merge pull request #27759 from Microsoft/jjh/fixstats
...
Windows: Fix stats CLI
Upstream-commit: 24285349989577af5b76de0a9b11a4e259ce6410
Component: engine
2016-10-26 18:17:18 -07:00
bba6e66800
Merge pull request #27803 from darrenstahlmsft/RevendorHcsshim
...
Update hcsshim to v0.5.2
Upstream-commit: 36d3ffe059f7dbc3ea46a8150046347647c9a89e
Component: engine
2016-10-26 18:03:10 -07:00
55b1731260
stdcopy: remove logrus debug messages; makes it easier to vendor without the dependency.
...
Signed-off-by: Erik Hollensbe <github@hollensbe.org >
Upstream-commit: c4be1b117f8226a7aad792c5be315d093adf19cf
Component: engine
2016-10-26 16:29:37 -07:00
91360fabc0
Merge pull request #27719 from albers/completion-image
...
Add bash completion for new `docker image` command family
Upstream-commit: 362eb4cfbb09b5dc0fe648360a2e6d0546bf6613
Component: engine
2016-10-27 00:41:26 +02:00
d68cad7965
Update hcsshim to v0.5.2
...
Signed-off-by: Darren Stahl <darst@microsoft.com >
Upstream-commit: f9adce18c731188e30dc0c8b00764bebcb9befd4
Component: engine
2016-10-26 15:39:35 -07:00
