Граф коммитов

28306 Коммитов

Автор SHA1 Сообщение Дата
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
John Howard ff6db320f8 Merge pull request #27747 from Microsoft/jjh/clientisolationcomment
Windows: Add comment for containers on client SKUs
2016-10-25 13:37:25 -07:00
Alexander Morozov 844a3166e5 Merge pull request #27698 from tonistiigi/cluster-config-refactor
Refactor swarm node config to struct
2016-10-25 13:29:55 -07:00
Andrew Hsu dbe17defd1 sed replace apt mirror with default deb.debian.org for debian distros
Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
2016-10-25 13:25:21 -07:00
Amit Krishnan 16db092af2 Uprev google/certificate-transparency to include Solaris support
Signed-off-by: Amit Krishnan <krish.amit@gmail.com>
2016-10-25 13:14:57 -07:00
Yong Tang 01d3a16f58 Return error if env file contains non-ascii or utf8 bytes (for windows)
This fix tries to address the issue raised in 26179 where an env file
with non-ascii or utf8 bytes will crash on windows platform.

The issue is two-fold:
- Windows will adds a BOM mark at the begining with Notepad as the editor
- Non-utf8 bytes can not be handled by env file parser.

This fix removes utf8 BOM marker if exists so that utf8 encoded env file
could be processed.
This fix also returns an error (instead of a runtime CreateProcess crash)
if env file contains non-utf8 bytes, thus giving users better experiences.

Additional test cases has been added in unit tests.

This fix fixes 26179.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
2016-10-25 12:34:25 -07:00
Sebastiaan van Stijn 0797e3f61a Merge pull request #27644 from Microsoft/jjh/builderslash
Windows: Honour escape directive fully
2016-10-25 11:52:13 -07:00
Vincent Demeester 0dfa306cdd Merge pull request #27690 from Microsoft/service
mkdirall on the PID file path
2016-10-25 11:15:46 -07:00
John Howard 87ab13add4 Windows: Add comment re client containers
Signed-off-by: John Howard <jhoward@microsoft.com>
2016-10-25 10:30:00 -07:00
Tonis Tiigi e3b48fca0d Add integration tests for build with network opts
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2016-10-25 10:25:42 -07:00
sandyskies 60813af7ae add --network option for docker build
Signed-off-by: sandyskies <chenmingjie0828@163.com>
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2016-10-25 10:25:36 -07:00
John Howard 745f3ece53 mkdirall on the PID file path
Signed-off-by: John Howard <jhoward@microsoft.com>
2016-10-25 09:11:20 -07:00
Vincent Demeester 11cd64f0dc Merge pull request #27525 from AkihiroSuda/prune-network-cluster
add `docker network prune`
2016-10-25 09:02:28 -07:00
Vincent Demeester 95b459df6d Merge pull request #27716 from sdurrheimer/zsh-completion-daemon-shutdown-timeout
Add zsh completion for 'dockerd --shutdown-timeout'
2016-10-25 08:58:34 -07:00
Vincent Demeester c851aea2b6 Merge pull request #27715 from sdurrheimer/zsh-completion-create-run-stop-timeout
Add zsh completion for 'docker {create,run} --stop-timeout'
2016-10-25 08:58:18 -07:00
Alexander Morozov 36f47aa252 Merge pull request #27519 from justincormack/proxy-build
Build docker-proxy from git checkout like other external binaries
2016-10-25 08:54:13 -07:00
Antonio Murdaca 8ed31089c0 Merge pull request #27467 from tonistiigi/attach-cb
Move stdio attach from libcontainerd backend to callback
2016-10-25 16:23:07 +02:00
Kenfe-Mickaël Laventure 9643f0e816 Merge pull request #27721 from albers/completion-dockerd--experimental
Add bash completion for `dockerd --experimental`
2016-10-25 07:10:23 -07:00
Brian Goff e1c04514dd Merge pull request #27717 from sdurrheimer/zsh-completion-fix-exec-env
Fix zsh completion for 'docker exec --env'
2016-10-25 06:51:06 -07:00
Justin Cormack 1c6f5b5fff Add shell completions to tgz
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-10-25 13:43:55 +01:00
Harald Albers 2e44e74874 Add support for multiple containers to bash completion for `docker pause`
Signed-off-by: Harald Albers <github@albersweb.de>
2016-10-25 14:24:59 +02:00
Harald Albers 3ac19862f2 Add bash completion for `docker export --output`
Signed-off-by: Harald Albers <github@albersweb.de>
2016-10-25 14:18:13 +02:00
Justin Cormack 3996975b08 Build docker-proxy from git checkout like other external binaries
This means we can vendor libnetwork without special casing, and
it is built the same way as the other external binaries.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-10-25 13:13:22 +01:00
Steve Durrheimer 11b6c4c58a
Add zsh completion for 'dockerd --experimental'
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
2016-10-25 11:26:39 +02:00
Harald Albers e63f196536 Add bash completion for `dockerd --experimental`
Signed-off-by: Harald Albers <github@albersweb.de>
2016-10-25 10:04:48 +02:00
Harald Albers 28469b5720 Move bash completion logic to new subcommand: tag
Signed-off-by: Harald Albers <github@albersweb.de>
2016-10-25 09:57:47 +02:00
Harald Albers 18e8c59fbb Move bash completion logic to new subcommand: save
Signed-off-by: Harald Albers <github@albersweb.de>
2016-10-25 09:57:47 +02:00
Harald Albers 01c259e08a Move bash completion logic to new subcommand: rmi
Signed-off-by: Harald Albers <github@albersweb.de>
2016-10-25 09:57:47 +02:00
Harald Albers 2d139df59c Move bash completion logic to new subcommand: push
Signed-off-by: Harald Albers <github@albersweb.de>
2016-10-25 09:57:47 +02:00
Harald Albers 6864f3ae5a Move bash completion logic to new subcommand: pull
Signed-off-by: Harald Albers <github@albersweb.de>
2016-10-25 09:57:47 +02:00