beenull/moby
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
28230 commits 14 branches 412 tags 338 MiB
Commit graph

28230 commits

This branch
This branch
All branches
Author SHA1 Message Date
Cezar Sa Espinola
7bd2611789
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>
 2016-10-28 15:19:08 -02:00
Cezar Sa Espinola
fd657a10d0
vendor: update swarmkit 
Signed-off-by: Cezar Sa Espinola <cezarsa@gmail.com>
 2016-10-28 00:37:39 -02:00
Vincent Demeester
9e206b5512 Merge pull request #27805 from Microsoft/jjh/fixbuildercache 
Windows: Fix builder cache bug
 2016-10-28 02:49:40 +02:00
Tibor Vass
4e6cb66ecc Merge pull request #27774 from runcom/vendor-distr 
vendor docker/distribution fbb70dc3a14ca65cdac3aaf5e5122b03b42f6fbc
 2016-10-27 17:07:03 -07:00
Sebastiaan van Stijn
3a3a87bff8 Merge pull request #26988 from thaJeztah/remove-service-update-name-flag 
Remove service update name flag
 2016-10-27 16:55:47 -07:00
Sebastiaan van Stijn
33474a11fe Merge pull request #25820 from crosbymichael/prom 
Add metrics output to docker
 2016-10-27 16:44:26 -07:00
Alexander Morozov
3a4ae1f661 Merge pull request #27806 from erikh/stdcopy-logrus 
stdcopy: remove logrus debug messages; makes it easier to vendor without the dependency.
 2016-10-27 16:00:01 -07:00
Sebastiaan van Stijn
a3525d6f1f Merge pull request #27701 from ripcurld00d/unit_test_formatter_stats 
Add unit tests to cli/command/formatter/stats.go
 2016-10-27 15:10:47 -07:00
Vincent Demeester
60ef48dd4a Merge pull request #27814 from albers/completion-system 
Add bash completion for new `docker system` command family
 2016-10-27 22:42:47 +02:00
Sebastiaan van Stijn
322f88f367 Merge pull request #24844 from yongtang/24712-create-service-env-file 
Add `--env-file` flag to `docker create service`
 2016-10-27 13:40:51 -07:00
Kenfe-Mickaël Laventure
4d2e258531 Merge pull request #26718 from ncdc/add-logs-to-container-attach-options 
Add Logs to ContainerAttachOptions
 2016-10-27 13:32:50 -07:00
John Howard
4f3889e4be Windows: Fix builder cache bug 
Signed-off-by: John Howard <jhoward@microsoft.com>
 2016-10-27 12:27:30 -07:00
Yong Tang
ee3105c68a 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>
 2016-10-27 11:48:32 -07:00
Michael Crosby
3343d234f3 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>
 2016-10-27 10:34:38 -07:00
Sebastiaan van Stijn
047e44eeb1 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>
 2016-10-27 09:16:29 -07:00
Boaz Shuster
51fb35f0b0 Add unit tests to cli/command/formatter/stats.go 
Signed-off-by: Boaz Shuster <ripcurld.github@gmail.com>
 2016-10-27 18:00:38 +03:00
Harald Albers
a3efa05d3a Move bash completion logic to new subcommand: info 
Signed-off-by: Harald Albers <github@albersweb.de>
 2016-10-27 09:10:39 +02:00
Harald Albers
1de8e84a5c Move bash completion logic to new subcommand: events 
Signed-off-by: Harald Albers <github@albersweb.de>
 2016-10-27 09:08:18 +02:00
Harald Albers
5290f74878 Add bash completion for new docker system command family 
Signed-off-by: Harald Albers <github@albersweb.de>
 2016-10-27 09:05:21 +02:00
Sebastiaan van Stijn
2428534998 Merge pull request #27759 from Microsoft/jjh/fixstats 
Windows: Fix stats CLI
 2016-10-26 18:17:18 -07:00
John Howard
36d3ffe059 Merge pull request #27803 from darrenstahlmsft/RevendorHcsshim 
Update hcsshim to v0.5.2
 2016-10-26 18:03:10 -07:00
Sebastiaan van Stijn
ff2df99969 Merge pull request #27810 from vieux/add_back_1.12.3-changelog 
merge 1.12.3 CHANGELOG to master
 2016-10-26 18:00:20 -07:00
Erik Hollensbe
c4be1b117f stdcopy: remove logrus debug messages; makes it easier to vendor without the dependency. 
Signed-off-by: Erik Hollensbe <github@hollensbe.org>
 2016-10-26 16:29:37 -07:00
Vincent Demeester
362eb4cfbb Merge pull request #27719 from albers/completion-image 
Add bash completion for new `docker image` command family
 2016-10-27 00:41:26 +02:00
Darren Stahl
f9adce18c7 Update hcsshim to v0.5.2 
Signed-off-by: Darren Stahl <darst@microsoft.com>
 2016-10-26 15:39:35 -07:00
