af422f8bde
Merge component 'engine' from git@github.com:moby/moby master
2018-05-20 17:06:15 +00:00
c03259c23d
Merge pull request #37022 from cgxu519/overlayutils-addmsg
...
Add additional message when backendfs is extfs without d_type support
Upstream-commit: f9dd74deee364dd513615ea112e78008a946b3e5
Component: engine
2018-05-19 22:38:45 +02:00
3b0918309f
Merge pull request #37088 from ohbarye/fix-typos-duplicated-the
...
Fix typos: remove duplicated "the"
Upstream-commit: 3646562a5cfbf93f987d0ccffe7ca1c3487036e2
Component: engine
2018-05-19 20:57:47 +02:00
1ed95ff31a
Merge pull request #37091 from thaJeztah/fix-linting-errors
...
Fix some linting issues
Upstream-commit: 1b75e175842e5ef59284a1c8ca7d64e4d6b62384
Component: engine
2018-05-19 08:39:39 -10:00
71deb21459
Merge pull request #37104 from seemethere/rem
...
Remove references to old release process
Upstream-commit: 76e43532f60355220619b5ff808c0d2cd4bd624b
Component: engine
2018-05-18 21:21:44 +02:00
8729f289fc
Merge pull request #37101 from TetsujinOni/local-escape-typo
...
Rewrote data-root escape error message
Upstream-commit: 7195df32062bf57e9f0f86d3b03453ed0b7508b5
Component: engine
2018-05-18 14:56:48 -04:00
7a1680b13a
Remove references to old release process
...
This hasn't been the way to release Docker for the past year so let's
just remove them altogether
Signed-off-by: Eli Uriegas <eli.uriegas@docker.com >
Upstream-commit: 80bc8b4766cc808186af91930152d78afb22aef8
Component: engine
2018-05-18 18:28:43 +00:00
db335a4398
Merge component 'packaging' from git@github.com:docker/docker-ce-packaging master
2018-05-18 17:07:05 +00:00
3aa2f160d0
Merge component 'engine' from git@github.com:moby/moby master
2018-05-18 17:06:57 +00:00
f2fa4c2c77
Merge component 'cli' from git@github.com:docker/cli master
2018-05-18 16:41:34 +00:00
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
a57d540856
Amended per cleanup request.
...
Signed-off-by: Jonathan Choy <oni@tetsujinlabs.com >
Upstream-commit: e4186ba7087b61e1d770fa087cd46729bbfda32e
Component: engine
2018-05-18 11:09:35 -04:00
f415b9c697
Merge pull request #1066 from mauroporrasp/patch-1
...
Minor fix: "stdin" instead of "stding"
Upstream-commit: 824ce49aff
2018-05-18 16:39:50 +02:00
771b7b3484
Minor fix: "stdin" instead of "stding"
...
Signed-off-by: Mauro Porras P <mauroporrasp@gmail.com >
Upstream-commit: acf3d2d95a
2018-05-18 08:48:42 -05:00
0e83593715
Merge pull request #1065 from thaJeztah/fix-kube-alignment
...
Fix component information alignment
Upstream-commit: b15c3cfec9
2018-05-18 14:54:42 +02:00
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: f150324f150324github@gone.nl >
Upstream-commit: 26d8122594
2018-05-18 14:46:23 +02:00
baeeaceada
Merge pull request #1034 from mat007/kubernetes-orchestrator-query-ucp
...
Better user experience with Kubernetes namespaces for UCP
Upstream-commit: 7de6aaec17
2018-05-18 14:39:44 +02:00
b6e3522638
Query UCP Kubernetes user namespaces endpoint
...
Signed-off-by: Mathieu Champlon <mathieu.champlon@docker.com >
Upstream-commit: bd20885ac8
2018-05-18 11:44:15 +02:00
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
2018-05-18 11:44:14 +02:00
48d3d7fdc0
Merge pull request #1063 from nkwangleiGIT/master
...
Update some document links of help markdown files
Upstream-commit: 3c45963646
2018-05-18 11:34:17 +02:00
c3521e7da6
Add additional message when backendfs is extfs without d_type support
...
ext4 support d_type by default, but filetype feature is a tunable so
there is still a chance to disable it for some reasons. In this case,
print additional message to explicitly tell how to support d_type.
Signed-off-by: Chengguang Xu <cgxu519@gmx.com >
Upstream-commit: 8a21b128d4deb874c05eb81ebbc1265175ad69ba
Component: engine
2018-05-18 10:32:47 +08:00
17f09f5a4d
Rewrote data-root escape error message
...
Signed-off-by: Jonathan Choy <jonathan.j.choy@gmail.com >
Upstream-commit: 1845cd0d86f0c85115bbf7cdc806c114096751a9
Component: engine
2018-05-17 21:52:03 -04:00
8e669c6a70
Merge pull request #108 from seemethere/wheezy
...
Remove Debian Wheezy, EOL 31-05-2018
Upstream-commit: 98df9315ccf80b18546921968f3881080fa6ccf0
Component: packaging
2018-05-17 18:47:26 -07:00
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
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
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
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
7f78f7fe15
Fix some linting issues
...
These showed locally when running `make validate`. CI doesn't seem to have the
same (possibly it's disabled in the configuration)
builder/fscache/fscache.go:618::error: github.com/docker/docker/vendor/github.com/tonistiigi/fsutil.StatInfo composite literal uses unkeyed fields (vet)
client/swarm_unlock_test.go:44::error: github.com/docker/docker/api/types/swarm.UnlockRequest composite literal uses unkeyed fields (vet)
client/swarm_unlock_test.go:20::error: github.com/docker/docker/api/types/swarm.UnlockRequest composite literal uses unkeyed fields (vet)
cmd/dockerd/daemon_unix.go:113::error: github.com/docker/docker/cmd/dockerd/hack.MalformedHostHeaderOverride composite literal uses unkeyed fields (vet)
cmd/dockerd/daemon_unix.go:110::error: github.com/docker/docker/cmd/dockerd/hack.MalformedHostHeaderOverride composite literal uses unkeyed fields (vet)
daemon/graphdriver/overlay/overlay.go:171::error: github.com/docker/docker/pkg/idtools.IDPair composite literal uses unkeyed fields (vet)
daemon/graphdriver/overlay/overlay.go:413::error: github.com/docker/docker/pkg/idtools.IDPair composite literal uses unkeyed fields (vet)
daemon/graphdriver/overlay2/overlay.go:203::error: github.com/docker/docker/pkg/idtools.IDPair composite literal uses unkeyed fields (vet)
daemon/graphdriver/overlay2/overlay.go:584::error: github.com/docker/docker/pkg/idtools.IDPair composite literal uses unkeyed fields (vet)
daemon/graphdriver/zfs/zfs.go:109::error: github.com/docker/docker/pkg/idtools.IDPair composite literal uses unkeyed fields (vet)
daemon/graphdriver/zfs/zfs.go:388::error: github.com/docker/docker/pkg/idtools.IDPair composite literal uses unkeyed fields (vet)
daemon/volumes_windows.go:27::error: github.com/docker/docker/pkg/idtools.IDPair composite literal uses unkeyed fields (vet)
integration/service/network_test.go:31::error: github.com/docker/docker/api/types/network.NetworkingConfig composite literal uses unkeyed fields (vet)
api/server/server.go:129:10⚠️ should not use basic type string as key in context.WithValue (golint)
integration/service/network_test.go:54::error: github.com/docker/docker/api/types/network.NetworkingConfig composite literal uses unkeyed fields (vet)
libcontainerd/client_daemon_linux.go:61::error: github.com/docker/docker/pkg/idtools.IDPair composite literal uses unkeyed fields (vet)
libcontainerd/client_daemon_linux.go:74::error: github.com/docker/docker/pkg/idtools.IDPair composite literal uses unkeyed fields (vet)
pkg/archive/archive_windows.go:76::error: github.com/docker/docker/pkg/idtools.IDPair composite literal uses unkeyed fields (vet)
plugin/manager_linux.go:56::error: github.com/docker/docker/pkg/idtools.IDPair composite literal uses unkeyed fields (vet)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: 4f8c870d623c63b98f8ef8002448f07f4dda4aa9
Component: engine
2018-05-17 19:28:27 +02:00
3f80548421
Merge component 'engine' from git@github.com:moby/moby master
2018-05-17 17:05:10 +00:00
01a80b2713
Merge component 'cli' from git@github.com:docker/cli master
2018-05-17 16:41:20 +00:00
3d5979d637
Merge pull request #37075 from tuscloud/fix-typos
...
Fix typos
Upstream-commit: 9aac187ce1592249ab5f1556d362f2b48ff9c671
Component: engine
2018-05-17 16:00:43 +02:00
16c7354fa4
Merge pull request #37074 from skyc024/fix-typos
...
Fix typos
Upstream-commit: 6a9bcc51df541ea0dedf038e8e88fe556239ef70
Component: engine
2018-05-17 16:00:26 +02:00
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
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
2018-05-17 14:50:29 +02:00
111037b920
Fix typos: remove duplicated "the"
...
Signed-off-by: Masato Ohba <over.rye@gmail.com >
Upstream-commit: 0f95b23d98384a3ae3769b75292cd5b14ba38437
Component: engine
2018-05-17 21:49:51 +09:00
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
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
b38bc2a3c0
Merge pull request #1040 from cyli/deprecated-engine-labels
...
Document reserved namespaces deprecation
Upstream-commit: 96dba79d99
2018-05-16 23:16:28 +02:00
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
2018-05-16 14:06:37 -07:00
cbe1e262f7
Merge pull request #974 from simonferquel/compose-kube-env-expansion
...
[K8s] Do env-variable expansion on the uninterpreted Config files
Upstream-commit: bac0d8f353
2018-05-16 20:18:41 +02:00
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
2018-05-16 20:16:08 +08:00
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
7d44629ea2
Fix typos
...
Signed-off-by: chenyuzhu <chenyuzhi@oschina.cn >
Upstream-commit: 5ac0d2f0b83e65f49b490e9d20c7a5b0e65f8e55
Component: engine
2018-05-16 15:31:12 +08:00
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
635742da67
Merge pull request #37003 from AntaresS/fix-integration-cli-for-e2e
...
Fix integration tests and integration cli to run on older versions
Upstream-commit: a41051a9e43fe5b9caaee61210df8498fe876d97
Component: engine
2018-05-15 21:10:37 -07:00
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
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
9e6796b652
Fix typos
...
Signed-off-by: weipeng <weipeng@tuscloud.io >
Upstream-commit: f781ec45b5c1745279f0429c2b7f19c793efcb85
Component: engine
2018-05-16 09:15:43 +08:00
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
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
