Commit Graph
1231 Commits
Author SHA1 Message Date
Sebastiaan van Stijn 8e24a71ed1 Move "labels" to compose 3.3 format
Commit bb5dfdb8c5acd48f17498b111db360820a50baec added a
labels option to the docker-compose file format, but
added it to the 3.2 schema.

This patch moves the change to the 3.3 schema

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Signed-off-by: Colin Hebert <hebert.colin@gmail.com>
Upstream-commit: 131fe7dfb2
Component: cli
2017-05-11 08:30:48 +10:00
Brian Goff 1ae912ce6f Merge pull request #50 from aaronlehmann/secret-targets
Support Custom Secret Targets
Upstream-commit: 0f6f1eafe3
Component: cli
2017-05-10 17:04:20 -04:00
Aaron Lehmann 7b4cbe9700 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>
Upstream-commit: 978aa7ede0
Component: cli
2017-05-10 13:59:33 -07:00
Daniel Nephin 3c464d65a2 Merge pull request #66 from stevvooe/remove-ioutils-dependency-onfprint
cli/command/system: remove ioutils dependency
Upstream-commit: d4a2d5a520
Component: cli
2017-05-10 16:45:55 -04:00
Stephen J Day c85c900b60 cli/command/system: remove ioutils dependency
Signed-off-by: Stephen J Day <stephen.day@docker.com>
Upstream-commit: 9a892f1bbc
Component: cli
2017-05-10 13:38:06 -07:00
Daniel Nephin 91afc881f6 Merge pull request #56 from dnephin/add-compose-bindata-check
Add CI validation for compose bindata
Upstream-commit: bcc46e75ab
Component: cli
2017-05-10 15:49:06 -04:00
Brian Goff 31b2ee9f8a Merge pull request #65 from nishanttotla/update-swarmkit-vendor
Vendor swarmkit f420c4b9e1535170fc229db97ee8ac32374020b1
Upstream-commit: b00dd755fc
Component: cli
2017-05-10 15:41:56 -04:00
Nishant Totla e4ab7cd772 Vendor swarmkit f420c4b9e1535170fc229db97ee8ac32374020b1
Signed-off-by: Nishant Totla <nishanttotla@gmail.com>
Upstream-commit: 85504b4f98
Component: cli
2017-05-10 11:40:19 -07:00
Vincent Demeester 239a95a29d Merge pull request #55 from mlaventure/generate-proper-version
Display proper version information
Upstream-commit: ed5762cb9f
Component: cli
2017-05-10 09:34:22 +02:00
Madhu Venugopal 1abb72aa24 Merge pull request #60 from darrenstahlmsft/revendorGowinio
Move back to upstream go-winio v0.4.0
Upstream-commit: ed7b5bb462
Component: cli
2017-05-09 22:47:49 -07:00
Darren Stahl 8f6076ca93 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>
Upstream-commit: 9c32a9d1b7
Component: cli
2017-05-09 16:01:55 -07:00
Gaetan 3582ec71de Merge pull request #58 from gdevillele/pr-update-makefile
add “vendor” target in docker.Makefile
Upstream-commit: 26e708c29a
Component: cli
2017-05-09 15:03:52 -07:00
Gaetan de Villele db689040ae update makefiles: add “vendor” target in docker.Makefile…
… so that contributors don’t need “vndr” on their laptop

Signed-off-by: Gaetan de Villele <gdevillele@gmail.com>
Upstream-commit: c1f0bee31c
Component: cli
2017-05-09 14:29:14 -07:00
Kenfe-Mickael Laventure bfb4425b6f 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>
Upstream-commit: cf51bde7d9
Component: cli
2017-05-09 14:22:51 -07:00
Daniel Nephin 4ea068a247 Add check for compose bindata.
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: ef1d58dd87
Component: cli
2017-05-09 15:42:22 -04:00
Vincent Demeester ea920c9ef6 Merge pull request #54 from vdemeester/pull-and-templates
Add github templates and initial poule configuration
Upstream-commit: 079a5598f1
Component: cli
2017-05-09 19:58:32 +02:00
Vincent Demeester 49eef07b9e Add github templates and initial poule configuration
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: 1a549c13d3
Component: cli
2017-05-09 16:57:46 +02:00
Brian Goff 41997fe3f4 Merge pull request #52 from cyphar/notty-execid-leak
client: check tty before creating exec job
Upstream-commit: 5cbd2b7d6c
Component: cli
2017-05-09 09:38:38 -04:00
Aleksa Sarai 148130f314 client: check tty before creating exec job
This is necessary in order to avoid execId leaks in the case where a
`docker exec -it` is run without a terminal available for the client.
You can reproduce this issue by running the following command many
times.

  % nohup docker exec -it some_container true

