toolshed/docker-cli
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
33,048 Commits 3 Branches 295 Tags
b492ded3c0b644a76a6af424e84f0d97b361f88f
Commit Graph
33048 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Daniel Nephin b492ded3c0 Fix multiple copy from 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: b50ade0bfb67dae7867f4f5c3da12c1f778b6c7e
Component: engine
 2017-07-12 12:36:03 -04:00
Victor Vieux 5eaf5cc8fa Merge pull request #33887 from thaJeztah/update-version-error 
Fix NewVersionError() for clients using default version
Upstream-commit: 45cad73ea8abc5e87d5db1a4a47c8565531d769f
Component: engine
 2017-07-12 15:24:00 +02:00
Victor Vieux 27200496d4 Merge pull request #34067 from thaJeztah/bump-image-spec 
bump image-spec to 372ad780f63454fbbbbcc7cf80e5b90245c13e13
Upstream-commit: 94260ccb1dad0b49c7642db07aece5112b316ba0
Component: engine
 2017-07-12 12:19:39 +02:00
Sebastiaan van Stijn 4f75fb4d4c bump image-spec to 372ad780f63454fbbbbcc7cf80e5b90245c13e13 
this commit matches what's used in SwarmKit

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 9fc66ec869ecd963d7a30b96f5c0b1de69cf5090
Component: engine
 2017-07-11 20:52:17 -07:00
Sebastiaan van Stijn bd835f3c9e Merge pull request #34061 from cyli/re-vendor-swarmkit 
Re-vendor swarmkit. 
Upstream-commit: c0e6da7637491886904725c2fcec9db6ec261af4
Component: engine
 2017-07-11 20:30:56 -07:00
Sebastiaan van Stijn 322987e0f5 Merge pull request #34065 from allencloud/add-cluster-events-change 
add cluster events change in version_history.md
Upstream-commit: e5862d42b372110c4530ba7afb579801ddafd553
Component: engine
 2017-07-11 20:28:05 -07:00
Sebastiaan van Stijn c30b5760e3 Merge pull request #34032 from allencloud/support-config-event-in-cluster 
make engine support cluster config event
Upstream-commit: 334702ab1fa8d3d6c64f3c41d80752c7b4196357
Component: engine
 2017-07-11 20:25:19 -07:00
Tibor Vass 52c2abd279 Merge pull request #34004 from yummypeng/fix-docker-stats-hang 
Return an empty stats if "container not found"
Upstream-commit: c8a2596d676a815cc17162f178869be4aeb4b301
Component: engine
 2017-07-11 20:10:17 -07:00
allencloud b4af05d241 add cluster events change in version_history.md 
Signed-off-by: allencloud <allen.sun@daocloud.io>
Upstream-commit: e9da15a6603f288a4c0005fc8f4161b45390e26b
Component: engine
 2017-07-12 09:25:30 +08:00
allencloud 3a04c6bfdb add config event in swagger.yml 
Signed-off-by: allencloud <allen.sun@daocloud.io>
Upstream-commit: c8d6477e5a359d30cdf0a59cdbfffc158a1d9388
Component: engine
 2017-07-12 08:48:14 +08:00
Phil Estes fe328d4b30 Merge pull request #33399 from tophj-ibm/move-all-of-pkg-to-syscall 
[project] Switch most syscalls to golang.org/x/sys
Upstream-commit: 54251b53d7081f1471c0a2cb23fd4e198e71bd14
Component: engine
 2017-07-11 16:50:52 -04:00
Ying Li 57481ff30b Re-vendor swarmkit. This includes the following fixes: 
- https://github.com/docker/swarmkit/pull/2266 (support for templating Node.Hostname in docker executor)
- https://github.com/docker/swarmkit/pull/2281 (change restore action on objects to be update, not delete/create)
- https://github.com/docker/swarmkit/pull/2285 (extend watch queue with timeout and size limit)
- https://github.com/docker/swarmkit/pull/2253 (version-aware failure tracking in the scheduler)
- https://github.com/docker/swarmkit/pull/2275 (update containerd and port executor to container client library)
- https://github.com/docker/swarmkit/pull/2292 (rename some generic resources)
- https://github.com/docker/swarmkit/pull/2300 (limit the size of the external CA response)
- https://github.com/docker/swarmkit/pull/2301 (delete global tasks when the node running them is deleted)

Minor cleanups, dependency bumps, and vendoring:
- https://github.com/docker/swarmkit/pull/2271
- https://github.com/docker/swarmkit/pull/2279
- https://github.com/docker/swarmkit/pull/2283
- https://github.com/docker/swarmkit/pull/2282
- https://github.com/docker/swarmkit/pull/2274
- https://github.com/docker/swarmkit/pull/2296 (dependency bump of etcd, go-winio)