Vincent Demeester
80d6d2e129 Merge pull request #23430 from erikstmartin/realtime-threads 
Implementing support for --cpu-rt-period and --cpu-rt-runtime
 2016-10-27 00:22:06 +02:00
Victor Vieux
fdddacd8a2 merge 1.12.3 CHANGELOG to master 
Signed-off-by: Victor Vieux <vieux@docker.com>
 2016-10-26 15:08:48 -07:00
Sebastiaan van Stijn
d5fe259e12 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)
 2016-10-26 15:07:36 -07:00
Andrea Luzzardi
d6a5d54086 Merge pull request #27784 from yongtang/10262016-vendor-swarmkit 
Revendor swarmkit to 0ec7c6ee4b3185ec4e3d6bd65f8f5542b1761421
 2016-10-26 14:20:13 -07:00
Tibor Vass
335a3c6149 Merge pull request #26402 from qudongfang/ensure_client_transport_be_closed 
ensure transport.Client be closed
 2016-10-26 11:51:51 -07:00
Brian Goff
2a2f183627 Merge pull request #27724 from sdurrheimer/zsh-completion-dockerd-experimental 
Add zsh completion for 'dockerd --experimental'
 2016-10-26 09:02:27 -07:00
Erik St. Martin
56f77d5ade 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>
 2016-10-26 11:33:06 -04:00
Vincent Demeester
e2133b42ff Merge pull request #27763 from tonistiigi/fix-logging-formatting 
Fix logging formatting
 2016-10-26 16:49:05 +02:00
Yong Tang
bb568f8097 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>
 2016-10-26 06:49:39 -07:00
Antonio Murdaca
78a429a97a
vendor docker/distribution fbb70dc3a14ca65cdac3aaf5e5122b03b42f6fbc 
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
 2016-10-26 10:55:50 +02:00
Sebastiaan van Stijn
a6a38f811f Merge pull request #27767 from harche/patch-1 
Restoring the missing image in the repo.
 2016-10-26 00:11:15 -07:00
Harshal Patil
784fa222c6 Putting back the missing image back in the repo. 
Signed-off-by: Harshal Patil <harshalp@linux.vnet.ibm.com>
 2016-10-26 12:34:24 +05:30
Sebastiaan van Stijn
a6dfab03f5 Merge pull request #27764 from elgalu/patch-1 
Typo --ti and missing my_strace_docker_image
 2016-10-25 22:46:04 -07:00
Sebastiaan van Stijn
62ff3e9083 Merge pull request #27702 from tonistiigi/net-builder0 
add --network option for docker build
 2016-10-25 21:50:33 -07:00
Leo Gallucci
a5b69faafb Typo --ti and missing my_strace_docker_image 
Signed-off-by: Leo Gallucci <leo.gallucci@zalando.de>
 2016-10-26 06:07:42 +02:00
John Howard
2894d07696 Windows: Fix stats CLI 
Signed-off-by: John Howard <jhoward@microsoft.com>
 2016-10-25 19:57:47 -07:00
Tonis Tiigi
aa01ee4ac5 Fix logging formatting 
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
 2016-10-25 18:34:35 -07:00
Sebastiaan van Stijn
77f4c30a21 Merge pull request #27748 from amitkris/uprev_certificate_transparency 
Uprev google/certificate-transparency to include Solaris support
 2016-10-25 16:21:06 -07:00
Michael Crosby
05b1344ba6 Merge pull request #27756 from vdemeester/21571-remove-kate-syntax-from-contrib 
Remove unmaintained Dockerfile syntax for Kate
 2016-10-25 16:04:56 -07:00
Vincent Demeester
3dabad7992 Merge pull request #27751 from stevvooe/task-naming-correction 
cluster/container: correctly name swarm tasks
 2016-10-25 15:56:46 -07:00
Tibor Vass
280eadf9bf Merge pull request #27735 from justincormack/completions-tgz 
Add shell completions to tgz
 2016-10-25 15:46:45 -07:00
Vincent Demeester
a2f695d7fa
Remove unmaintained Dockerfile syntax for Kate 
We don't support this and no maintainers uses Kate.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
 2016-10-25 15:42:27 -07:00
Sebastiaan van Stijn
f7e2f8ac1c Merge pull request #27620 from andrewhsu/fix-debian-stretch-apt-mirror 
sed replace apt mirror with default deb.debian.org for debian distros
 2016-10-25 15:30:07 -07:00
Stephen J Day
3b1af17518
cluster/container: correctly name swarm tasks 
Even after a slew of PRs, this still wasn't quite right. Now, we ensure
the task name is calculared in one place in the executor, as least.

We'll have to follow this up once the `api/naming` package from SwarmKit
lands.

Signed-off-by: Stephen J Day <stephen.day@docker.com>
 2016-10-25 14:17:57 -07:00
Brian Goff
6e462412d7 Merge pull request #27503 from Microsoft/validcredspec 
Windows: Add cred spec test with well form credentials
 2016-10-25 13:44:52 -07:00