The container `some_container` will have execIDs that will never
normally be cleaned up (because the client died before they were
started).

In addition, this patch adds a docker-inspect step to ensure that we
give "container does not exist" errors consistently.

Signed-off-by: Valentin Rothberg <vrothberg@suse.com>
Signed-off-by: Aleksa Sarai <asarai@suse.de>
Upstream-commit: ee7a956c54
Component: cli
2017-05-09 21:07:40 +10:00
Vincent Demeester 5361203188 Merge pull request #35 from AliyunContainerService/master
Support placement preferences in stack deployment
Upstream-commit: 3d58c3feac
Component: cli
2017-05-09 09:40:04 +02:00
Vincent Demeester 584cb63807 Merge pull request #41 from seemethere/fix_dev_null_device
Fix device for vendor target
Upstream-commit: 2daa598cce
Component: cli
2017-05-09 09:13:21 +02:00
Li Yi 1ae2b9f4e2 Support placement preferences in stack deployment
Move of moby/moby#32743

Signed-off-by: Li Yi <denverdino@gmail.com>
Upstream-commit: b3459936db
Component: cli
2017-05-09 07:00:45 +08:00
Daniel Nephin 1d522f8786 Merge pull request #27 from dnephin/more-linters
More linters and better circle-ci config
Upstream-commit: d844c487d4
Component: cli
2017-05-08 16:30:13 -04:00
Daniel Nephin 0285b89d9b Fix vendor.
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: aa07c40069
Component: cli
2017-05-08 16:15:54 -04:00
Daniel Nephin 697719d81a Run steps in parallel.
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: 4aa65d9833
Component: cli
2017-05-08 15:57:56 -04:00
Daniel Nephin 5a1580a2fc Add line length linter
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: c31d25653f
Component: cli
2017-05-08 15:57:56 -04:00
Daniel Nephin edf78faba7 Add interfacer linter
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: 37ccc00d0e
Component: cli
2017-05-08 15:57:50 -04:00
Daniel Nephin 8e8e43c61a Merge pull request #28 from dmcgowan/remove-trust-key
Remove unused trust key
Upstream-commit: d9fde418c0
Component: cli
2017-05-08 15:16:24 -04:00
Daniel Nephin 0748b867ce Merge pull request #38 from tiborvass/dont_rm_build_folder
Makefile: on clean, delete files in the build folder, but not the folder
Upstream-commit: 5a4873c21a
Component: cli
2017-05-08 15:14:15 -04:00
Derek McGowan f0517dfa96 Remove unused trust key
Signed-off-by: Derek McGowan <derek@mcgstyle.net>
Upstream-commit: 515d0fd842
Component: cli
2017-05-08 11:49:40 -07:00
Tibor Vass 18fe518a33 Makefile: on clean, delete files in the build folder, but not the folder
Signed-off-by: Tibor Vass <tibor@docker.com>
Upstream-commit: 17311d3d1a
Component: cli
2017-05-08 11:24:40 -07:00
Gaetan dbea31a457 Merge pull request #39 from tiborvass/rm_client
rm client and vendor it instead
Upstream-commit: 2a5d6c8aac
Component: cli
2017-05-08 11:14:06 -07:00
Eli Uriegas 13041f215c Fix device for vendor target
Signed-off-by: Eli Uriegas <eli.uriegas@docker.com>
Upstream-commit: 2792fbce0f
Component: cli
2017-05-08 10:56:21 -07:00
Gaetan de Villele 2ff5f1eac9 cli: gofmt + goimports
Signed-off-by: Gaetan de Villele <gdevillele@gmail.com>
Upstream-commit: 295140edf2
Component: cli
2017-05-08 10:51:30 -07:00
Tibor Vass 82b8acb640 rm client and vendor it instead
Signed-off-by: Tibor Vass <tibor@docker.com>
Upstream-commit: 57230a7212
Component: cli
2017-05-08 10:33:56 -07:00
Gaetan 54cf1dbeb6 Merge pull request #40 from gdevillele/pr-update-ci
update circle.yml to fix CI
Upstream-commit: 4411f5c7e0
Component: cli
2017-05-08 10:32:04 -07:00
Gaetan de Villele 7b959e8107 update circle.yml
- update from docker:17.04 to docker:17.05
- install git and ssh to suppress CircleCI warning

