71c5edc2e8
Windows: Fix stats CLI
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: 2894d07696a3160c5f6f372e69b241386bb82c94
Component: engine
2016-10-25 19:57:47 -07: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
f2841d5298
Fix overlay unmount for the root case
...
In root case no mount call or reference count
increment actually happens so don’t try to unmount.
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com >
Upstream-commit: e4349ad90114c741c729046f7749f0c2fde415c9
Component: engine
2016-10-25 14:40:13 -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
96c1288dd9
add scheme to fluentd-address
...
Signed-off-by: Akira Koyasu <mail@akirakoyasu.net >
- add scheme to fluentd-address
- define a new type `location`
- use `errors.Wrapf`
Upstream-commit: cb176c848e0731f77fa48b4e1a90ae74d1f2deae
Component: engine
2016-10-26 03:36:51 +09: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
3d47c37926
Redirect powershell completion
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: 65fdbf0210e8faa1598515a7fd7ef4ed33d68d43
Component: engine
2016-10-25 09:48:53 -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
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
1e590ce972
Add support for multiple containers to bash completion for docker pause
...
Signed-off-by: Harald Albers <github@albersweb.de >
Upstream-commit: 2e44e74874e721d7bc635b91b6870f5d000be177
Component: engine
2016-10-25 14:24:59 +02:00
2c4abfd9cc
Add bash completion for docker export --output
...
Signed-off-by: Harald Albers <github@albersweb.de >
Upstream-commit: 3ac19862f2a797d8136e0248615fe16d6cc2faeb
Component: engine
2016-10-25 14:18:13 +02: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
7b5e480927
Move bash completion logic to new subcommand: tag
...
Signed-off-by: Harald Albers <github@albersweb.de >
Upstream-commit: 28469b572033e2a0cd3509d1789dc70a63e2a141
Component: engine
2016-10-25 09:57:47 +02:00
94d4fdd472
Move bash completion logic to new subcommand: save
...
Signed-off-by: Harald Albers <github@albersweb.de >
Upstream-commit: 18e8c59fbbf2356d502982f1051ea6dc60a3113f
Component: engine
2016-10-25 09:57:47 +02:00
6054af3621
Move bash completion logic to new subcommand: rmi
...
Signed-off-by: Harald Albers <github@albersweb.de >
Upstream-commit: 01c259e08a43679e6cd406d236b1da48ad1e7204
Component: engine
2016-10-25 09:57:47 +02:00
1e98008b15
Move bash completion logic to new subcommand: push
...
Signed-off-by: Harald Albers <github@albersweb.de >
Upstream-commit: 2d139df59cc2791ef3c343f773311aa3ae000413
Component: engine
2016-10-25 09:57:47 +02:00
d190c409fe
Move bash completion logic to new subcommand: pull
...
Signed-off-by: Harald Albers <github@albersweb.de >
Upstream-commit: 6864f3ae5a3acb127fe4199540d789fba1ef0bd4
Component: engine
2016-10-25 09:57:47 +02:00
915231aaf9
Move bash completion logic to new subcommand: images
...
Signed-off-by: Harald Albers <github@albersweb.de >
Upstream-commit: df486631bcaff7cb54f5e326f687085724e8de79
Component: engine
2016-10-25 09:57:47 +02:00
af1d3eba23
Move bash completion logic to new subcommand: load
...
Signed-off-by: Harald Albers <github@albersweb.de >
Upstream-commit: 75aede3a7c23385a7cc44c81710a6e790199870e
Component: engine
2016-10-25 09:57:47 +02:00
73e8ea8277
Delegate bash completion for docker {container,image} inspect to parameterized function
...
In #23614 `docker inspect` was semantically enhanced to inspect "everything".
Therefore moving its logic to `_docker_container_inspect` was not correct.
This commit moves it back to its original top-level location (`_docker_inspect`)
so that it can be called by `_docker_{container,image}_inspect` and others (will
be added in follow-up PRs).
Parameterization was added in order to get caller-specific behavior.
Signed-off-by: Harald Albers <github@albersweb.de >
Upstream-commit: 9eb1f554028aab84beaed0d5ff6ecbcbd3848594
Component: engine
2016-10-25 09:57:38 +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
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
John Howard
Tonis Tiigi
Sebastiaan van Stijn
Michael Crosby
Vincent Demeester
Tibor Vass
Stephen J Day
Brian Goff
John Howard
Alexander Morozov
Andrew Hsu
Amit Krishnan
Yong Tang
Akira Koyasu
sandyskies
Antonio Murdaca
Kenfe-Mickaël Laventure
Justin Cormack
Harald Albers
Steve Durrheimer
Akihiro Suda