Vincent Demeester
0122730faf
Fix error with merge composefile with networks…
...
… and other cases too. Updating mergo fixes the bugs (but introduced a
slight behaviour change that had to be fixed too)
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2018-04-05 10:37:35 +02:00
Tonis Tiigi
a1cbaa827b
vendor: update moby to ed7b6428
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2018-03-27 14:11:29 -07:00
Sebastiaan van Stijn
236a84759a
Merge pull request #941 from dnephin/fix-compose-network-name
...
Fix compose network name
2018-03-26 23:41:44 +02:00
Sebastiaan van Stijn
b17215c456
Bump moby to ae7016427f8cba4e4d8fcb979d6ba313ee2c0702
...
Bring in:
- moby 36517 ensure hijackedConn implements CloseWrite function
- moby 36489 (fixes `errdefs.ErrSystem` interface)
- moby 36506 pkg/mount: use sort.Slice
- moby 36451 Windows: Report Version and UBR
Also update moby dependencies to keep them in sync
- golang.org/x/sync (no code changes)
- Bump runc to 4fc53a81fb7c994640722ac585fa9ca548971871
- Bump swarmkit to 49a9d7f6ba3c1925262641e694c18eb43575f74b
no local code changes
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2018-03-15 01:51:31 +01:00
Daniel Nephin
ca88e5e9df
update vendor, add cmpopts
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2018-03-12 15:15:23 -04:00
Sebastiaan van Stijn
f351f00f9e
Merge pull request #914 from justincormack/notaryup
...
Update Notary vendor to 0.6.0 release
2018-03-07 10:38:53 +01:00
Daniel Nephin
5ef8835f23
Replace testify vendor with updated gotestyourself
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2018-03-05 19:41:14 -05:00
Justin Cormack
9da428da2e
Update Notary vendor to 0.6.0 release
...
We were on a slightly earlier random commit.
We should try to stay on releases where possible...
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2018-03-02 14:56:12 +00:00
Vincent Demeester
98ba439f67
Update gotestyourself dependency
...
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2018-02-28 16:11:02 +01:00
Sebastiaan van Stijn
60930d309c
Bump moby to 0ede01237c9ab871f1b8db0364427407f3e46541
...
Includes:
- [client] Remove duplicate NewClient functions
- Add API support for templated secrets and configs
- Adjust minimum API version for templated configs/secrets
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2018-02-21 18:48:42 +01:00
Sebastiaan van Stijn
3c24e5ce12
Bump swarmkit to f74983e7c015a38a81c8642803a78b8322cf7eac
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2018-02-20 18:07:28 +01:00
Sebastiaan van Stijn
58e29ec11e
Update github.com/containerd/continuity
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2018-02-20 18:03:37 +01:00
Sebastiaan van Stijn
e17a680f01
bump runc to 6c55f98695e902427906eed2c799e566e3d3dfb5
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2018-02-20 17:58:11 +01:00
Sebastiaan van Stijn
88874b5eff
Update go-connections to 7beb39f0b969b075d1325fecb092faf27fd357b6
...
- Support parsing SCTP port mapping
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2018-02-20 17:45:42 +01:00
Sebastiaan van Stijn
aaa7a7cb95
Bump docker/docker to 079ed017b61eb819b8184b90013ce89465d3aaba
...
- Add API support for SCTP port mapping
- Add canonical import path
- Add `REMOVE` and `ORPHANED` to TaskState
- Fix TLS from environment variables in client
- Introduce NewClientWithOpts func to build custom client easily
- Wrap response errors for container copy methodsto fix error detection using
`IsErrNotFound` and `IsErrNotImplemented` for `ContainerStatPath`,
`CopyFromContainer`, and `CopyToContainer` methods.
- Produce errors when empty ids are passed into inspect calls
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2018-02-20 17:17:49 +01:00
Kir Kolyshkin
6566f5ff2c
Bump cpuguy83/go-md2man to v1.0.8
...
The biggest motivation for this is proper table rendering; in the
old version it was broken so tables were not rendered at al
(i.e. anything that was put into table was lost, for example,
description of LOG_* log levels in dockerd(8) page).
This also fixes lists, including nested lists. This fixes the
description of behavior in docker-cp(1) which is rendered as a tree:
BEFORE:
```
Assuming a path separator of /, a first argument of SRC_PATH and second
argument of DEST_PATH, the behavior is as follows:
· SRC_PATH specifies a file
· DEST_PATH does not exist
· the file is saved to a file created at DEST_PATH
· DEST_PATH does not exist and ends with /
· Error condition: the destination directory must exist.
...
```
AFTER:
```
Assuming a path separator of /, a first argument of SRC_PATH and second
argument of DEST_PATH, the behavior is as follows:
· SRC_PATH specifies a file
· DEST_PATH does not exist
· the file is saved to a file created at DEST_PATH
· DEST_PATH does not exist and ends with /
· Error condition: the destination directory must exist.
...
```
Manually checking the diff between the man pages generated by the old
and the new version, there are no changes other than the indentation
(.RS/.RE) for lists, and proper formatting for tables. Formatted man
pages also look decent, nothing seems broken.
Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
2018-02-12 12:01:20 -08:00
Sebastiaan van Stijn
25e969c854
Merge pull request #569 from vdemeester/compose-multiple-version-mergo
...
Add support for multiple composefile when deploying
2018-02-06 00:41:43 -08:00
Sebastiaan van Stijn
b7a9f027f3
bump docker/go-connections to 98e7d807e5d804e4e42a98d74d1dd695321224ef
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2018-01-31 01:38:06 -08:00
Vincent Demeester
1872bd802c
Add support for multiple composefile when deploying
...
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2018-01-29 17:27:25 -08:00
Sebastiaan van Stijn
a6a51aadcb
bump swarmkit to 713d79dc8799b33465c58ed120b870c52eb5eb4f
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2018-01-24 02:13:53 -08:00
Sebastiaan van Stijn
8707bde082
Update runc and image-spec
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2018-01-24 02:10:17 -08:00
Sebastiaan van Stijn
2bf989e129
Bump go-winio to 0.4.6
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2018-01-24 02:04:09 -08:00
Sebastiaan van Stijn
a3be7a6720
Bump moby/moby to e11bf870a3170a1d2b1e177a0d7ccc66200bd643
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2018-01-24 02:01:24 -08:00
Christy Perez
17886d7547
vendor updates for manifest cmd
...
Signed-off-by: Christy Perez <christy@linux.vnet.ibm.com>
2018-01-08 10:40:55 -06:00
Vincent Demeester
61713c42a4
Update vendoring
...
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2017-12-26 11:45:56 +01:00
Vincent Demeester
1ff277ad8f
Fix some build failures
...
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2017-12-26 11:22:32 +01:00
Vincent Demeester
8417e49792
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>
2017-12-26 11:22:32 +01:00
Tibor Vass
fe3941af7d
vendor moby api to get new version types
...
Signed-off-by: Tibor Vass <tibor@docker.com>
2017-12-07 02:04:10 +01:00
Sebastiaan van Stijn
669b8507be
Bump runc to b2567b37d7b75eb4cf325b77297b140ea686ce8f
...
To match what's used in Moby
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2017-12-06 11:09:36 -08:00
Nicolas De Loof
798ec76223
update docker/docker for ExecConfig WorkingDir support
...
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
2017-12-06 19:04:42 +01:00
Renaud Gaubert
7843aec98c
Revendored swarmkit
...
Signed-off-by: Renaud Gaubert <renaud.gaubert@gmail.com>
2017-11-28 18:03:10 +01:00
Daniel Nephin
c01f642800
Update spf13/cobra
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2017-11-20 12:42:11 -05:00
Sebastiaan van Stijn
5735fff6fc
Bump moby to f4d4f5863156b82ef146b6ff1e845f8dcf019f12
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2017-11-08 17:50:58 +01:00
Sebastiaan van Stijn
6cd58063fa
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>
2017-10-30 17:21:41 +01:00
Sebastiaan van Stijn
0c4fa699eb
Merge pull request #566 from riyazdf/docker-trust-2
...
docker trust: interact with signers and keys
2017-10-30 17:03:58 +01:00
Riyaz Faizullabhoy
b4ef2ddb8b
revendor notary for updated import/export packages, update with rebase
...
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com>
2017-10-30 16:55:59 +01:00
Sebastiaan van Stijn
e4940cb8d2
Merge pull request #621 from charrywanganthony/displaystringutils
...
Refactor stringutils and fix docker search output form
2017-10-27 11:08:36 +02:00
Chao Wang
926b20fcb5
Refactor stringutils and fix docker search output form when the description has CJK character
...
Signed-off-by: Chao Wang <wangchao.fnst@cn.fujitsu.com>
2017-10-27 11:15:10 +08:00
Daniel Nephin
b68c3d007f
Merge pull request #601 from dnephin/compose-cast-after-interpolate
...
[Compose] Cast values to expected type after interpolating values
2017-10-26 12:20:04 -04:00
Daniel Nephin
0f2ebae056
Update vendor of spf13/pflag and spf13/cobra
...
Use upstream isntead of fork for cobra.
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2017-10-25 12:50:37 -04:00
Riyaz Faizullabhoy
f47b1a3c6d
vendor: update notary and deps for new trust commands
...
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com>
2017-10-24 11:23:32 +02:00
Sebastiaan van Stijn
2f393694c2
Bump moby to 1ffa10ee2630917e4f2a88f5e4daf34d700eaa1f
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2017-10-12 01:01:48 +02:00
Daniel Nephin
edcea7c7a6
Vendor gotestyourself/env
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2017-10-04 17:36:43 -04:00
Sebastiaan van Stijn
197842fd45
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>
2017-09-30 18:26:02 +02:00
Sebastiaan van Stijn
31908a4b45
Merge pull request #570 from thaJeztah/bump-moby-vendor
...
Bump moby vendor to 14ce1f1cf48e9859223c6311de58aec4dc
2017-09-29 23:08:16 +02:00
Victor Vieux
00cc728dfb
Merge pull request #572 from thaJeztah/bump-vendor-for-powerpc
...
revendor logrus and x/crypto
2017-09-29 13:58:38 -07:00
Sebastiaan van Stijn
98dbfeee76
bump moby/moby and dependencies to 14ce1f1cf48e9859223c6311de58aec4dc0f046c
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2017-09-29 17:44:49 +02:00
Sebastiaan van Stijn
e3b7700fb9
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>
2017-09-29 15:32:42 +02:00
Sebastiaan van Stijn
368b639e7e
Bump vndr to a6e196d8b4b0cbbdc29aebdb20c59ac6926bb384
...
Includes a fix to cleanup unused vendor-directories
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2017-09-29 14:58:05 +02:00
Sebastiaan van Stijn
be8dab26a3
Merge pull request #451 from tych0/use-pass-backend
...
Use pass backend
2017-09-26 16:40:32 +02:00
Riyaz Faizullabhoy
7c5b836ca5
trust: add Repository client interface
...
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com>
2017-09-25 09:34:54 -07:00
Riyaz Faizullabhoy
fb1cbaeb66
vendor: upgrade notary version for docker trust
...
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com>
2017-09-25 09:34:52 -07:00
Tycho Andersen
6bd5c63c78
version bump for docker-credential-helpers
...
Signed-off-by: Tycho Andersen <tycho@docker.com>
2017-09-20 11:15:49 -06:00
Daniel Nephin
7b77ab5c60
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
2017-09-13 15:19:26 -04:00
Andrew Hsu
850b46e67c
vndr github.com/docker/docker to 84144a8 to fix stuff
...
Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
2017-09-12 17:27:15 -07:00
Sébastien HOUZÉ
7e407610d4
Reset idPair during build to avoid cache busting
...
Signed-off-by: Sébastien HOUZÉ <cto@verylastroom.com>
2017-09-13 02:04:03 +02:00
Andrew Hsu
ef027b6d72
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>
2017-09-08 16:27:56 -07:00
Daniel Nephin
683b6226ed
Add gotestyourself/poll
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2017-09-06 17:07:35 -04:00
Daniel Nephin
724f03bb23
Remove unused depdendencies from vendor
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2017-09-01 19:41:06 -04:00
Simon Ferquel
a0113c3a44
updated vendoring
...
Signed-off-by: Simon Ferquel <simon.ferquel@docker.com>
2017-09-01 19:41:06 -04:00
Daniel Nephin
8edd2dd3df
Remove unused vendor.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2017-08-29 13:22:17 -04:00
Tibor Vass
6c3d93bbb6
Merge pull request #445 from dnephin/add-end-to-end-suite
...
Add end to end suite
2017-08-23 16:16:09 -07:00
Daniel Nephin
846a31aa50
Use new internal testutil.ErrorContains()
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2017-08-22 10:14:25 -04:00
Daniel Nephin
882992c6fc
Add gotestyourself dependency.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2017-08-16 14:08:08 -04:00
Daniel Nephin
85f7ed8cfa
Add gotestyourself dependency.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2017-08-16 10:35:56 -04:00
Vincent Demeester
680c827075
Re-run vndr on docker/docker to remove pkg/templates
...
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2017-08-08 17:26:30 +02:00
Daniel Nephin
2dac00bdca
Merge pull request #319 from keloyang/bugfix-docker-cp
...
Bugfix docker cp
2017-07-26 11:56:12 -04:00
Vincent Demeester
472ce90624
Merge pull request #291 from thaJeztah/bump-swarmkit
...
Bump swarmkit and dependencies to 79381d0840be27f8b3f5c667b348a4467d866eeb
2017-07-21 11:07:38 +02:00
Shukui Yang
a996206ced
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>
2017-07-12 01:28:55 +00:00
Sebastiaan van Stijn
3e3c9d69d8
Revendor dependencies
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2017-07-10 10:56:42 -07:00
Sebastiaan van Stijn
366d3ec971
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>
2017-07-04 20:23:38 -07:00
Sebastiaan van Stijn
74ec7a5b2c
bump gRPC to v1.3.0, add genproto, update protobuf
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2017-07-03 17:40:36 -07:00
Sebastiaan van Stijn
585e099a9a
Bump SwarmKit to 79381d0840be27f8b3f5c667b348a4467d866eeb
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2017-07-03 17:40:28 -07:00
Sebastiaan van Stijn
8a3c89b409
Bump go-winio to 0.4.2
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2017-07-03 14:37:56 -07:00
Vincent Demeester
8de604c857
Merge pull request #238 from vdemeester/update-go-connections
...
Update go-connections dependency
2017-06-29 18:04:27 +02:00
Vincent Demeester
9f34e340b3
Update go-connections dependency
...
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2017-06-24 12:40:26 +02:00
Tonis Tiigi
4adf701567
vendor: update moby
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2017-06-23 11:34:22 -07:00
Aaron Lehmann
5dd30732a2
Merge pull request #124 from darrenstahlmsft/revendorGowinio
...
Update go-winio to v0.4.1
2017-06-16 15:21:55 -07:00
Daniel Nephin
343d836a95
Run docs and man generation in CI
...
Also cleanup the scripts a bit to be more consistent, and fail on errors.
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2017-06-14 14:59:48 -07:00
Yong Tang
8c2f81892b
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>
2017-06-13 02:53:25 +00:00
Sebastiaan van Stijn
efd11bf69d
Bump docker/docker to cd35e4beee13a7c193e2a89008cd87d38fcd0161
...
Reverts changes in pkg/term related to `OPOST` that pulled in through;
3574e6a674
And reverted upstream in;
cd35e4beee
Full diff;
c8141a1fb1...cd35e4beee
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2017-06-08 16:27:49 +02:00
Vincent Demeester
44ac80881f
Update vendoring of docker/docker
...
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2017-06-06 00:23:21 +02:00
Daniel Nephin
875daf0130
Add missing dependencies to vendor, and fix generation imports
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2017-06-02 11:12:43 -04:00
Darren Stahl
5981675d5f
Update go-winio to v0.4.1
...
Signed-off-by: Darren Stahl <darst@microsoft.com>
2017-05-23 11:11:43 -07:00
Abhinandan Prativadi
2e07636e5e
moby vendoring
...
Signed-off-by: Abhinandan Prativadi <abhi@docker.com>
2017-05-17 21:08:57 -07:00
Alessandro Boch
f7415aa953
Vendor moby/moby @4874e0
...
Signed-off-by: Alessandro Boch <aboch@docker.com>
2017-05-17 19:55:09 -07:00
Josh Hawn
4f9ac4899f
Update Vendor
...
Includes updates from docker/docker and imagespec
Docker-DCO-1.1-Signed-off-by: Josh Hawn <josh.hawn@docker.com> (github: jlhawn)
2017-05-17 11:44:54 -07:00
Brian Goff
ae1124abad
Merge pull request #42 from dperny/service-logs-support-details
...
Add support for details on service logs
2017-05-17 10:15:55 -04:00
Sebastiaan van Stijn
b3be2a0316
Merge pull request #96 from nishanttotla/vendor-swarmkit
...
Vendor swarmkit 998a47fb9c2b727c8a48d372309af0b3032051e2
2017-05-17 14:05:19 +02:00
Drew Erny
ebc0eff478
Add support for details on service logs
...
Adds CLI and client support for details on service logs. CLI component
of moby/moby#32996 .
Signed-off-by: Drew Erny <drew.erny@docker.com>
2017-05-16 16:53:58 -07:00
Nishant Totla
4ac30da2a9
Vendor swarmkit 998a47fb9c2b727c8a48d372309af0b3032051e2
...
Signed-off-by: Nishant Totla <nishanttotla@gmail.com>
2017-05-16 15:06:07 -07:00
Ying Li
103bfb2739
Re-vendor docker/docker.
...
Signed-off-by: Ying Li <ying.li@docker.com>
2017-05-16 14:31:19 -07:00
Aaron Lehmann
15b5dda768
Vendor docker/docker
...
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
2017-05-11 13:42:46 -07:00
Michael Crosby
56ea98f5ad
Update docker dependency
...
We need the `pkg/term` dep from docker with OPOST added to the MakeRaw
call in order for the new runc 1.0 integration to work properly.
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2017-05-10 16:07:07 -07:00
Brian Goff
0f6f1eafe3
Merge pull request #50 from aaronlehmann/secret-targets
...
Support Custom Secret Targets
2017-05-10 17:04:20 -04:00
Aaron Lehmann
978aa7ede0
Support Custom Secret Targets
...
CLI counterpart to https://github.com/moby/moby/pull/32571 . Just
involves vendoring github.com/docker/docker/opts.
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
2017-05-10 13:59:33 -07:00
Nishant Totla
85504b4f98
Vendor swarmkit f420c4b9e1535170fc229db97ee8ac32374020b1
...
Signed-off-by: Nishant Totla <nishanttotla@gmail.com>
2017-05-10 11:40:19 -07:00
Vincent Demeester
ed5762cb9f
Merge pull request #55 from mlaventure/generate-proper-version
...
Display proper version information
2017-05-10 09:34:22 +02:00
Darren Stahl
9c32a9d1b7
Move back to upstream go-winio which includes the
...
needed fixes, as well as the support for go1.8.x
Signed-off-by: Darren Stahl <darst@microsoft.com>
2017-05-09 16:01:55 -07:00
Kenfe-Mickael Laventure
cf51bde7d9
Display proper version information
...
- The cli version defaults to "unknown-version" unless set via the VERSION env var
- The commit version can be overridden via GITCOMMIT env var
- The build time can be overridden via BUILDTIME env var
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
2017-05-09 14:22:51 -07:00
Tibor Vass
57230a7212
rm client and vendor it instead
...
Signed-off-by: Tibor Vass <tibor@docker.com>
2017-05-08 10:33:56 -07:00
Ian Campbell
c3648a9c94
Add `docker build --iidfile=FILE`
...
This is synonymous with `docker run --cidfile=FILE` and writes the digest of
the newly built image to the named file. This is intended to be used by build
systems which want to avoid tagging (perhaps because they are in CI or
otherwise want to avoid fixed names which can clash) by enabling e.g. Makefile
constructs like:
image.id: Dockerfile
docker build --iidfile=image.id .
do-some-more-stuff: image.id
do-stuff-with <image.id
Currently the only way to achieve this is to use `docker build -q` and capture
the stdout, but at the expense of losing the build output.
In non-silent mode (without `-q`) with API >= v1.29 the caller will now see a
`JSONMessage` with the `Aux` field containing a `types.BuildResult` in the
output stream for each image/layer produced during the build, with the final
one being the end product. Having all of the intermediate images might be
interesting in some cases.
In silent mode (with `-q`) there is no change, on success the only output will
be the resulting image digest as it was previosuly.
There was no wrapper to just output an Aux section without enclosing it in a
Progress, so add one here.
Added some tests to integration cli tests.
Signed-off-by: Ian Campbell <ian.campbell@docker.com>
2017-05-05 12:12:36 -07:00
Tibor Vass
b141fa3799
update vendor.conf
...
Signed-off-by: Tibor Vass <tibor@docker.com>
2017-05-03 19:27:10 -07:00
Daniel Nephin
31c8672805
Update vendor.conf
...
Signed-off-by: Daniel Nephin <dnephin@gmail.com>
2017-04-18 18:35:14 -04:00
Daniel Nephin
6686ada6a4
Add vendor
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2017-04-17 18:12:58 -04:00