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
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
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
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
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
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
cf0e8d8d85
Merge pull request #24533 from yongtang/24392-docker-info-label-duplicate-keys
...
Remove duplicate keys in labels of `docker info`
Upstream-commit: 411e7b4416fbac0601db1fa28b5152c23fcaf7bb
Component: engine
2016-10-24 18:12:28 -07:00
b9b1cc3362
Merge pull request #27697 from amitkris/fix_units_import
...
Correct go-units import in cli/command/formatter/stats.go
Upstream-commit: ec30cf4f14d8f8536b1b7b81e2992eb5c7021b1c
Component: engine
2016-10-24 16:59:15 -07:00
11895badbe
Merge pull request #27223 from mlaventure/merge-experimental
...
Make experimental a runtime flag
Upstream-commit: ba41a5edac16857121779434cd80b86dcdb0ffda
Component: engine
2016-10-24 16:58:32 -07:00
eb042db21d
integration-cli: Fix style of swarm test name
...
A recent change fixed integration tests to use "API" in test names
instead of "Api". A new test was added in a PR opened before this
change, and didn't benefit from the cleanup. Fix its name.
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com >
Upstream-commit: 073d8115871f15ad36b6ab34e2af1f8f22ec333f
Component: engine
2016-10-24 16:45:17 -07:00
179ef095e3
Refactor swarm node config to struct
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com >
Upstream-commit: b1014428c11a5495e713f2ab6df5aae45e8a46a6
Component: engine
2016-10-24 16:36:50 -07:00
4e1fb8f8f9
Merge pull request #27624 from erxian/remove-duplicate-err-judgement
...
remove duplicated error judgement in cluster.go
Upstream-commit: 09985ad89741dcc7cf0f8add500189d09d484b61
Component: engine
2016-10-24 16:11:53 -07:00
9798db7e18
Remove duplicate nat, null in docker info for Windows
...
This fix tries to address the issue raised in 27695 where
duplicate `nat` and `null` has been listed in `docker info`
for Windows.
Signed-off-by: Yong Tang <yong.tang.github@outlook.com >
Upstream-commit: 3347aba95762955fe17916e8cfc66aabbd6d66d6
Component: engine
2016-10-24 15:21:14 -07:00
9a299b360f
Make experimental a runtime flag
...
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com >
Upstream-commit: 7781a1bf0fef748877326632b88e92fbf3c90daa
Component: engine
2016-10-24 15:20:01 -07:00
cd0bcedad7
Correct go-units import in cli/command/formatter/stats.go
...
from src/github.com/docker/go-units -> github.com/docker/go-units
Signed-off-by: Amit Krishnan <krish.amit@gmail.com >
Upstream-commit: cf8a667b8d84a596a27c51608a529115b68647cc
Component: engine
2016-10-24 15:06:58 -07:00
dee80812af
Merge pull request #26354 from KingEmet/fixbranch
...
make GetAll use client.List as the source of truth
Upstream-commit: 67b85f9d26f1b0b2b240f2d794748fac0f45243c
Component: engine
2016-10-24 14:25:24 -07:00
c42c998198
Merge pull request #26848 from miaoyq/del-a-redundant-err-return
...
Delete a redundant error return
Upstream-commit: 0ab13dda66613c403a06d69f8aff5d4b2e3b289e
Component: engine
2016-10-24 11:27:08 -07:00
efd79c3c13
Merge pull request #27578 from yuexiao-wang/update-network
...
Fix the incorrect links in the document about network and service
Upstream-commit: 96efb2cf25394b1589aced296e27f3928dc9c229
Component: engine
2016-10-24 08:05:04 -07:00
6eaaf1f7ae
Fix the incorrect links in the document about network and service
...
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn >
Upstream-commit: 49e8c3d8d0c24a4a550732e4c4377646330e2e44
Component: engine
2016-10-24 22:01:38 +08:00
1883869e16
Move stdio attach from libcontainerd backend to callback
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com >
Upstream-commit: 37a3be2449d2a314305615ffcc287a598a829dba
Component: engine
2016-10-24 00:20:36 -07:00
4e59434f98
Merge pull request #27546 from yuexiao-wang/fix-subtitle
...
Update the subtitle for stack ps
Upstream-commit: b2786a388817784e8abde3da1b67e50b58cc8b7a
Component: engine
2016-10-23 22:28:43 -07:00
65f0de5a38
Windows dockerfile: Changes to support git 2.10.1
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: 929fa9ff8075d91624a90ecaae9c1fd31e50c294
Component: engine
2016-10-22 13:07:28 -07:00
04213eed5f
Merge pull request #27616 from Microsoft/jjh/microsoftprefix
...
Windows: Overhaul Dockerfile.windows and test image name
Upstream-commit: 935d4d1c179259a262eb15fbf7e2bba2df26d740
Component: engine
2016-10-22 13:01:40 -07:00