Signed-off-by: Gaetan de Villele <gdevillele@gmail.com>
Upstream-commit: f35682a2f0
Component: cli
2017-05-08 10:25:30 -07:00
Tibor Vass e21cee39a9 Merge pull request #11 from tiborvass/update-cli
Update cli folder with newer changes from moby/moby
Upstream-commit: a6feb55a48
Component: cli
2017-05-05 15:04:48 -07:00
Ian Campbell d20f087fd4 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>
Upstream-commit: c3648a9c94
Component: cli
2017-05-05 12:12:36 -07:00
Tibor Vass 147da8e072 update vendor.conf
Signed-off-by: Tibor Vass <tibor@docker.com>
Upstream-commit: b141fa3799
Component: cli
2017-05-03 19:27:10 -07:00
Tibor Vass 9ce2cd0d41 Fix expected output in test due to linter-induced change on error string
Signed-off-by: Tibor Vass <tibor@docker.com>
Upstream-commit: 03a36f9d50
Component: cli
2017-05-03 19:26:45 -07:00
Tibor Vass 1b83577108 Update cli folder with newer changes from moby/moby
Signed-off-by: Tibor Vass <tibor@docker.com>
Upstream-commit: ae84e6dd5e
Component: cli
2017-05-03 19:25:17 -07:00
Daniel Nephin f28f6fde81 Refacator pkg/streamformatter
StreamFormatter suffered was two distinct structs mixed into a single struct
without any overlap.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: 779012af69
Component: cli
2017-05-03 18:49:14 -07:00
yupengzte 065585bc3c delete ineffectual assignment
Signed-off-by: yupengzte <yu.peng36@zte.com.cn>
Upstream-commit: 9ca78094b5
Component: cli
2017-05-03 18:49:14 -07:00
Flavio Crisciani 056c564996 Inroduce SWARM --data-path-addr flag
This new flag will allow the configuration of an interface that
can be used for data path traffic to be isolated from control
plane traffic. This flag is simply percolated down to libnetwork
and will be used by all the global scope drivers (today overlay)

Negative test added for invalid flag arguments

Signed-off-by: Flavio Crisciani <flavio.crisciani@docker.com>
Upstream-commit: 169160ba63
Component: cli
2017-05-03 18:45:48 -07:00
Ying Li 8f4c7f862a Add the CACert parameter to the ExternalCA object in order to match
swarmkit's API type.  Make sure this parameter gets propagated to
swarmkit, and also add an extra option to the CLI when providing
external CAs to parse the CA cert from a file.

Signed-off-by: Ying Li <ying.li@docker.com>
Upstream-commit: 81f87595fe
Component: cli
2017-05-03 18:45:48 -07:00
Evan Hazlett dae2aee5bb remove service runtime filter in stack command
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
Upstream-commit: 6665c9c747
Component: cli
2017-05-03 18:45:48 -07:00
Aaron Lehmann 9903b4cd8e cli: Correct command/image tests for testify
These tests were caught in the crossfire of the transition to testify.
testify has a few subtle differences from the similar custom framework
it replaced:

- Error behaves differently
- Equal takes its arguments in a different order

This PR also takes the opportunity to use a few shorthands from testify,
such as Len, True, and False.

Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
Upstream-commit: 6f94ab98f5
Component: cli
2017-05-03 18:45:48 -07:00
Evan Hazlett 461a743521 move service runtime filter to server
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
Upstream-commit: 25809f8991
Component: cli
2017-05-03 18:44:11 -07:00
Vincent Demeester fe666a9eff Fix docker run -it on windows
Signed-off-by: Vincent Demeester <vincent@demeester.fr>
Upstream-commit: c67589a52c
Component: cli
2017-05-03 18:41:19 -07:00