ab4fa07bf0
Merge pull request #621 from charrywanganthony/displaystringutils
...
Refactor stringutils and fix docker search output form
Upstream-commit: e4940cb8d2
2017-10-27 11:08:36 +02:00
9a3be7b972
Refactor stringutils and fix docker search output form when the description has CJK character
...
Signed-off-by: Chao Wang <wangchao.fnst@cn.fujitsu.com >
Upstream-commit: 926b20fcb5
2017-10-27 11:15:10 +08:00
bf87c9c8da
Update vendor of spf13/pflag and spf13/cobra
...
Use upstream isntead of fork for cobra.
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: 0f2ebae056
2017-10-25 12:50:37 -04:00
3854f6d75a
Bump moby to 1ffa10ee2630917e4f2a88f5e4daf34d700eaa1f
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: 2f393694c2
2017-10-12 01:01:48 +02:00
1c031cd7d9
vendor tonistiigi/fsutil to dea3a0da73aee887fc02142d995be764106ac5e2
...
removes the stevvooe/continuity dependency, which has moved to
containerd/continuity.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: 197842fd45
2017-09-30 18:26:02 +02:00
4b8b813d22
Merge pull request #570 from thaJeztah/bump-moby-vendor
...
Bump moby vendor to 14ce1f1cf48e9859223c6311de58aec4dc
Upstream-commit: 31908a4b45
2017-09-29 23:08:16 +02:00
c9e8020d97
bump moby/moby and dependencies to 14ce1f1cf48e9859223c6311de58aec4dc0f046c
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: 98dbfeee76
2017-09-29 17:44:49 +02:00
6230f06c47
revendor logrus and x/crypto
...
updates to the same version as is currently used
on moby/moby; this bump contains fixes for ppc64le.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: e3b7700fb9
2017-09-29 15:32:42 +02:00
9e59512fe4
Merge pull request #451 from tych0/use-pass-backend
...
Use pass backend
Upstream-commit: be8dab26a3
2017-09-26 16:40:32 +02:00
b53048a314
trust: add Repository client interface
...
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com >
Upstream-commit: 7c5b836ca5
2017-09-25 09:34:54 -07:00
86beae9d05
vendor: upgrade notary version for docker trust
...
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com >
Upstream-commit: fb1cbaeb66
2017-09-25 09:34:52 -07:00
6280c12bb9
version bump for docker-credential-helpers
...
Signed-off-by: Tycho Andersen <tycho@docker.com >
Upstream-commit: 6bd5c63c78
2017-09-20 11:15:49 -06:00
69753f2d25
Merge pull request #513 from shouze/reset-id-pair-during-build-to-avoid-cache-busting
...
Reset uid/gid to 0 in build context to fix cache busting issues on ADD/COPY
Upstream-commit: 7b77ab5c60
2017-09-13 15:19:26 -04:00
e18e2f39e3
vndr github.com/docker/docker to 84144a8 to fix stuff
...
Signed-off-by: Andrew Hsu <andrewhsu@docker.com >
Upstream-commit: 850b46e67c
2017-09-12 17:27:15 -07:00
6e9f643bb2
Reset idPair during build to avoid cache busting
...
Signed-off-by: Sébastien HOUZÉ <cto@verylastroom.com >
Upstream-commit: 7e407610d4
2017-09-13 02:04:03 +02:00
baffbb54c8
remove unused vndr github.com/docker/libtrust
...
Signed-off-by: Andrew Hsu <andrewhsu@docker.com >
Upstream-commit: 536da4a07a
2017-09-12 13:48:21 -07:00
fda4a38658
vndr golang.org/x/sys to 07c1829
...
To satisfy requirements of the vndr of docker/docker
Signed-off-by: Andrew Hsu <andrewhsu@docker.com >
Upstream-commit: 50696bbf72
2017-09-12 12:11:18 -07:00
4b9c2f5fd5
vndr docker/docker to ea220e7 to bring in fix for arm
...
Primarily to bring in fix for "Clear Architecture field in platform
constraint for arm architectures".
Signed-off-by: Andrew Hsu <andrewhsu@docker.com >
Upstream-commit: ef027b6d72
2017-09-08 16:27:56 -07:00
e65a64c87e
Add gotestyourself/poll
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: 683b6226ed
2017-09-06 17:07:35 -04:00
444c2e65a4
Remove unused depdendencies from vendor
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: 724f03bb23
2017-09-01 19:41:06 -04:00
4bafd44516
updated vendoring
...
Signed-off-by: Simon Ferquel <simon.ferquel@docker.com >
Upstream-commit: a0113c3a44
2017-09-01 19:41:06 -04:00
4ac950c1d0
Remove unused vendor.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: 8edd2dd3df
2017-08-29 13:22:17 -04:00
3b7026d84c
Add gotestyourself dependency.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: 882992c6fc
2017-08-16 14:08:08 -04:00
88060164f5
Merge pull request #319 from keloyang/bugfix-docker-cp
...
Bugfix docker cp
Upstream-commit: 2dac00bdca
2017-07-26 11:56:12 -04:00
a6804951ed
Merge pull request #291 from thaJeztah/bump-swarmkit
...
Bump swarmkit and dependencies to 79381d0840be27f8b3f5c667b348a4467d866eeb
Upstream-commit: 472ce90624
2017-07-21 11:07:38 +02:00
a090086ff6
Sort swarm stacks and nodes using natural sorting
...
This commit changes the order stacks and nodes are displayed.
For example, running "docker stack ls" is expected to
display the following list:
NAME SERVICES
service-1 1
service-2 1
service-10 1
However, currently this is what is printed:
NAME SERVICES
service-1 1
service-10 1
service-2 1
To fix this, "docker stack ls" and "docker node ls" are using
natural sorting to make it more human readable.
Signed-off-by: Boaz Shuster <ripcurld.github@gmail.com >
Upstream-commit: 1333b49194
2017-07-13 14:33:02 +03:00
9cc50cd1cb
Vendor, update moby to d58ffa0364c04d03a8f25704d7f0489ee6cd9634
...
Fix docker cp dir with hard link, refer to https://github.com/moby/moby/pull/3 .
Signed-off-by: Shukui Yang <yangshukui@huawei.com >
Upstream-commit: a996206ced
2017-07-12 01:28:55 +00:00
542cf421f5
Bump moby to 87df0e533b619c088091fd1e2310e92bb9a24822
...
Includes changes from;
- Add a LastTagTime for images (https://github.com/moby/moby/pull/31497 )
- Fix handling of remote "git@" notation (https://github.com/moby/moby/pull/33696 )
- Move some `api` package functions away (https://github.com/moby/moby/pull/33798 ) (related to https://github.com/docker/cli/pull/236 )
- Set ping version even on error (https://github.com/moby/moby/pull/33827 )
- Do not add duplicate platform information to service spec (https://github.com/moby/moby/pull/33867 )
- Refactor MountPoint Setup function in volume.go (https://github.com/moby/moby/pull/33890 )
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: 366d3ec971
2017-07-04 20:23:38 -07:00
36ea5491ac
Merge pull request #287 from thaJeztah/use-v1.0.0-tag-for-go-difflib
...
Use v1.0.0 tag for go-difflib
Upstream-commit: dc9feff879
2017-07-04 17:32:00 +02:00
9fdb37ee64
Merge pull request #288 from thaJeztah/bump-go-winio
...
Bump go-winio to 0.4.2
Upstream-commit: e08cb59c8a
2017-07-04 16:59:32 +02:00
e415e09501
Clarify docker/go package
...
This package is used by Notary. Add a comment to
the vendor.conf file to explain what it contains
and what it's used for.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: 60fe70c900
2017-07-03 18:00:46 -07:00
66062dd9b7
bump golang.org/x/net to 7dcfb8076726a3fdd9353b6b8a1f1b6be6811bd6
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: 679ae70241
2017-07-03 17:40:41 -07:00
d48d41f4e2
bump gRPC to v1.3.0, add genproto, update protobuf
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: 74ec7a5b2c
2017-07-03 17:40:36 -07:00
9ee14880db
Bump SwarmKit to 79381d0840be27f8b3f5c667b348a4467d866eeb
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: 585e099a9a
2017-07-03 17:40:28 -07:00
ca1a24c1df
Bump go-winio to 0.4.2
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: 8a3c89b409
2017-07-03 14:37:56 -07:00
d7aea54f11
Use v1.0.0 tag for go-difflib
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: 42d83d20c9
2017-07-03 11:42:28 -07:00
c54c912237
Merge pull request #238 from vdemeester/update-go-connections
...
Update go-connections dependency
Upstream-commit: 8de604c857
2017-06-29 18:04:27 +02:00
6e00d88916
Update go-connections dependency
...
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: 9f34e340b3
2017-06-24 12:40:26 +02:00
d33398c2c4
vendor: update moby
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com >
Upstream-commit: 4adf701567
2017-06-23 11:34:22 -07:00
6f4d8ba43b
Merge pull request #124 from darrenstahlmsft/revendorGowinio
...
Update go-winio to v0.4.1
Upstream-commit: 5dd30732a2
2017-06-16 15:21:55 -07:00
04d4acede5
Update docker/docker to 4310f7da7e6bcd8185bf05e032f9b7321cfa6ea2
...
This fix updates docker/docker to 4310f7da7e6bcd8185bf05e032f9b7321cfa6ea2
This fix is related to moby/moby#33630 and docker/cli#167
Signed-off-by: Yong Tang <yong.tang.github@outlook.com >
Upstream-commit: 8c2f81892b
2017-06-13 02:53:25 +00:00
696660014b
Bump docker/docker to cd35e4beee13a7c193e2a89008cd87d38fcd0161
...
Reverts changes in pkg/term related to `OPOST` that pulled in through;
3574e6a674cd35e4beeec8141a1fb1...cd35e4beeegithub@gone.nl >
Upstream-commit: efd11bf69d
2017-06-08 16:27:49 +02:00
a920b458df
Update vendoring of docker/docker
...
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: 44ac80881f
2017-06-06 00:23:21 +02:00
ffaa61dd2d
Add missing dependencies to vendor, and fix generation imports
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: 875daf0130
2017-06-02 11:12:43 -04:00
f1ece28775
Update go-winio to v0.4.1
...
Signed-off-by: Darren Stahl <darst@microsoft.com >
Upstream-commit: 5981675d5f
2017-05-23 11:11:43 -07:00
e4194f2c92
moby vendoring
...
Signed-off-by: Abhinandan Prativadi <abhi@docker.com >
Upstream-commit: 2e07636e5e
2017-05-17 21:08:57 -07:00
e90e12563c
Vendor moby/moby @4874e0
...
Signed-off-by: Alessandro Boch <aboch@docker.com >
Upstream-commit: f7415aa953
2017-05-17 19:55:09 -07:00
ed481a9078
Update Vendor
...
Includes updates from docker/docker and imagespec
Docker-DCO-1.1-Signed-off-by: Josh Hawn <josh.hawn@docker.com > (github: jlhawn)
Upstream-commit: 4f9ac4899f
2017-05-17 11:44:54 -07:00
64cad477fc
Merge pull request #42 from dperny/service-logs-support-details
...
Add support for details on service logs
Upstream-commit: ae1124abad
2017-05-17 10:15:55 -04:00
6ae5b03502
Merge pull request #96 from nishanttotla/vendor-swarmkit
...
Vendor swarmkit 998a47fb9c2b727c8a48d372309af0b3032051e2
Upstream-commit: b3be2a0316
2017-05-17 14:05:19 +02:00
