1
0
mirror of https://github.com/docker/cli.git synced 2026-01-16 20:22:36 +03:00
Commit Graph

1185 Commits

Author SHA1 Message Date
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
Boaz Shuster
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
Ignacio Capurro
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
Dave Henderson
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
Daniel Nephin
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
Colin Hebert
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
Colin Hebert
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
Colin Hebert
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
Dong Chen
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
Brian Goff
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
Antonio Murdaca
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
Gaetan
bdb1bed9c8 Merge pull request #24 from gdevillele/pr-add-build-status-badge
add CI build status badge to README
Upstream-commit: 1c0847b912
Component: cli
2017-05-03 14:32:46 -07:00
Gaetan de Villele
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
Vincent Demeester
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
Daniel Nephin
9afb137b84 Merge pull request #19 from dnephin/check-vendor
Check vendor
Upstream-commit: 328fa4b717
Component: cli
2017-05-03 16:01:56 -04:00
Daniel Nephin
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
Daniel Nephin
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
Daniel Nephin
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
Vincent Demeester
df3bda7143 Merge pull request #20 from dnephin/more-lint
Add more lint checks
Upstream-commit: 9e413798bf
Component: cli
2017-05-03 20:53:30 +02:00
Gaetan de Villele
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
Daniel Nephin
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
Daniel Nephin
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
Daniel Nephin
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
Daniel Nephin
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
Daniel Nephin
67b6e94f47 Enable golint
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: 690ef8af79
Component: cli
2017-05-02 17:57:46 -04:00
Daniel Nephin
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
Daniel Nephin
a91f6c4112 Merge pull request #18 from dnephin/add-linter
Add gometalinter to CI
Upstream-commit: 0a613971b9
Component: cli
2017-05-02 17:54:02 -04:00
Daniel Nephin
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
Gaetan
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
Daniel Nephin
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
Daniel Nephin
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
Daniel Nephin
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
Gaetan
35669218fd Merge pull request #7 from gdevillele/pr-fix-service-ls-filter
remove service runtime filter from client
Upstream-commit: f5c8a61c9b
Component: cli
2017-04-28 10:48:25 -07:00
Gaetan
0882299bad Merge pull request #16 from gdevillele/pr-add-test-target
add “test” target to makefiles
Upstream-commit: 2075433f95
Component: cli
2017-04-28 10:47:51 -07:00
Gaetan de Villele
71e45d9207 add “test” target and make CI use it
Signed-off-by: Gaetan de Villele <gdevillele@gmail.com>
Upstream-commit: 4d4203f7fd
Component: cli
2017-04-27 15:57:35 -07:00
Gaetan de Villele
d9980d3397 remove service runtime filter from client
it’s moving to the server.

Signed-off-by: Gaetan de Villele <gdevillele@gmail.com>
Upstream-commit: 5aa70d68b3
Component: cli
2017-04-27 15:07:20 -07:00
Gaetan de Villele
11241e3a61 make go build and docker build operations faster
Signed-off-by: Gaetan de Villele <gdevillele@gmail.com>
Upstream-commit: 87449dbaa1
Component: cli
2017-04-27 15:06:57 -07:00
Gaetan
e082a7228d Merge pull request #14 from gdevillele/pr-circle-ci
add CircleCI config file
Upstream-commit: e8d0ecdf7e
Component: cli
2017-04-27 14:58:58 -07:00
Gaetan de Villele
78926d2ac0 add circle ci config file
Signed-off-by: Gaetan de Villele <gdevillele@gmail.com>
Upstream-commit: 6b2a61a311
Component: cli
2017-04-27 14:24:28 -07:00
Gaetan
46ddd9d3d6 Merge pull request #10 from gdevillele/pr-ci-dockerfile
add Dockerfile for CI
Upstream-commit: 7e7df40930
Component: cli
2017-04-27 14:19:24 -07:00
Gaetan de Villele
93479d673b add Dockerfile for CI
Signed-off-by: Gaetan de Villele <gdevillele@gmail.com>
Upstream-commit: 9c3f1d9ae3
Component: cli
2017-04-27 13:36:29 -07:00
Daniel Nephin
e0163aef4b Merge pull request #8 from tiborvass/fix-windows
windows: remove workaround for go#15286 and have compiling work on windows
Upstream-commit: 728060a7eb
Component: cli
2017-04-26 10:23:35 -04:00
Tibor Vass
8ef7f9b38c windows: remove workaround for go#15286 and have compiling work on windows
Signed-off-by: Tibor Vass <tibor@docker.com>
Upstream-commit: 97a4da4cf1
Component: cli
2017-04-25 15:53:23 -07:00
Gaetan
8f4985c526 Merge pull request #3 from gdevillele/add-makefile
add Makefiles
Upstream-commit: b37ea22b1e
Component: cli
2017-04-25 09:58:40 -07:00
Gaetan de Villele
2c780f4003 add Makefiles and document their use in the README
Signed-off-by: Gaetan de Villele <gdevillele@gmail.com>
Upstream-commit: fb413981d3
Component: cli
2017-04-25 09:57:06 -07:00
Gaetan
52ef86e5a9 Merge pull request #5 from gdevillele/add-gitignore
add gitignore file
Upstream-commit: 0f0b500cf3
Component: cli
2017-04-25 09:47:56 -07:00
Vincent Demeester
443e26b99c Merge pull request #6 from aduermael/fix-path
fix docker/docker/cli path in comment
Upstream-commit: a01a35fb84
Component: cli
2017-04-25 09:33:17 +02:00