94be5a4238
Document the swarm root CA rotation CLI command.
...
Signed-off-by: Ying Li <ying.li@docker.com >
Upstream-commit: 3adddab957024f0d1f196c207cdb7eee543dda48
Component: engine
2017-05-15 17:21:01 -07:00
1157c8047e
Prefer digest over tag on pull
...
If a reference passed to the pull code contains both a tag and a digest,
currently the tag is used instead of the digest in the request to the
registry. This is the wrong behavior. Change it to favor the digest.
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com >
Upstream-commit: 0bff591bb0bc5a11ec22eb4f0b6104a79dea0819
Component: engine
2017-05-15 17:17:27 -07:00
6b1b90eeb8
Disabling digest pinning for API versions < 1.30
...
Signed-off-by: Nishant Totla <nishanttotla@gmail.com >
Upstream-commit: c0afd9c873183604e57282e1cf47605c1f1e4d43
Component: engine
2017-05-15 16:42:43 -07:00
6b46f385fc
Moving docker service digest pinning to client side
...
Signed-off-by: Nishant Totla <nishanttotla@gmail.com >
Upstream-commit: c1635c1ae3459e41fea3adb8188d9b3ce94f21a0
Component: engine
2017-05-15 16:42:43 -07:00
bbf5e9962e
GCP Logs: send log line as jsonPayload.message instead of jsonPayload.data
...
Signed-off-by: gkze <george@bugsnag.com >
Upstream-commit: d42c268fc3983d19e9dbd800948e7c4445c425f0
Component: engine
2017-05-15 16:35:53 -07:00
7030b36d75
Merge pull request #33190 from zhangxiaoyu-zidif/format-for-server
...
server.go: format for
Upstream-commit: 6ef7afce83fd24b61d22cbf0e12e03ae0116b706
Component: engine
2017-05-16 01:28:04 +02:00
2952e551a8
Merge pull request #32490 from aaronlehmann/start-first-test-failure
...
Increase health check timeout for TestAPISwarmServicesUpdateStartFirst
Upstream-commit: df4ca50805baa1d1488d811e82125f607c8daa09
Component: engine
2017-05-15 16:23:05 -07:00
357711f859
Merge pull request #33148 from cyli/doc-update-node-cluster-tls-info
...
Update the CLI docs to display whether a root rotation is in progress
Upstream-commit: f6c00f6e8098eb331435443d70030dfbe5aeaadb
Component: engine
2017-05-16 01:06:08 +02:00
b94eb3ae57
[pkg/term] switch syscall to x/sys
...
Switches calls to syscall to x/sys, which is more up to date.
This is fixes a number of possible bugs on other architectures
where ioctl tcget and tcset aren't implemented correctly.
There are a few remaining syscall references, because x/sys doesn't
have an Errno implementation yet.
Also removes a ppc64le and cgo build tag that fixes building on
ppc64le without cgo
Signed-off-by: Christopher Jones <tophj@linux.vnet.ibm.com >
Upstream-commit: f30b072b8157599cdd996b86d022117d2d55d1ce
Component: engine
2017-05-15 18:34:41 -04:00
6ca0a8eece
Adding Platforms field to TaskSpec
...
Signed-off-by: Nishant Totla <nishanttotla@gmail.com >
Upstream-commit: 1efbe6e8761370bbe8c136928a68323c7d8dbecf
Component: engine
2017-05-15 14:58:20 -07:00
32f407ecee
Merge pull request #32730 from abhishek7/hack-folder-readme-32373
...
Adding a README.md for the hack folder.
Upstream-commit: 7535462b77520562396f4cc8d92953dd3a3b9904
Component: engine
2017-05-15 23:53:43 +02:00
10bae71e4a
Merge pull request #33185 from tonistiigi/docs-build-target
...
docs: add docs for build —target
Upstream-commit: 4dbea104ca7ecaf3b9e7cdd779620f9c4faca818
Component: engine
2017-05-15 22:14:54 +02:00
54fcd7fc0e
Merge pull request #33198 from vdemeester/remove-unused-opts
...
Remove unused opts (moved to docker/cli)
Upstream-commit: 04eb1f0cacf0ea41caa049ed5ddd0ff71ac9851f
Component: engine
2017-05-15 12:51:40 -07:00
6ce3bf965e
Add continue on error in mountspec backport
...
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
Upstream-commit: d6e1cb7cbfe4b604d074814f00f654f5c545a71a
Component: engine
2017-05-15 15:49:07 -04:00
37a6b2b6e0
Fix make.ps1 client build for Windows
...
Always clone the client to the docker directory, even if the specified
client repository is a fork. This is simpler than modifying the build
command to specify the package path of the fork.
Signed-off-by: John Stephens <johnstep@docker.com >
Upstream-commit: 632a8635a0fa0b09759f87fc8a024d99a984c9df
Component: engine
2017-05-15 12:38:10 -07:00
e9a2524de1
Add missing go-difflib vendoring
...
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com >
Upstream-commit: 8c340b7edfa042d67ad766152ae61ef03e54793d
Component: engine
2017-05-15 11:23:52 -07:00
9322a3476f
Merge pull request #33200 from thaJeztah/remove-unused-key-file
...
Remove unused launchpad key file
Upstream-commit: 55ed80f78abcc7204a6e269d59f4d4bda2f3c5c5
Component: engine
2017-05-15 14:19:19 -04:00
76789457c2
Use containerd Status variable when checking container state
...
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com >
Upstream-commit: 0ea0b2becf119ca7950e8afcf5d440e800484b15
Component: engine
2017-05-15 10:53:51 -07:00
b04f3cd16c
fix inconsistent state string with containerd
...
should be `stopped` according to containerd:
https://github.com/containerd/containerd/blob/v0.2.x/runtime/runtime.go#L104
Signed-off-by: Deng Guangxing <dengguangxing@huawei.com >
Upstream-commit: 9771780a01e73200f96c84aa83689b7f34092772
Component: engine
2017-05-15 10:53:51 -07:00
8a368b7357
Merge pull request #33119 from nhorman/devmapper-fixes
...
Devmapper fixes for cookie generation and error reporting (fixes #33050 )
Upstream-commit: 2c45392b8fe134ef9689488d7e9e00ef711f9ee4
Component: engine
2017-05-15 13:18:52 -04:00
54b5650fc8
docs: add missing cache-from man docs
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com >
Upstream-commit: 33054be31bd78422b09a3789c99d7aa5d488e61b
Component: engine
2017-05-15 09:58:49 -07:00
2850502ebe
docs: add docs for build —target
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com >
Upstream-commit: 3377664e947979d2609135761a3c559fe47ef758
Component: engine
2017-05-15 09:56:53 -07:00
04ea6ad3f6
Merge pull request #32502 from tonistiigi/git-allow-pr-number
...
Allow specifying any remote ref in git checkout URLs
Upstream-commit: ba52bb0fd158dcd99ff65d0a422add8ecde01b3e
Component: engine
2017-05-15 09:34:54 -07:00
6870cd926f
Adding a README.md for the hack folder.
...
Signed-off-by: Abhishek Sharma <abhishek@asharma.me >
Upstream-commit: 99c1456647d23e7ca39d0af1742db5bacb87df40
Component: engine
2017-05-15 17:06:35 +02:00
0b10be446f
integration-cli-on-swarm/README.md: add a note about Docker->Moby
...
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp >
Upstream-commit: 63d4000e97bc0bee706e0831c5b5015ea448e3ae
Component: engine
2017-05-15 14:37:05 +00:00
fe83ce5181
Merge pull request #33170 from aaronlehmann/vendor-swarmkit-1ede4f8
...
Vendor swarmkit ae29cf2
Upstream-commit: 4d8234fb102d90717db7d4b978671a5fe6cd5eab
Component: engine
2017-05-15 16:16:46 +02:00
5ebfd27acb
Merge pull request #32821 from cpuguy83/32613_fix_volspec_backport
...
Fix issue backporting mount spec to pre-1.13 obj
Upstream-commit: 6cea2e5206f455d345df98f4a2e4abe8c803ab5a
Component: engine
2017-05-15 15:58:31 +02:00
e768870c69
Merge pull request #32987 from allencloud/add-swarm-get-unlock-key-test-in-client
...
add swarm get unlock key test for client package
Upstream-commit: 3183031581d16e06b5386b1860ea6bfaa734ebce
Component: engine
2017-05-15 09:56:43 -04:00
15c0f868cb
Remove unused launchpad key file
...
Commit d841da9379c7d08408c55bfa5d24276826362b23 removed
the dependency on libzfs-dev from the Dockerfile.
This key file was only used for the PPA used to
install libzfs-dev, and is now no longer
needed.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: 3b9a6309c8f858f869a6392b6a0a7166b52b363e
Component: engine
2017-05-15 15:51:18 +02:00
c9d2f6b467
Merge pull request #33197 from thaJeztah/remove-libzfs-dev-dependency
...
Remove zfs from static builds
Upstream-commit: d841da9379c7d08408c55bfa5d24276826362b23
Component: engine
2017-05-15 14:48:38 +01:00
f0d9aa77cb
Merge pull request #32856 from darrenstahlmsft/RemoveResourceComments
...
Remove comments and unused structures in Windows resources
Upstream-commit: 6bffb585cda7d4064b803ed3d8b110a7c2d21d94
Component: engine
2017-05-15 15:28:51 +02:00
5aed6562af
Merge pull request #33131 from johnstep/windows-build-client-temp
...
Build client on Windows in a temporary directory
Upstream-commit: 23359fd4035029c98a329bae5cf78626f3f15419
Component: engine
2017-05-15 15:22:00 +02:00
9b335b3a77
Remove unused opts (moved to docker/cli)
...
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: 306074572ca3025820a4a3ad98e327dd51edaf47
Component: engine
2017-05-15 14:38:58 +02:00
81db28deb9
Merge pull request #32996 from dperny/service-logs-support-details
...
Fix Ambigious Logs Format and Add Support for Details in Service Logs
Upstream-commit: 7fd8a9382c0fd3f23002288e357b5612b869a974
Component: engine
2017-05-15 13:57:44 +02:00
44195b7547
Merge pull request #33184 from dnephin/doc-arg-before-from
...
Document arg before from
Upstream-commit: 99b5fadd0ce6edf066d5797f14c0ba452c8ddf23
Component: engine
2017-05-15 13:35:23 +02:00
03266822c8
Remove zfs from static builds
...
The libzfs-dev package is not needed for the static builds,
and only used for ubuntu packages, so removing from
the Dockerfile.
This resolves an issue where build fails due to the PPA
having changed.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: 8022c5fdd12ae6dc5aac3c9e59f5524954b55730
Component: engine
2017-05-15 13:22:52 +02:00
6879ffc828
Merge pull request #33146 from Microsoft/jjh/TestAPIStatsNoStreamGetCpu
...
Fix flaky TestAPIStatsNoStreamGetCpu
Upstream-commit: 8a03eb0b6cc56879eada4a928c6314f33001fc83
Component: engine
2017-05-15 11:21:53 +02:00
a1d5efdf77
server.go: format for
...
Signed-off-by: zhangxiaoyu-zidif <zhang.xiaoyu33@zte.com.cn >
Upstream-commit: 1ab62a0b4daa6b643fc140d3ec8661ef407ec3b1
Component: engine
2017-05-15 07:12:28 +08:00
2d5cb49e4e
Update comments describing new behaviour
...
Signed-off-by: Justin Menga <justin.menga@gmail.com >
Upstream-commit: dc87490b632949394307e25dce17c8db6cf664c6
Component: engine
2017-05-15 11:08:16 +12:00
2373c13c5a
Code review changes
...
Signed-off-by: Justin Menga <justin.menga@gmail.com >
Upstream-commit: 3a4cf2b076a8f04f54b6edff4f661f5c3b2c8157
Component: engine
2017-05-15 10:28:18 +12:00
9d09c6e973
Merge pull request #33188 from allencloud/fix-nits-in-function-comments
...
fix typos in function comments
Upstream-commit: 5072b22c5fea93f00917c8c5d6a29d782db2bb73
Component: engine
2017-05-14 08:17:28 -04:00
462508ec1a
fix typos in function comments
...
Signed-off-by: allencloud <allen.sun@daocloud.io >
Upstream-commit: 4a98f9ef7fdb6f6f77516fb030293fbc0ff659dc
Component: engine
2017-05-14 13:05:41 +08:00
418f2b9f51
Merge pull request #33179 from tonistiigi/fix-from-scratch
...
Fix resetting image metadata between stages for scratch case
Upstream-commit: 4e0fdc9098e2ff9e4e78287f8d60aef8af465d55
Component: engine
2017-05-13 21:17:02 -07:00
537a743ad7
Merge pull request #33182 from cyli/exclusive-root-pools-in-daemon
...
Use exclusive root pools if a CA cert file is specified in the daemon
Upstream-commit: 190c6e8cf8b893874a33d83f78307f1bed0bfbcd
Component: engine
2017-05-13 21:15:42 -07:00
25f28a5159
add swarm get unlock key test for client package
...
Signed-off-by: allencloud <allen.sun@daocloud.io >
Upstream-commit: a86023eaa93f18bfefb345a5e13c88156abaa6fa
Component: engine
2017-05-14 11:09:19 +08:00
e5c39230b9
Merge pull request #32700 from jphuynh/more-maintainer-deprecation
...
MAINTAINER deprecation follow up. Relates to #25466
Upstream-commit: 20255ade2965440d22e149cdd7c32e207f6918ba
Component: engine
2017-05-13 17:28:52 +02:00
231fefa0c5
Merge pull request #33174 from thaJeztah/update-authors
...
Update AUTHORS and mailmap
Upstream-commit: c56cfbaf966af0b7b559e4188bcf83340e7bb1cc
Component: engine
2017-05-13 17:25:31 +02:00
6083b78b58
Add missing month in datetime map
...
Signed-off-by: Justin Menga <justin.menga@gmail.com >
Upstream-commit: bf1c377f6012f3db714e0f848d70e776ef1226a6
Component: engine
2017-05-13 22:10:51 +12:00
3ac82c3d80
Append new line to multiline events
...
Signed-off-by: Justin Menga <justin.menga@gmail.com >
Upstream-commit: 4374f16667708118c126cd71f733493b0070e807
Component: engine
2017-05-13 17:54:04 +12:00
7dd003d1da
Code review changes
...
Signed-off-by: Justin Menga <justin.menga@gmail.com >
Upstream-commit: 8ef9c19ecdd16881289a63e5e89de3f5c83def66
Component: engine
2017-05-13 17:54:04 +12:00
Ying Li
Aaron Lehmann
Nishant Totla
gkze
Sebastiaan van Stijn
Christopher Jones
Kenfe-Mickaël Laventure
Brian Goff
John Stephens
Deng Guangxing
Tonis Tiigi
Abhishek Sharma
Akihiro Suda
Sebastiaan van Stijn
Justin Cormack
Vincent Demeester
Vincent Demeester
zhangxiaoyu-zidif
Justin Menga
Doug Davis
allencloud