5421c51a06
Merge pull request #569 from vdemeester/compose-multiple-version-mergo
...
Add support for multiple composefile when deploying
Upstream-commit: 25e969c854
2018-02-06 00:41:43 -08:00
cb4ddc2058
Fix vendor validation
...
vendor/ must be removed first, otherwise files added to vendor/ but not vendor.conf
will not cause the validation to fail
Signed-off-by: Daniel Nephin <dnephin@gmail.com >
Upstream-commit: a6dedd1a12
2018-02-02 11:01:05 -08:00
e5e113b93d
bump docker/go-connections to 98e7d807e5d804e4e42a98d74d1dd695321224ef
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: b7a9f027f3
2018-01-31 01:38:06 -08:00
4d611b9990
Add support for multiple composefile when deploying
...
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: 1872bd802c
2018-01-29 17:27:25 -08:00
62d42837f0
bump swarmkit to 713d79dc8799b33465c58ed120b870c52eb5eb4f
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: a6a51aadcb
2018-01-24 02:13:53 -08:00
6e37587f1a
Update runc and image-spec
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: 8707bde082
2018-01-24 02:10:17 -08:00
dda53861be
Bump go-winio to 0.4.6
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: 2bf989e129
2018-01-24 02:04:09 -08:00
b5099bad79
Bump moby/moby to e11bf870a3170a1d2b1e177a0d7ccc66200bd643
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: a3be7a6720
2018-01-24 02:01:24 -08:00
d7b5fca8a7
Update golang.org/x/net to not panic
...
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: 12c0825a4c
2017-12-28 14:40:09 +01:00
1d466a29ee
Update vendoring
...
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: 61713c42a4
2017-12-26 11:45:56 +01:00
4b3a19ed1e
Add support for kubernetes in docker cli
...
- Add support for kubernetes for docker stack command
- Update to go 1.9
- Add kubernetes to vendors
- Print orchestrator in docker version command
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Signed-off-by: Silvin Lubecki <silvin.lubecki@docker.com >
Upstream-commit: 8417e49792
2017-12-26 11:22:32 +01:00
29d0c2b494
vendor moby api to get new version types
...
Signed-off-by: Tibor Vass <tibor@docker.com >
Upstream-commit: fe3941af7d
2017-12-07 02:04:10 +01:00
c9781de504
Bump runc to b2567b37d7b75eb4cf325b77297b140ea686ce8f
...
To match what's used in Moby
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: 669b8507be
2017-12-06 11:09:36 -08:00
7b947af7df
update docker/docker for ExecConfig WorkingDir support
...
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com >
Upstream-commit: 798ec76223
2017-12-06 19:04:42 +01:00
f62d716bb0
Revendored swarmkit
...
Signed-off-by: Renaud Gaubert <renaud.gaubert@gmail.com >
Upstream-commit: 7843aec98c
2017-11-28 18:03:10 +01:00
1da9654cd5
Update spf13/cobra
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: c01f642800
2017-11-20 12:42:11 -05:00
8a571d7e05
Bump moby to f4d4f5863156b82ef146b6ff1e845f8dcf019f12
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: 5735fff6fc
2017-11-08 17:50:58 +01:00
095f04e761
Move notary to its new location
...
The https://github.com/docker/notary repository has moved to
https://github.com/theupdateframework/notary
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: 6cd58063fa
2017-10-30 17:21:41 +01:00
dd79157d92
Merge pull request #566 from riyazdf/docker-trust-2
...
docker trust: interact with signers and keys
Upstream-commit: 0c4fa699eb
2017-10-30 17:03:58 +01:00
80651d6c61
revendor notary for updated import/export packages, update with rebase
...
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com >
Upstream-commit: b4ef2ddb8b
2017-10-30 16:55:59 +01:00
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
d7f53f25fe
vendor: update notary and deps for new trust commands
...
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com >
Upstream-commit: f47b1a3c6d
2017-10-24 11:23:32 +02: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
