Ying Li
81f87595fe
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>
2017-05-03 18:45:48 -07:00
Evan Hazlett
6665c9c747
remove service runtime filter in stack command
...
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2017-05-03 18:45:48 -07:00
Aaron Lehmann
6f94ab98f5
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>
2017-05-03 18:45:48 -07:00
Evan Hazlett
25809f8991
move service runtime filter to server
...
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2017-05-03 18:44:11 -07:00
Vincent Demeester
c67589a52c
Fix docker run -it on windows
...
Signed-off-by: Vincent Demeester <vincent@demeester.fr>
2017-05-03 18:41:19 -07:00
Boaz Shuster
5b6bd92862
Add format to docker stack ls
...
Signed-off-by: Boaz Shuster <ripcurld.github@gmail.com>
2017-05-03 18:41:19 -07:00
Ignacio Capurro
e7793092a2
Unit tests for cli/commands/image (except build and tag)
...
Signed-off-by: Ignacio Capurro <icapurrofagian@gmail.com>
2017-05-03 18:40:22 -07:00
Dave Henderson
2b31a4bf8d
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>
2017-05-03 17:46:41 -07:00
Daniel Nephin
a1b7969bce
Set Composefile WorkingDir to dirname of the composefile.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2017-05-03 17:46:40 -07:00
Colin Hebert
9c02b38bec
Regenerate schema with the correct libraries
...
Signed-off-by: Colin Hebert <hebert.colin@gmail.com>
2017-05-03 17:46:40 -07:00
Colin Hebert
53b43f02e2
Run go generate github.com/docker/docker/cli/compose/schema
...
Signed-off-by: Colin Hebert <hebert.colin@gmail.com>
2017-05-03 17:46:40 -07:00
Colin Hebert
a2c8291e1e
Add support for labels during build with compose
...
Signed-off-by: Colin Hebert <hebert.colin@gmail.com>
2017-05-03 17:46:40 -07:00
Dong Chen
a316b380e7
do not allow duration less than 1 ms in healthcheck parameters
...
Signed-off-by: Dong Chen <dongluo.chen@docker.com>
2017-05-03 17:46:40 -07:00
Brian Goff
c44e74e676
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>
2017-05-03 17:46:39 -07:00
Antonio Murdaca
dea809813e
remove --init-path from client
...
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
2017-05-03 17:46:39 -07:00
Gaetan
1c0847b912
Merge pull request #24 from gdevillele/pr-add-build-status-badge
...
add CI build status badge to README
2017-05-03 14:32:46 -07:00
Gaetan de Villele
92094372d3
add ci build status badge to readme
...
Signed-off-by: Gaetan de Villele <gdevillele@gmail.com>
2017-05-03 13:28:06 -07:00
Vincent Demeester
b7d3dd4d41
Merge pull request #23 from dnephin/fix-goimports-on-master
...
Fix goimports failure on master
2017-05-03 22:27:16 +02:00
Daniel Nephin
328fa4b717
Merge pull request #19 from dnephin/check-vendor
...
Check vendor
2017-05-03 16:01:56 -04:00
Daniel Nephin
36a7842089
Fix goimports failure on master.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2017-05-03 15:58:39 -04:00
Daniel Nephin
c202b4b987
Merge pull request #13 from dnephin/cleanup-post-docker-stin
...
Small build client cleanup handling dockerfile from stdin
2017-05-03 15:45:41 -04:00
Daniel Nephin
589afd2f50
Merge pull request #9 from gdevillele/pr-update-makefile
...
update Makefile
2017-05-03 15:43:26 -04:00
Vincent Demeester
9e413798bf
Merge pull request #20 from dnephin/more-lint
...
Add more lint checks
2017-05-03 20:53:30 +02:00
Gaetan de Villele
7f7e842702
define targets as “phony”, add comments, and mount docker.sock in dev target
...
Signed-off-by: Gaetan de Villele <gdevillele@gmail.com>
2017-05-03 11:14:06 -07:00
Daniel Nephin
b86533c479
Add ineffassign linter.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2017-05-02 17:57:46 -04:00
Daniel Nephin
08af0f28c5
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>
2017-05-02 17:57:46 -04:00
Daniel Nephin
8f73a12f9b
Add deadcode linter.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2017-05-02 17:57:46 -04:00
Daniel Nephin
1378bf3dbe
Add goimports to linting
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2017-05-02 17:57:46 -04:00
Daniel Nephin
690ef8af79
Enable golint
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2017-05-02 17:57:46 -04:00
Daniel Nephin
31851fbe3c
Verify that vendored files are correct
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2017-05-02 17:57:32 -04:00
Daniel Nephin
0a613971b9
Merge pull request #18 from dnephin/add-linter
...
Add gometalinter to CI
2017-05-02 17:54:02 -04:00
Daniel Nephin
e3f677794a
Add gometalinter to CI
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2017-05-02 17:15:56 -04:00
Gaetan
639764c00d
Merge pull request #15 from gdevillele/pr-faster-build
...
improve speed of "go build" as well as "docker build"
2017-04-28 13:08:39 -07:00
Daniel Nephin
a5044b4982
Move addDockerfileToBuildContext to the build package.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2017-04-28 15:11:36 -04:00
Daniel Nephin
b98e03d3b0
Extract dockerfile handling functions.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2017-04-28 15:11:36 -04:00
Daniel Nephin
59983759c2
Cleanup handling of the - for stdin
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2017-04-28 15:11:36 -04:00
Gaetan
f5c8a61c9b
Merge pull request #7 from gdevillele/pr-fix-service-ls-filter
...
remove service runtime filter from client
2017-04-28 10:48:25 -07:00
Gaetan
2075433f95
Merge pull request #16 from gdevillele/pr-add-test-target
...
add “test” target to makefiles
2017-04-28 10:47:51 -07:00
Gaetan de Villele
4d4203f7fd
add “test” target and make CI use it
...
Signed-off-by: Gaetan de Villele <gdevillele@gmail.com>
2017-04-27 15:57:35 -07:00
Gaetan de Villele
5aa70d68b3
remove service runtime filter from client
...
it’s moving to the server.
Signed-off-by: Gaetan de Villele <gdevillele@gmail.com>
2017-04-27 15:07:20 -07:00
Gaetan de Villele
87449dbaa1
make go build and docker build operations faster
...
Signed-off-by: Gaetan de Villele <gdevillele@gmail.com>
2017-04-27 15:06:57 -07:00
Gaetan
e8d0ecdf7e
Merge pull request #14 from gdevillele/pr-circle-ci
...
add CircleCI config file
2017-04-27 14:58:58 -07:00
Gaetan de Villele
6b2a61a311
add circle ci config file
...
Signed-off-by: Gaetan de Villele <gdevillele@gmail.com>
2017-04-27 14:24:28 -07:00
Gaetan
7e7df40930
Merge pull request #10 from gdevillele/pr-ci-dockerfile
...
add Dockerfile for CI
2017-04-27 14:19:24 -07:00
Gaetan de Villele
9c3f1d9ae3
add Dockerfile for CI
...
Signed-off-by: Gaetan de Villele <gdevillele@gmail.com>
2017-04-27 13:36:29 -07:00
Daniel Nephin
728060a7eb
Merge pull request #8 from tiborvass/fix-windows
...
windows: remove workaround for go#15286 and have compiling work on windows
2017-04-26 10:23:35 -04:00
Tibor Vass
97a4da4cf1
windows: remove workaround for go#15286 and have compiling work on windows
...
Signed-off-by: Tibor Vass <tibor@docker.com>
2017-04-25 15:53:23 -07:00
Gaetan
b37ea22b1e
Merge pull request #3 from gdevillele/add-makefile
...
add Makefiles
2017-04-25 09:58:40 -07:00
Gaetan de Villele
fb413981d3
add Makefiles and document their use in the README
...
Signed-off-by: Gaetan de Villele <gdevillele@gmail.com>
2017-04-25 09:57:06 -07:00
Gaetan
0f0b500cf3
Merge pull request #5 from gdevillele/add-gitignore
...
add gitignore file
2017-04-25 09:47:56 -07:00