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
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
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
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
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
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
c94208223e
Merge pull request #27810 from vieux/add_back_1.12.3-changelog
...
merge 1.12.3 CHANGELOG to master
Upstream-commit: ff2df99969e1fcaccf5fbc282a8397dba0b48702
Component: engine
2016-10-26 18:00:20 -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
ae3423b0ca
Merge pull request #23430 from erikstmartin/realtime-threads
...
Implementing support for --cpu-rt-period and --cpu-rt-runtime
Upstream-commit: 80d6d2e129805e8ee9257641b922e47a01f16736
Component: engine
2016-10-27 00:22:06 +02:00
0d36210a17
merge 1.12.3 CHANGELOG to master
...
Signed-off-by: Victor Vieux <vieux@docker.com >
Upstream-commit: fdddacd8a2bac6ca6d6d8d24ade206b7881f6e39
Component: engine
2016-10-26 15:08:48 -07:00
79dc1804b2
Merge pull request #26296 from yongtang/26179-env-file-non-ascii-windows-crash
...
Return error if env file contains non-ascii or utf8 bytes (for windows)
Upstream-commit: d5fe259e121b3c86d1de0dae1760aafb48507ea9
Component: engine
2016-10-26 15:07:36 -07:00
1c8307ceea
Merge pull request #27784 from yongtang/10262016-vendor-swarmkit
...
Revendor swarmkit to 0ec7c6ee4b3185ec4e3d6bd65f8f5542b1761421
Upstream-commit: d6a5d5408656bcedb05581317e93eae1991940c2
Component: engine
2016-10-26 14:20:13 -07:00
157dbff3e2
Merge pull request #26402 from qudongfang/ensure_client_transport_be_closed
...
ensure transport.Client be closed
Upstream-commit: 335a3c614917595cb7602adeb7173a0d228f825b
Component: engine
2016-10-26 11:51:51 -07:00
b5a5162877
Merge pull request #27724 from sdurrheimer/zsh-completion-dockerd-experimental
...
Add zsh completion for 'dockerd --experimental'
Upstream-commit: 2a2f183627af25fb6f1c93c5fc2c4d04ab7e75bb
Component: engine
2016-10-26 09:02:27 -07:00
3affb6aba8
Implementing support for --cpu-rt-period and --cpu-rt-runtime so that
...
containers may specify these cgroup values at runtime. This will allow
processes to change their priority to real-time within the container
when CONFIG_RT_GROUP_SCHED is enabled in the kernel. See #22380 .
Also added sanity checks for the new --cpu-rt-runtime and --cpu-rt-period
flags to ensure that that the kernel supports these features and that
runtime is not greater than period.
Daemon will support a --cpu-rt-runtime flag to initialize the parent
cgroup on startup, this prevents the administrator from alotting runtime
to docker after each restart.
There are additional checks that could be added but maybe too far? Check
parent cgroups to ensure values are <= parent, inspecting rtprio ulimit
and issuing a warning.
Signed-off-by: Erik St. Martin <alakriti@gmail.com >
Upstream-commit: 56f77d5ade945b3b8816a6c8acb328b7c6dce9a7
Component: engine
2016-10-26 11:33:06 -04:00
25fe293d44
Merge pull request #27763 from tonistiigi/fix-logging-formatting
...
Fix logging formatting
Upstream-commit: e2133b42ffc76d86809048cd87de50ad1b7f082d
Component: engine
2016-10-26 16:49:05 +02:00
907d8fbad9
Revendor swarmkit to 0ec7c6ee4b3185ec4e3d6bd65f8f5542b1761421
...
This fix revendor swarmkit to 0ec7c6ee4b3185ec4e3d6bd65f8f5542b1761421.
Related docker PR and issues:
(#27567 )
(#25437 )
(#26988 )
(#25644 )
Signed-off-by: Yong Tang <yong.tang.github@outlook.com >
Upstream-commit: bb568f80975ac8a92802ef39f71302b26aaf3100
Component: engine
2016-10-26 06:49:39 -07:00
2c601824ac
vendor docker/distribution fbb70dc3a14ca65cdac3aaf5e5122b03b42f6fbc
...
Signed-off-by: Antonio Murdaca <runcom@redhat.com >
Upstream-commit: 78a429a97ac110e986c150a57507163dfe223f46
Component: engine
2016-10-26 10:55:50 +02:00
51365aea85
Merge pull request #27767 from harche/patch-1
...
Restoring the missing image in the repo.
Upstream-commit: a6a38f811f5dcf59e85e278721601afe3f71ef9b
Component: engine
2016-10-26 00:11:15 -07:00
d70913086f
Putting back the missing image back in the repo.
...
Signed-off-by: Harshal Patil <harshalp@linux.vnet.ibm.com >
Upstream-commit: 784fa222c6c28b87deb5c0b7fa78032bdf66fe21
Component: engine
2016-10-26 12:34:24 +05:30
78bcd80cd2
Merge pull request #27764 from elgalu/patch-1
...
Typo --ti and missing my_strace_docker_image
Upstream-commit: a6dfab03f53506e7d9d437c4cebf1a0c42c73f0e
Component: engine
2016-10-25 22:46:04 -07:00
