GordonTheTurtle
db335a4398
Merge component 'packaging' from git@github.com:docker/docker-ce-packaging master
2018-05-18 17:07:05 +00:00
GordonTheTurtle
3aa2f160d0
Merge component 'engine' from git@github.com:moby/moby master
2018-05-18 17:06:57 +00:00
GordonTheTurtle
f2fa4c2c77
Merge component 'cli' from git@github.com:docker/cli master
2018-05-18 16:41:34 +00:00
Sebastiaan van Stijn
1bbbe71c5b
Merge pull request #35410 from soulshake/soulshake-precpu-to-percpu-api-docs
...
Replace 'precpu' with 'percpu' in API docs.
Upstream-commit: 1ae8ca9e0c56b4aec8c0684bc9e20b8291d622f8
Component: engine
2018-05-18 17:26:37 +02:00
Mauro Porras P
771b7b3484
Minor fix: "stdin" instead of "stding"
...
Signed-off-by: Mauro Porras P <mauroporrasp@gmail.com >
Upstream-commit: acf3d2d95a
Component: cli
2018-05-18 08:48:42 -05:00
Vincent Demeester
0e83593715
Merge pull request #1065 from thaJeztah/fix-kube-alignment
...
Fix component information alignment
Upstream-commit: b15c3cfec9
Component: cli
2018-05-18 14:54:42 +02:00
Sebastiaan van Stijn
1dc5256c77
Fix component information alignment
...
The `docker version` output now uses a tabwriter, so use single
tabs to print the output.
Before this change:
Server:
Engine:
Version: 18.05.0-ce
API version: 1.37 (minimum version 1.12)
Go version: go1.10.1
Git commit: f150324
Built: Wed May 9 22:20:16 2018
OS/Arch: linux/amd64
Experimental: true
Kubernetes:
Version: v1.9.6
StackAPI: v1beta2
After this change:
Server:
Engine:
Version: 18.05.0-ce
API version: 1.37 (minimum version 1.12)
Go version: go1.10.1
Git commit: f150324
Built: Wed May 9 22:20:16 2018
OS/Arch: linux/amd64
Experimental: true
Kubernetes:
Version: v1.9.6
StackAPI: v1beta2
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: 26d8122594
Component: cli
2018-05-18 14:46:23 +02:00
Sebastiaan van Stijn
baeeaceada
Merge pull request #1034 from mat007/kubernetes-orchestrator-query-ucp
...
Better user experience with Kubernetes namespaces for UCP
Upstream-commit: 7de6aaec17
Component: cli
2018-05-18 14:39:44 +02:00
Mathieu Champlon
b6e3522638
Query UCP Kubernetes user namespaces endpoint
...
Signed-off-by: Mathieu Champlon <mathieu.champlon@docker.com >
Upstream-commit: bd20885ac8
Component: cli
2018-05-18 11:44:15 +02:00
Mathieu Champlon
802dab1037
Bump moby to d37f5c6bdf788a6cb82c07fb707e31a240eff5f9
...
Also bringing:
. golang.org/x/net 5561cd9b4330353950f399814f427425c0a26fd2
. github.com/docker/distribution 83389a148052d74ac602f5f1d62f86ff2f3c4aa5
. github.com/docker/swarmkit bd69f6e8e301645afd344913fa1ede53a0a111fb
. github.com/docker/go-metrics d466d4f6fd960e01820085bd7e1a24426ee7ef18
. github.com/prometheus/client_golang 52437c81da6b127a9925d17eb3a382a2e5fd395e
. github.com/beorn7/perks 4c0e84591b9aa9e6dcfdf3e020114cd81f89d5f9
. github.com/prometheus/client_model fa8ad6fec33561be4280a8f0514318c79d7f6cb6
. github.com/prometheus/common ebdfc6da46522d58825777cf1f90490a5b1ef1d8
. github.com/prometheus/procfs abf152e5f3e97f2fafac028d2cc06c1feb87ffa5
. github.com/matttproud/golang_protobuf_extensions v1.0.0
Signed-off-by: Mathieu Champlon <mathieu.champlon@docker.com >
Upstream-commit: 5d54584f03
Component: cli
2018-05-18 11:44:14 +02:00
Sebastiaan van Stijn
48d3d7fdc0
Merge pull request #1063 from nkwangleiGIT/master
...
Update some document links of help markdown files
Upstream-commit: 3c45963646
Component: cli
2018-05-18 11:34:17 +02:00
Eli Uriegas
5e0facecb2
Remove Debian Wheezy, EOL 31-05-2018
...
Debian Wheezy will be EOL on 31-05-2018 per the official documentation,
https://wiki.debian.org/LTS
Signed-off-by: Eli Uriegas <eli.uriegas@docker.com >
Upstream-commit: 0e45aed95d86bc516b9cd05f3316073e8dda0a0b
Component: packaging
2018-05-17 22:22:04 +00:00
Eli Uriegas
5269a56d32
Merge pull request #106 from seemethere/remove_f26
...
Remove Fedora 26
Upstream-commit: 4fc747eac9a6828ec94094dac442ba3f72192251
Component: packaging
2018-05-17 15:21:01 -07:00
Eli Uriegas
49df6e1d6f
Merge pull request #107 from seemethere/reflect
...
Make DOCKER_BUILD_PKGS reflective
Upstream-commit: b523944cf7a026b0b674b2580f4c635fb6660e26
Component: packaging
2018-05-17 15:10:11 -07:00
Anusha Ragunathan
e4bec6da7c
Merge pull request #37084 from nwneisen/update-ring-buffer-documents
...
Update documentation for RingLogger's ring buffer
Upstream-commit: 59698778fe9301225c456886f7b67d2e43703a05
Component: engine
2018-05-17 12:10:44 -07:00
GordonTheTurtle
3f80548421
Merge component 'engine' from git@github.com:moby/moby master
2018-05-17 17:05:10 +00:00
GordonTheTurtle
01a80b2713
Merge component 'cli' from git@github.com:docker/cli master
2018-05-17 16:41:20 +00:00
Vincent Demeester
3d5979d637
Merge pull request #37075 from tuscloud/fix-typos
...
Fix typos
Upstream-commit: 9aac187ce1592249ab5f1556d362f2b48ff9c671
Component: engine
2018-05-17 16:00:43 +02:00
Vincent Demeester
16c7354fa4
Merge pull request #37074 from skyc024/fix-typos
...
Fix typos
Upstream-commit: 6a9bcc51df541ea0dedf038e8e88fe556239ef70
Component: engine
2018-05-17 16:00:26 +02:00
AJ Bowen
17b1295241
Highlight meaning of 'precpu' (i.e. 'previous').
...
Signed-off-by: AJ Bowen <aj@soulshake.net >
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: b7fe0b6359dcbefd269c13ee4649d9247539cd18
Component: engine
2018-05-17 14:57:44 +02:00
Sebastiaan van Stijn
d1519025fc
Merge pull request #1061 from eiais/fishupdate
...
Update Events, Exec, Export, History, Images, Import, Inspect, Load, and Login subcommand fish completions
Upstream-commit: 6bab4a2a94
Component: cli
2018-05-17 14:50:29 +02:00
Vincent Demeester
f14d2550f6
Merge pull request #37071 from mat007/custom-request
...
Extend client API with custom HTTP requests
Upstream-commit: d37f5c6bdf788a6cb82c07fb707e31a240eff5f9
Component: engine
2018-05-17 11:09:49 +02:00
Nick Neisen
7321d16dc7
Update documentation for RingLogger's ring buffer
...
Signed-off-by: Nick Neisen <nwneisen@gmail.com >
Upstream-commit: 3521d534e5c9338ae5605d1228554862e922a8a9
Component: engine
2018-05-16 18:52:50 -06:00
Ying Li
7fa75adc44
Document that reserved namespaces org.docker.*, io.docker.*, and
...
org.dockerproject.* in engine labels are now deprecated.
Signed-off-by: Ying Li <ying.li@docker.com >
Upstream-commit: 7470d460f6
Component: cli
2018-05-16 14:06:37 -07:00
Sebastiaan van Stijn
cbe1e262f7
Merge pull request #974 from simonferquel/compose-kube-env-expansion
...
[K8s] Do env-variable expansion on the uninterpreted Config files
Upstream-commit: bac0d8f353
Component: cli
2018-05-16 20:18:41 +02:00
wanglei
6f83cf6fa8
Developer Certificate of Origin
...
Version 1.1
Copyright (C) 2004, 2006 The Linux Foundation and its contributors.
1 Letterman Drive
Suite D4700
San Francisco, CA, 94129
Everyone is permitted to copy and distribute verbatim copies of this
license document, but changing it is not allowed.
Developer's Certificate of Origin 1.1
By making a contribution to this project, I certify that:
(a) The contribution was created in whole or in part by me and I
have the right to submit it under the open source license
indicated in the file; or
(b) The contribution is based upon previous work that, to the best
of my knowledge, is covered under an appropriate open source
license and I have the right under that license to submit that
work with modifications, whether created in whole or in part
by me, under the same open source license (unless I am
permitted to submit under a different license), as indicated
in the file; or
(c) The contribution was provided directly to me by some other
person who certified (a), (b) or (c) and I have not modified
it.
(d) I understand and agree that this project and the contribution
are public and that a record of the contribution (including all
personal information I submit with it, including my sign-off) is
maintained indefinitely and may be redistributed consistent with
this project or the open source license(s) involved.
Signed-off-by: nkwangleiGIT <nkwanglei@126.com >
Upstream-commit: b6def77c55
Component: cli
2018-05-16 20:16:08 +08:00
Vincent Demeester
72379c4a70
Merge pull request #37076 from arm64b/TestExecInteractiveStdinClose
...
Fix flaky test case of `TestExecInteractiveStdinClose`
Upstream-commit: b7b6b6929c6436145bd12e6fef7efb7d01fa170b
Component: engine
2018-05-16 09:51:28 +02:00
chenyuzhu
7d44629ea2
Fix typos
...
Signed-off-by: chenyuzhu <chenyuzhi@oschina.cn >
Upstream-commit: 5ac0d2f0b83e65f49b490e9d20c7a5b0e65f8e55
Component: engine
2018-05-16 15:31:12 +08:00
Tibor Vass
cd4f86fbb3
Merge pull request #37064 from tonistiigi/jsonmessage-aux
...
jsonmessage: pass message to aux callback
Upstream-commit: ab3cdd2b1bc1f6c2410a1ca28d0034eb6edcd1ef
Component: engine
2018-05-15 20:50:19 -10:00
Mathieu Champlon
422bb44235
Make client underlying HTTP client accessible
...
Signed-off-by: Mathieu Champlon <mathieu.champlon@docker.com >
Upstream-commit: 5a84124739a809bcdb5830fd385440027ddd910f
Component: engine
2018-05-16 05:24:11 +02:00
Dennis Chen
42dc03897a
Fix flaky test case of TestExecInteractiveStdinClose
...
This issue has been reported by issue #36877 .
The purpose of this test case is for the regression test of #12546 ,
so we only need to make sure the essential of the testing is still
in the way to check that while not disturbed by some testing noises,
which is exactly what this PR want to do.
Signed-off-by: Dennis Chen <dennis.chen@arm.com >
Upstream-commit: 96abf9f59ebd350cc9a70034b4d30279e6ae04e4
Component: engine
2018-05-16 10:01:44 +08:00
weipeng
9e6796b652
Fix typos
...
Signed-off-by: weipeng <weipeng@tuscloud.io >
Upstream-commit: f781ec45b5c1745279f0429c2b7f19c793efcb85
Component: engine
2018-05-16 09:15:43 +08:00
Anda Xu and Tibor Vass
a24b673f22
fix and skip some tests based on API version
...
Signed-off-by: Anda Xu <anda.xu@docker.com >
Co-authored-by: Anda Xu <anda.xu@docker.com >
Co-authored-by: Tibor Vass <tibor@docker.com >
Upstream-commit: e440831802a500b28ecf16c2627a294dc31dfeb9
Component: engine
2018-05-15 16:05:04 -07:00
Anusha Ragunathan
24dab0a4ea
Merge pull request #36971 from emanb29/6478-documentHostIP
...
Describe IP field of Port definition
Upstream-commit: 85a8252c47538ac90c30090574b6e9f1795bb6b7
Component: engine
2018-05-15 11:48:44 -07:00
GordonTheTurtle
e191ac7ace
Merge component 'packaging' from git@github.com:docker/docker-ce-packaging master
2018-05-15 17:07:36 +00:00
GordonTheTurtle
6efa476216
Merge component 'engine' from git@github.com:moby/moby master
2018-05-15 17:07:29 +00:00
GordonTheTurtle
233d1d1cd2
Merge component 'cli' from git@github.com:docker/cli master
2018-05-15 16:41:42 +00:00
Mathieu Champlon
7a57bbc2b9
Support multiple namespaces for docker stack ls
...
Signed-off-by: Mathieu Champlon <mathieu.champlon@docker.com >
Upstream-commit: 84241cc393
Component: cli
2018-05-15 16:52:21 +02:00
Mathieu Champlon
46fae6da7e
Support 'all' in orchestrator flag for docker stack ls
...
All other docker stack commands report an error when passed this value.
Signed-off-by: Mathieu Champlon <mathieu.champlon@docker.com >
Upstream-commit: 4d947de292
Component: cli
2018-05-15 15:38:41 +02:00
Vincent Demeester
c4764c184a
Fix logging test type
...
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: 25494e4c74f31551ef06e6e2df4e1119cd83250e
Component: engine
2018-05-15 15:04:46 +02:00
Sebastiaan van Stijn
6c90b56fe9
Merge pull request #37051 from wagoodman/patch-1
...
image spec v1 formatting fix
Upstream-commit: 04864cb3cb526ddeee70dc6e17a6c7802ef91a0b
Component: engine
2018-05-15 14:00:53 +02:00
Sebastiaan van Stijn
131639fdf7
Merge pull request #37028 from cpuguy83/log_plugin_broken_pipe
...
Fix logging plugin crash unrecoverable
Upstream-commit: 6821ffd1a11f188d6b1c3e8da01885768e027586
Component: engine
2018-05-15 13:57:01 +02:00
Sebastiaan van Stijn
9ebdda8c43
Merge pull request #37033 from cpuguy83/some_container_network_cleanups
...
Some container/network cleanups
Upstream-commit: 6f68db8c7a94489b5e66bb828f748d0baa2e5c22
Component: engine
2018-05-15 13:23:41 +02:00
emanb29
8373fcb573
Describe IP field of Port definition
...
Signed-off-by: Ethan Bell <ebgamer29@gmail.com >
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: 13e0b2651082878f8f17669df3f97ab252a9e095
Component: engine
2018-05-15 12:09:42 +02:00
Sebastiaan van Stijn
14395e1de7
Merge pull request #37062 from cpuguy83/fix_logs_daemon_race
...
Fix race conditions in logs API
Upstream-commit: 07dc3aa685ffd500ada1c41f8a9b7eaf74cf09eb
Component: engine
2018-05-15 11:59:40 +02:00
Vincent Demeester
f2fea2ebf4
Merge pull request #37063 from cpuguy83/fix_log_rotation_issue
...
Fix some issues in logfile reader and rotation
Upstream-commit: 26da99e326bf7cbfad820395f5379bba7a66c4a5
Component: engine
2018-05-15 11:46:29 +02:00
Vincent Demeester
e35dd65158
Merge pull request #37044 from yongtang/03112018-TestDockerNetworkConnectAlias-name
...
Avoid unique name usage in TestDockerNetworkConnectAlias
Upstream-commit: 829dcefa9d090f5101947ee14074d1f37e44468b
Component: engine
2018-05-15 11:46:11 +02:00
Vincent Demeester
4347082deb
Merge pull request #37060 from cpuguy83/fix_swagger_gen
...
Fix swagger volume type generation
Upstream-commit: bcd86fc2acd3ef22a7fc6c662c7ae8a67b0bb4f4
Component: engine
2018-05-15 11:46:02 +02:00
Mathieu Champlon
c4cff872f5
Fix typo in golden file name
...
Signed-off-by: Mathieu Champlon <mathieu.champlon@docker.com >
Upstream-commit: 0d7bb8adaa
Component: cli
2018-05-15 10:09:47 +02:00
Tonis Tiigi
3a0e583232
jsonmessage: pass message to aux callback
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com >
Upstream-commit: f784907eae4f2e8bd4d9dea3d45c790c92689f3d
Component: engine
2018-05-14 15:48:25 -07:00