Signed-off-by: Ying Li <ying.li@docker.com>
Upstream-commit: 4509a001dffff626d2d8708fd2eb1c6317b201f3
Component: engine
 2017-07-11 13:43:43 -07:00
Christopher Jones e95f4619cd [project] change syscall to /x/sys/unix|windows 
Changes most references of syscall to golang.org/x/sys/
Ones aren't changes include, Errno, Signal and SysProcAttr
as they haven't been implemented in /x/sys/.

Signed-off-by: Christopher Jones <tophj@linux.vnet.ibm.com>

[s390x] switch utsname from unsigned to signed

per https://github.com/golang/sys/commit/33267e036fd93fcd26ea95b7bdaf2d8306cb743c
char in s390x in the /x/sys/unix package is now signed, so
change the buildtags

Signed-off-by: Christopher Jones <tophj@linux.vnet.ibm.com>
Upstream-commit: 069fdc8a083cb1663e4f86fe3fd9b9a1aebc3e54
Component: engine
 2017-07-11 08:00:32 -04:00
allencloud 94a5aefc94 make engine support cluster config event 
Signed-off-by: allencloud <allen.sun@daocloud.io>
Upstream-commit: ed916a233c577693afc8dc3122311c15246d00cc
Component: engine
 2017-07-11 17:21:15 +08:00
Victor Vieux fef91e1185 Merge pull request #34035 from allencloud/add-cluster-event-details-in-swagger 
add cluster events details in swagger.yml
Upstream-commit: 6978a6e25a2e6063f280ec842bd0f3eae99426e1
Component: engine
 2017-07-11 11:04:27 +02:00
Victor Vieux 778f3ff836 Merge pull request #34047 from thaJeztah/revendor-dependencies 
Bump vndr to 9909bb2b8a0b7ea464527b376dc50389c90df587
Upstream-commit: 177d281b5c165aa99916f7d516550f50fc75b05c
Component: engine
 2017-07-11 11:04:05 +02:00
Sebastiaan van Stijn 1d9d7c17b0 Merge pull request #33816 from albers/enable-completion 
Enable bash completion in development container
Upstream-commit: 031fd77702305fec52b9c5892985fc032257374b
Component: engine
 2017-07-10 21:39:43 -07:00
Sebastiaan van Stijn 9981e245e4 Merge pull request #34050 from thaJeztah/fix-api-version-docs 
Fix api-version history
Upstream-commit: 5892a41c583823e7b7048e1dc647641d7e2ff3d8
Component: engine
 2017-07-10 21:21:57 -07:00
Sebastiaan van Stijn 6d8f8266f4 Fix api-version history 
Commit c79c16910c0f3d6e88f2dc6ef609ecc3b02ccef9
inadvertently put these API changes under API 1.31,
but they were added in API 1.30.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: dd5e818fabc7edf7fa4d952e62b949b224909d2a
Component: engine
 2017-07-10 21:15:02 -07:00
allencloud cfd6048882 add cluster events details in swagger.yml 
Signed-off-by: allencloud <allen.sun@daocloud.io>
Upstream-commit: f596fb7683227021b74d299ad1613a1e3263cf30
Component: engine
 2017-07-11 11:54:22 +08:00
Brian Goff 3ac74eb8fd Merge pull request #33979 from allencloud/return-prune-data-when-context-canceled 
return prune data when context canceled
Upstream-commit: 73e8f56d6aed223c0f9997e8bd225e446664e647
Component: engine
 2017-07-10 21:17:18 -04:00
Sebastiaan van Stijn 4a3ac40163 Merge pull request #33956 from keloyang/fix-cp-with-hardlink 
Fix docker cp dir with hard link
Upstream-commit: 9789530b46f36e2961113949f117f93c1fd4e60c
Component: engine
 2017-07-10 14:11:26 -07:00
Sebastiaan van Stijn 30a181615a Bump vndr to 9909bb2b8a0b7ea464527b376dc50389c90df587 
This bumps vndr to 9909bb2b8a0b7ea464527b376dc50389c90df587
and revendors dependencies.

Includes a change that prunes go files with `+build ignore`

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 63f4bc5237dc928125ac62aa5468f6d8b28272c7
Component: engine
 2017-07-10 14:05:13 -07:00
Akihiro Suda 5ed9aa29f5 Merge pull request #34040 from justincormack/windows-homedir 
Split homedir files by operating system
Upstream-commit: e639a70fbe999d96354a5bcf560231b7b8aa935c
Component: engine
 2017-07-11 01:27:50 +09:00
