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
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
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
b63aa05761
Merge pull request #27702 from tonistiigi/net-builder0
...
add --network option for docker build
Upstream-commit: 62ff3e90835c3c572051afbbbac53303e57a5c89
Component: engine
2016-10-25 21:50:33 -07:00
633c4cbeb6
Typo --ti and missing my_strace_docker_image
...
Signed-off-by: Leo Gallucci <leo.gallucci@zalando.de >
Upstream-commit: a5b69faafba8bbb85094993edf48bab106e7b54d
Component: engine
2016-10-26 06:07:42 +02:00
b4087aee32
Fix logging formatting
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com >
Upstream-commit: aa01ee4ac5b8bd2be25db06938533347223f30ba
Component: engine
2016-10-25 18:34:35 -07:00
8c5b951858
Merge pull request #27748 from amitkris/uprev_certificate_transparency
...
Uprev google/certificate-transparency to include Solaris support
Upstream-commit: 77f4c30a21ae029bc953d5f106ed8d955d21e244
Component: engine
2016-10-25 16:21:06 -07:00
f1ef328c6a
Merge pull request #27756 from vdemeester/21571-remove-kate-syntax-from-contrib
...
Remove unmaintained Dockerfile syntax for Kate
Upstream-commit: 05b1344ba692ec8673bb833a150421ac9bd5398d
Component: engine
2016-10-25 16:04:56 -07:00
4e3a88d804
Merge pull request #27751 from stevvooe/task-naming-correction
...
cluster/container: correctly name swarm tasks
Upstream-commit: 3dabad7992e7c75e880ae7b097cc6e119110a947
Component: engine
2016-10-25 15:56:46 -07:00
62c252366f
Merge pull request #27735 from justincormack/completions-tgz
...
Add shell completions to tgz
Upstream-commit: 280eadf9bfbe328d6f18aa46d5ba4bad1f3f1d2a
Component: engine
2016-10-25 15:46:45 -07:00
29eec9aad7
Remove unmaintained Dockerfile syntax for Kate
...
We don't support this and no maintainers uses Kate.
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: a2f695d7fae47481eba68b92b33257605e4cbada
Component: engine
2016-10-25 15:42:27 -07:00
7db4393674
Merge pull request #27620 from andrewhsu/fix-debian-stretch-apt-mirror
...
sed replace apt mirror with default deb.debian.org for debian distros
Upstream-commit: f7e2f8ac1c2a3a127595486ac00515bd051eac8f
Component: engine
2016-10-25 15:30:07 -07:00
ad6d3e7a11
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 >
Upstream-commit: 3b1af1751897680d32f4685e86d5dd1d9f3720b1
Component: engine
2016-10-25 14:17:57 -07:00
54d7e7421f
Merge pull request #27503 from Microsoft/validcredspec
...
Windows: Add cred spec test with well form credentials
Upstream-commit: 6e462412d721525ee85f8a8874e933f16d0a27ce
Component: engine
2016-10-25 13:44:52 -07:00
c0eb6c852a
Merge pull request #27747 from Microsoft/jjh/clientisolationcomment
...
Windows: Add comment for containers on client SKUs
Upstream-commit: ff6db320f8a411d4a8b36a89ac28a85c453905ea
Component: engine
2016-10-25 13:37:25 -07:00
5572f883e7
Merge pull request #27698 from tonistiigi/cluster-config-refactor
...
Refactor swarm node config to struct
Upstream-commit: 844a3166e5c8ea5037a658f1e8f0628f5abc8dce
Component: engine
2016-10-25 13:29:55 -07:00
c0d067f26a
sed replace apt mirror with default deb.debian.org for debian distros
...
Signed-off-by: Andrew Hsu <andrewhsu@docker.com >
Upstream-commit: dbe17defd15d16d1d85d794c8beaea595df1d0ba
Component: engine
2016-10-25 13:25:21 -07:00
c457ba5205
Uprev google/certificate-transparency to include Solaris support
...
Signed-off-by: Amit Krishnan <krish.amit@gmail.com >
Upstream-commit: 16db092af2b5a58c41898f275638203470612be9
Component: engine
2016-10-25 13:14:57 -07:00
2b500e63cb
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 >
Upstream-commit: 01d3a16f58118a3f6a6207fcb028bb279eb16e73
Component: engine
2016-10-25 12:34:25 -07:00
8309d31c1c
Merge pull request #27644 from Microsoft/jjh/builderslash
...
Windows: Honour escape directive fully
Upstream-commit: 0797e3f61a0402112c00de7b4042fdf3093050a7
Component: engine
2016-10-25 11:52:13 -07:00
3cec9f9cd6
Merge pull request #27690 from Microsoft/service
...
mkdirall on the PID file path
Upstream-commit: 0dfa306cdd3f438387131d0052f6f8c0c2e7ceb7
Component: engine
2016-10-25 11:15:46 -07:00
f83bc80e97
Windows: Add comment re client containers
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: 87ab13add40ef616dbfc1cd00742f650343869cc
Component: engine
2016-10-25 10:30:00 -07:00
ca14deb769
Add integration tests for build with network opts
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com >
Upstream-commit: e3b48fca0db71cc24270dcf254590541279980d4
Component: engine
2016-10-25 10:25:42 -07:00
29210e7b5b
add --network option for docker build
...
Signed-off-by: sandyskies <chenmingjie0828@163.com >
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com >
Upstream-commit: 60813af7aeea819ca228b6b1d6f4888969b95da3
Component: engine
2016-10-25 10:25:36 -07:00
ccce8d9194
mkdirall on the PID file path
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: 745f3ece53cc037030c0618f75f2cd551baa1b6c
Component: engine
2016-10-25 09:11:20 -07:00
a3de26010f
Merge pull request #27525 from AkihiroSuda/prune-network-cluster
...
add `docker network prune`
Upstream-commit: 11cd64f0dce35ad897ede7eb29babdc487e99617
Component: engine
2016-10-25 09:02:28 -07:00
c9ec2e296d
Merge pull request #27716 from sdurrheimer/zsh-completion-daemon-shutdown-timeout
...
Add zsh completion for 'dockerd --shutdown-timeout'
Upstream-commit: 95b459df6d87e1820675e77c85aa7703ca7aaef1
Component: engine
2016-10-25 08:58:34 -07:00
24c6a05fd5
Merge pull request #27715 from sdurrheimer/zsh-completion-create-run-stop-timeout
...
Add zsh completion for 'docker {create,run} --stop-timeout'
Upstream-commit: c851aea2b6fe01927f7c7631ca401ca56cf4cf4e
Component: engine
2016-10-25 08:58:18 -07:00
ea2938292a
Merge pull request #27519 from justincormack/proxy-build
...
Build docker-proxy from git checkout like other external binaries
Upstream-commit: 36f47aa2527f83d7ca7254c43eb08ffc5ce1102e
Component: engine
2016-10-25 08:54:13 -07:00
e24e6d4206
Merge pull request #27467 from tonistiigi/attach-cb
...
Move stdio attach from libcontainerd backend to callback
Upstream-commit: 8ed31089c03c36954e95c2066b1f3724e2d5c849
Component: engine
2016-10-25 16:23:07 +02:00
2b6cc62479
Merge pull request #27721 from albers/completion-dockerd--experimental
...
Add bash completion for `dockerd --experimental`
Upstream-commit: 9643f0e816d81785b68c002115b2a29d8462e1ed
Component: engine
2016-10-25 07:10:23 -07:00
4e4935cee2
Merge pull request #27717 from sdurrheimer/zsh-completion-fix-exec-env
...
Fix zsh completion for 'docker exec --env'
Upstream-commit: e1c04514dd7fdefa7fc46cc88c8f2c7741210664
Component: engine
2016-10-25 06:51:06 -07:00
30025daf04
Add shell completions to tgz
...
Signed-off-by: Justin Cormack <justin.cormack@docker.com >
Upstream-commit: 1c6f5b5fff92fcb6220da7b9422f4d6134985fdf
Component: engine
2016-10-25 13:43:55 +01:00
44e77a4b4f
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 >
Upstream-commit: 3996975b0840033bda3919440d122d734a4bc66b
Component: engine
2016-10-25 13:13:22 +01:00
8c365fa5ad
Add zsh completion for 'dockerd --experimental'
...
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com >
Upstream-commit: 11b6c4c58a5fe46bc2094276dcc27b552b607398
Component: engine
2016-10-25 11:26:39 +02:00
757c98f6b1
Add bash completion for dockerd --experimental
...
Signed-off-by: Harald Albers <github@albersweb.de >
Upstream-commit: e63f19653661c3d39a5d4fccf6e335cdb5ed2c6b
Component: engine
2016-10-25 10:04:48 +02:00
b218d45d9c
Fix zsh completion for 'docker exec --env'
...
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com >
Upstream-commit: 94b6376ee5c9ccb52bbab9101360cfe97727b4b1
Component: engine
2016-10-25 09:05:07 +02:00
e853b13d88
Add zsh completion for 'dockerd --shutdown-timeout'
...
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com >
Upstream-commit: 20890b4aadad4deb52d3896572b32c550fd369f0
Component: engine
2016-10-25 08:59:23 +02:00
eaf4354320
Add zsh completion for 'docker {create,run} --stop-timeout'
...
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com >
Upstream-commit: 34f5d97468ca92c2209312205b0637a96c39a593
Component: engine
2016-10-25 08:55:00 +02:00
4fb550ce0f
add docker network prune
...
`docker network prune` prunes unused networks, including overlay ones.
`docker system prune` also prunes unused networks.
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp >
Upstream-commit: 7e24c16086a9a4f38e241e51837f2be4877c04a6
Component: engine
2016-10-25 06:43:54 +00:00
999dfab48f
Merge pull request #27526 from AkihiroSuda/update-network-inspect-doc
...
[doc] update docs/reference/commandline/network_inspect.md
Upstream-commit: 28ef366ceab60d6ff15b343171da6ff2d5d0992e
Component: engine
2016-10-24 21:21:54 -07:00
0780040018
update docs/reference/commandline/network_inspect.md
...
The following sentences (introduced in v1.11 via #21160 ) were misleading for Swarm mode services (>= v1.12)
For networks backed by multi-host network driver, such as Overlay,
this command also shows the container endpoints in other hosts in the
cluster. These endpoints are represented as "ep-{endpoint-id}" in the output.
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp >
Upstream-commit: 2c288e60db1ecd47842e92432fbe0ab367033374
Component: engine
2016-10-25 02:46:59 +00:00
db3c1eebdd
Merge pull request #27699 from yongtang/27695-info-duplicate-nat-null-plugin
...
Remove duplicate `nat`, `null` in `docker info` for Windows
Upstream-commit: f901c5ed1c76d507a09079935e680f8c5bdd9070
Component: engine
2016-10-24 18:41:34 -07:00
082a38d3c8
Merge pull request #27703 from aaronlehmann/fix-test-name
...
integration-cli: Fix style of swarm test name
Upstream-commit: 4882c263c6223ace5272c6d5c203c79e73e6ffcb
Component: engine
2016-10-24 18:23:33 -07:00
