Commit Graph
36672 Commits
Author SHA1 Message Date
Christopher Jones 474b9fb5b6 Rename term to winsize, tc_other to tc
Signed-off-by: Christopher Jones <tophj@linux.vnet.ibm.com>
Upstream-commit: 1c94c264c489e1d5fdae7f41120574e0322ab31d
Component: engine
2017-05-16 11:46:17 -04:00
allencloud a934e7d185 unexport error errPruneRunning
Signed-off-by: allencloud <allen.sun@daocloud.io>
Upstream-commit: 2a8f46abfdc9a1ebfa2b23a71c75c630c0fc454d
Component: engine
2017-05-16 23:37:30 +08:00
Sebastiaan van Stijn 51c87b76b5 Merge pull request #33023 from gdevillele/pr-fix-prune-filter
daemon returns errors when receiving unsupported prune filters
Upstream-commit: f944183c7566de209b4cc1128b63dfd68daac3de
Component: engine
2017-05-16 16:55:10 +02:00
Vincent Demeester 81a1bf8cf1 Add codecov configuration
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: f4b8aec86e
Component: cli
2017-05-16 16:53:35 +02:00
Tibor Vass b0891a48c7 [pkg/term] Refactor BSD-specific files
Signed-off-by: Tibor Vass <tibor@docker.com>
Upstream-commit: f8416e82d9152c7f833b9ea6ccb29cb221e14c16
Component: engine
2017-05-16 10:12:33 -04:00
Daniel Nephin 71cfdc53d3 Remove unused windows resourcefiles.
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: 329f4e29c5
Component: cli
2017-05-15 22:50:33 -04:00
Akihiro Suda 2d89d443c2 Fix float64 comparison in stats_helpers_test.go
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
Upstream-commit: 3c78bc775c
Component: cli
2017-05-16 02:13:00 +00:00
Sergey Tryuber 798e7f5d71 Adjusted docker stats memory output
Signed-off-by: Sergey Tryuber <Sergeant007@users.noreply.github.com>
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
Upstream-commit: 82600b7021
Component: cli
2017-05-16 02:00:47 +00:00
Ying Li 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
Aaron Lehmann 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
Nishant Totla 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
Nishant Totla 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
Sebastiaan van Stijn 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
Aaron Lehmann 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
Sebastiaan van Stijn 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
Christopher Jones 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
Daniel Nephin d7802c7d2b Add windows resources to binary.
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: 8a6ad48d2b
Component: cli
2017-05-15 18:03:03 -04:00
Nishant Totla 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
Sebastiaan van Stijn 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
Daniel Nephin 473491581d Support running unit tests when files are saved.
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: 74c06a140b
Component: cli
2017-05-15 17:02:58 -04:00
Sebastiaan van Stijn 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
Kenfe-Mickaël Laventure 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
Brian Goff 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
Tibor Vass f61bb3cd6b Merge pull request #33208 from johnstep/fix-windows-client-build
Fix make.ps1 client build for Windows
Upstream-commit: 203feeed86b3ef82a4d4e4ff4a85d79acd2038ae
Component: engine
2017-05-15 12:45:13 -07:00
John Stephens 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
Tibor Vass 54778e28e7 Merge pull request #78 from dnephin/fix-cross-build
Fix cross compile build
Upstream-commit: a2225276af
Component: cli
2017-05-15 12:31:34 -07:00
Sebastiaan van Stijn 5c35f1a58b add credential-spec to compose
Signed-off-by: Michael Friis <friism@gmail.com>
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Upstream-commit: 4e7943646b
Component: cli
2017-05-15 15:00:26 -04:00
Kenfe-Mickaël Laventure 15f41f0cf9 Merge pull request #82 from vdemeester/opts-from-docker
Import `opts` package from moby/moby
Upstream-commit: 36e557f1a3
Component: cli
2017-05-15 11:38:59 -07:00
Kenfe-Mickael Laventure 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
Brian Goff 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
Daniel Nephin a6473845ef Update the README
Remove referenced to developing on the host, we shouldn't support it.

Move script/validate to scripts/validate to be consistent.
Set the default target to be binary instead of clean.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: 60b2dd3e23
Component: cli
2017-05-15 14:07:30 -04:00
Brian Goff f98c4ef422 Merge pull request #85 from thaJeztah/auto-milestone
Add VERSION file
Upstream-commit: a4472a893d
Component: cli
2017-05-15 13:58:50 -04:00
Kenfe-Mickael Laventure 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
Deng Guangxing 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
Sebastiaan van Stijn ca78770821 Add VERSION file
This file is used for auto-assigning milestones
to PR's by Poule, but may be usefule in general

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 35c6e555e0
Component: cli
2017-05-15 19:20:12 +02:00
Brian Goff 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
Tonis Tiigi 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
Tonis Tiigi 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
Kenfe-Mickaël Laventure 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
Abhishek Sharma 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
Akihiro Suda 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
Sebastiaan van Stijn 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
Sebastiaan van Stijn 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
Brian Goff 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
Sebastiaan van Stijn 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
Justin Cormack 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
Sebastiaan van Stijn 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
Sebastiaan van Stijn 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
Vincent Demeester 242da31a23 Update cli imports to using local package
Also, rename a bunch of variable to not *shadow* the `opts` package
name.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: d7f6563efc
Component: cli
2017-05-15 14:45:19 +02:00
Vincent Demeester 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