Sebastiaan van Stijn db491388be Merge pull request #33996 from thaJeztah/un-fork-etcd 
Un-fork coreos/etcd - bump to v3.2.1
Upstream-commit: 0ea804c2405f42ecd8e1834d329fa45f326bf175
Component: engine
 2017-07-10 09:14:22 -07:00
Vincent Demeester b53529452f Merge pull request #33377 from yastij/33371-matchevent-filtering 
matching events using ID and name
Upstream-commit: e56e78976eefdd17d333c3aa63382b2e4bfd889d
Component: engine
 2017-07-10 16:11:14 +02:00
Justin Cormack b8ebf7be04 Split homedir files by operating system 
libcontainer/user does not build at all on Windows any more, and
this was breaking the client on Windows with upstream `runc`. As
these functions are not used anyway, just split out and stop
checking `runtime`.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
Upstream-commit: b7bd959294b5dc5b6e18b3fed5dde18f4f7f1d20
Component: engine
 2017-07-10 14:10:43 +01:00
Yuanhong Peng 9e646d8386 Return an empty stats if "container not found" 
If we get "container not found" error from containerd, it's possibly
because that this container has already been stopped. It will be ok to
ignore this error and just return an empty stats.

Signed-off-by: Yuanhong Peng <pengyuanhong@huawei.com>
Upstream-commit: 4a6cbf9bcb78d38c48ef963f585f0fadf733e101
Component: engine
 2017-07-10 16:30:48 +08:00
allencloud f4101eb2fb return prune data when context canceled 
Signed-off-by: allencloud <allen.sun@daocloud.io>
Upstream-commit: 87b4dc2002d50e245f432bbd97e9dee2db25cf96
Component: engine
 2017-07-10 10:06:24 +08:00
Sebastiaan van Stijn 87ec40c8a8 Merge pull request #33999 from Microsoft/jjh/opengcs0.0.9 
Revendor jhowardmsft/opengcs v0.0.9
Upstream-commit: 20eb2caa3bad9a0937d80a56bd4a3060d9f8c573
Component: engine
 2017-07-09 17:46:43 -07:00
Sebastiaan van Stijn 5c3ab94b35 Merge pull request #33988 from Deborah-Digges/patch-1 
Add link to docker.com in README.md
Upstream-commit: 15a22a6641f4e418d37fe5c75380dc57c56db3f1
Component: engine
 2017-07-09 16:40:38 -07:00
Sebastiaan van Stijn dddc944164 Merge pull request #33990 from thaJeztah/remove-install-script 
Remove old "get.docker.com" install script
Upstream-commit: b227c568dd749512ff43e1d7aecf7580f305cba7
Component: engine
 2017-07-07 21:50:37 -07:00
Aaron Lehmann dd3dcdbd0d vendor: add go-semver 
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
Upstream-commit: 733f672100a436b272ea871c4ba427f07d7bfa8a
Component: engine
 2017-07-07 16:42:14 -07:00
Sebastiaan van Stijn 4cb9d45e3f Merge pull request #33541 from aaronlehmann/lock-unlock-tests-poll 
integration-cli: Replace sleeps with polling in swarm lock/unlock tests
Upstream-commit: ced0b6cb5bd3acd223dc20a13ba5be1dbf0ff643
Component: engine
 2017-07-07 16:41:01 -07:00
Yassine TIJANI 23b4fdf3bc removing TODO, and explain why we can't filter by id on the matchevent method. 
Signed-off-by: Yassine TIJANI <yasstij11@gmail.com>
Upstream-commit: be9aa09246534a1fdf7c08cf287dbe1e6de375c9
Component: engine
 2017-07-07 23:32:37 +02:00
Yong Tang 0887a18a3a Merge pull request #33575 from cpuguy83/plugins_on_swarm 
Plugins on swarm
Upstream-commit: 05c7c311390911daebcf5d9519dee813fc02a887
Component: engine
 2017-07-07 02:23:07 -07:00
Yong Tang 0371882bb8 Merge pull request #33662 from madhanrm/sharedendpoint 
Include Endpoint List for Shared Endpoints
Upstream-commit: 9aecbbf9bf50dd5c3d250e8dc1c74360a9f30d8e
Component: engine
 2017-07-06 23:44:23 -07:00
Akihiro Suda cb27d2c59c Merge pull request #33940 from yaocaigen/fix_container_multi_names 
Fix run `docker rename <container-id> new_name` concurrently, the container will have multi names
Upstream-commit: 8e3555f8539d91f530f895e19a51db14f1ca93fb
Component: engine
 2017-07-07 10:58:01 +09:00
