Commit Graph

1190 Commits

Author SHA1 Message Date
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
0285b89d9b Fix vendor.
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: aa07c40069
Component: cli
2017-05-08 16:15:54 -04:00
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
772ad3f5fe Add format to docker stack ls
Signed-off-by: Boaz Shuster <ripcurld.github@gmail.com>
Upstream-commit: 5b6bd92862
Component: cli
2017-05-03 18:41:19 -07:00
8339598b82 Unit tests for cli/commands/image (except build and tag)
Signed-off-by: Ignacio Capurro <icapurrofagian@gmail.com>
Upstream-commit: e7793092a2
Component: cli
2017-05-03 18:40:22 -07:00
02642ac6f8 Output docker swarm join on a single line
This avoids issues when copy/pasting between different shells on
different OSes, which may not all support `\` as a continuation
character.

Fixes #32725

Signed-off-by: Dave Henderson <dhenderson@gmail.com>
Upstream-commit: 2b31a4bf8d
Component: cli
2017-05-03 17:46:41 -07:00
09a02ca02d Set Composefile WorkingDir to dirname of the composefile.
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: a1b7969bce
Component: cli
2017-05-03 17:46:40 -07:00
82e97b94dd Regenerate schema with the correct libraries
Signed-off-by: Colin Hebert <hebert.colin@gmail.com>
Upstream-commit: 9c02b38bec
Component: cli
2017-05-03 17:46:40 -07:00
979faf3831 Run go generate github.com/docker/docker/cli/compose/schema
Signed-off-by: Colin Hebert <hebert.colin@gmail.com>
Upstream-commit: 53b43f02e2
Component: cli
2017-05-03 17:46:40 -07:00
fed1be2dd6 Add support for labels during build with compose
Signed-off-by: Colin Hebert <hebert.colin@gmail.com>
Upstream-commit: a2c8291e1e
Component: cli
2017-05-03 17:46:40 -07:00
752e3db428 do not allow duration less than 1 ms in healthcheck parameters
Signed-off-by: Dong Chen <dongluo.chen@docker.com>
Upstream-commit: a316b380e7
Component: cli
2017-05-03 17:46:40 -07:00
0f7b433a23 Add logdrivers to /info
This is required for swarmkit to be able to filter based on log driver.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Upstream-commit: c44e74e676
Component: cli
2017-05-03 17:46:39 -07:00
7a4be5671b remove --init-path from client
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
Upstream-commit: dea809813e
Component: cli
2017-05-03 17:46:39 -07:00
d186189ce5 add ci build status badge to readme
Signed-off-by: Gaetan de Villele <gdevillele@gmail.com>
Upstream-commit: 92094372d3
Component: cli
2017-05-03 13:28:06 -07:00
7b15b0b584 Merge pull request #23 from dnephin/fix-goimports-on-master
Fix goimports failure on master
Upstream-commit: b7d3dd4d41
Component: cli
2017-05-03 22:27:16 +02:00
9afb137b84 Merge pull request #19 from dnephin/check-vendor
Check vendor
Upstream-commit: 328fa4b717
Component: cli
2017-05-03 16:01:56 -04:00
d51e95efed Fix goimports failure on master.
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: 36a7842089
Component: cli
2017-05-03 15:58:39 -04:00
5f4fc55626 Merge pull request #13 from dnephin/cleanup-post-docker-stin
Small build client cleanup handling dockerfile from stdin
Upstream-commit: c202b4b987
Component: cli
2017-05-03 15:45:41 -04:00
3ca812826a Merge pull request #9 from gdevillele/pr-update-makefile
update Makefile
Upstream-commit: 589afd2f50
Component: cli
2017-05-03 15:43:26 -04:00
dfb4d9262a define targets as “phony”, add comments, and mount docker.sock in dev target
Signed-off-by: Gaetan de Villele <gdevillele@gmail.com>
Upstream-commit: 7f7e842702
Component: cli
2017-05-03 11:14:06 -07:00
9b62a84ca8 Add ineffassign linter.
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: b86533c479
Component: cli
2017-05-02 17:57:46 -04:00
dce23b177f Add gocycle lint
Whitelist some existing offenders, and use a high limit for now.
This limit should decrese over time.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: 08af0f28c5
Component: cli
2017-05-02 17:57:46 -04:00
8315ceea29 Add deadcode linter.
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: 8f73a12f9b
Component: cli
2017-05-02 17:57:46 -04:00
8b2d591082 Add goimports to linting
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: 1378bf3dbe
Component: cli
2017-05-02 17:57:46 -04:00
67b6e94f47 Enable golint
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: 690ef8af79
Component: cli
2017-05-02 17:57:46 -04:00
cc564a7692 Verify that vendored files are correct
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: 31851fbe3c
Component: cli
2017-05-02 17:57:32 -04:00
93938768a0 Add gometalinter to CI
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: e3f677794a
Component: cli
2017-05-02 17:15:56 -04:00
d9dd021654 Merge pull request #15 from gdevillele/pr-faster-build
improve speed of "go build" as well as "docker build"
Upstream-commit: 639764c00d
Component: cli
2017-04-28 13:08:39 -07:00
cc473d040f Move addDockerfileToBuildContext to the build package.
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: a5044b4982
Component: cli
2017-04-28 15:11:36 -04:00
f66cf98ef3 Extract dockerfile handling functions.
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: b98e03d3b0
Component: cli
2017-04-28 15:11:36 -04:00
e65709f0e3 Cleanup handling of the - for stdin
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: 59983759c2
Component: cli
2017-04-28 15:11:36 -04:00