Aaron Lehmann abfe031053 Merge pull request #33713 from x1022as/error_fd 
fd leak and error handling
Upstream-commit: 3be2273d03e4b06dff4006b1a600c578c7aa09fc
Component: engine
 2017-07-06 16:47:34 -07:00
John Howard eb145cf9d7 Revendor jhowardmsft/opengcs v0.0.9 
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: 7643e8909675fb7b1d52a8c7566fb674db340a39
Component: engine
 2017-07-06 14:29:43 -07:00
Tibor Vass 9b7ee7b6ee Merge pull request #33935 from AkihiroSuda/pkg-archive-go1.9 
pkg/archive.FileInfoHeader: fill file type bits
Upstream-commit: 0fcd082d886323b4506b28394ee28eaa5a5dfe7f
Component: engine
 2017-07-06 14:22:45 -07:00
Sebastiaan van Stijn f6e262f402 Un-fork coreos/etcd - bump to v3.2.1 
Commit 077f08bf54dc89d382cbcbd797b2bd7c4867151d
temporarily switch etcd to a fork, pending a
pull-request to be merged, and a new release
that contains the change.

The pull request was merged, and included in
etcd v3.2.0

This patch bumps etcd to v3.2.1, which contains
some bug-fixes on top of v3.2.0

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: cbc480a40cb22653ac647a8d24957a0c33e3bffe
Component: engine
 2017-07-06 13:58:13 -07:00
Madhan Raj Mookkandy 455cc50b83 Include Endpoint List for Shared Endpoints 
Do not allow sharing of container network with hyperv containers

Signed-off-by: Madhan Raj Mookkandy <madhanm@microsoft.com>
Upstream-commit: 349913ce9fde34d8acd08fad5ce866401f4d135e
Component: engine
 2017-07-06 12:19:17 -07:00
Sebastiaan van Stijn 754d5e0397 Remove old "get.docker.com" install script 
This script is part of the Docker product,
and no longer maintained in this repository.

The script has been updated to install Docker CE
packages from https://download.docker.com, and is
now located in the https://github.com/docker/docker-install
repository.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: e038f9f81f871237e9ec7a2188eb6b401bdd8809
Component: engine
 2017-07-06 11:29:07 -07:00
Brian Goff c782cb6c44 Make plugin emit strongly typed, consumable events 
Enables other subsystems to watch actions for a plugin(s).

This will be used specifically for implementing plugins on swarm where a
swarm controller needs to watch the state of a plugin.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Upstream-commit: 72c3bcf2a533a827402945e3a55872e2db4fb024
Component: engine
 2017-07-06 14:26:06 -04:00
Deborah Gertrude Digges 4ad1d46962 Add link to docker.com in README.md 
- Update README with the link to docker.com

Signed off by Author:    Deborah Gertrude Digges <deborah.gertrude.digges@gmail.com>

Signed-off-by: ddigges <deborahgertrude_digges@intuit.com>
Upstream-commit: f63ec3d87467419a94f827939a1eaefa03b2f181
Component: engine
 2017-07-06 23:09:54 +05:30
yangshukui 7668114cba Fix docker cp dir with hard link 
docker run --name=test ubuntu /bin/sh -c "cd /tmp && echo hi > a && ln a b" && docker cp test:/tmp tmp_
test
link /root/tmp/a /root/tmp_/b: no such file or directory

Signed-off-by: yangshukui <yangshukui@huawei.com>
Upstream-commit: d58ffa0364c04d03a8f25704d7f0489ee6cd9634
Component: engine
 2017-07-06 17:03:38 +08:00
Sebastiaan van Stijn 9691a9deb1 Merge pull request #33941 from thaJeztah/update-api-docs 
Add missing API documentatoin for DataPathAddr
Upstream-commit: 9d95740dbfb790b3ea531a363697076ffb97a294
Component: engine
 2017-07-05 18:35:45 -07:00
Sebastiaan van Stijn c36d6e2e41 Merge pull request #33859 from tonistiigi/session-includepaths 
Add path filtering to build session client
Upstream-commit: 19ee87361685ae63aa2eca4a2ae5a2035484814b
Component: engine
 2017-07-05 18:21:48 -07:00
Sebastiaan van Stijn 74d8ac0d96 Merge pull request #33897 from cpuguy83/jsonfile_log_blocking 
Fix log readers can block writes indefinitely
Upstream-commit: db8c2651b84c681579389bb57d309a3b210a7e78
Component: engine
 2017-07-05 18:21:14 -07:00