toolshed/docker-cli
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
1,212 Commits 3 Branches 295 Tags
3d58c3feaccc71512e692f27c18c109d7b262281
Commit Graph
1212 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Vincent DemeesterandGitHub 3d58c3feac Merge pull request #35 from AliyunContainerService/master 
Support placement preferences in stack deployment
 2017-05-09 09:40:04 +02:00
Vincent DemeesterandGitHub 2daa598cce Merge pull request #41 from seemethere/fix_dev_null_device 
Fix device for vendor target
 2017-05-09 09:13:21 +02:00
Li Yi b3459936db Support placement preferences in stack deployment 
Move of moby/moby#32743

Signed-off-by: Li Yi <denverdino@gmail.com>
 2017-05-09 07:00:45 +08:00
Daniel NephinandGitHub d844c487d4 Merge pull request #27 from dnephin/more-linters 
More linters and better circle-ci config
 2017-05-08 16:30:13 -04:00
Daniel Nephin aa07c40069 Fix vendor. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2017-05-08 16:15:54 -04:00
Daniel Nephin 4aa65d9833 Run steps in parallel. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2017-05-08 15:57:56 -04:00
Daniel Nephin c31d25653f Add line length linter 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2017-05-08 15:57:56 -04:00
Daniel Nephin 37ccc00d0e Add interfacer linter 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2017-05-08 15:57:50 -04:00
Daniel NephinandGitHub d9fde418c0 Merge pull request #28 from dmcgowan/remove-trust-key 
Remove unused trust key
 2017-05-08 15:16:24 -04:00
Daniel NephinandGitHub 5a4873c21a Merge pull request #38 from tiborvass/dont_rm_build_folder 
Makefile: on clean, delete files in the build folder, but not the folder
 2017-05-08 15:14:15 -04:00
Derek McGowan 515d0fd842 Remove unused trust key 
Signed-off-by: Derek McGowan <derek@mcgstyle.net>
 2017-05-08 11:49:40 -07:00
Tibor VassandGaetan de Villele 17311d3d1a Makefile: on clean, delete files in the build folder, but not the folder 
Signed-off-by: Tibor Vass <tibor@docker.com>
 2017-05-08 11:24:40 -07:00
GaetanandGitHub 2a5d6c8aac Merge pull request #39 from tiborvass/rm_client 
rm client and vendor it instead
 2017-05-08 11:14:06 -07:00
Eli Uriegas 2792fbce0f Fix device for vendor target 
Signed-off-by: Eli Uriegas <eli.uriegas@docker.com>
 2017-05-08 10:56:21 -07:00
Gaetan de Villele 295140edf2 cli: gofmt + goimports 
Signed-off-by: Gaetan de Villele <gdevillele@gmail.com>
 2017-05-08 10:51:30 -07:00
Tibor VassandGaetan de Villele 57230a7212 rm client and vendor it instead 
Signed-off-by: Tibor Vass <tibor@docker.com>
 2017-05-08 10:33:56 -07:00
GaetanandGitHub 4411f5c7e0 Merge pull request #40 from gdevillele/pr-update-ci 
update circle.yml to fix CI
 2017-05-08 10:32:04 -07:00
Gaetan de Villele f35682a2f0 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>
 2017-05-08 10:25:30 -07:00
Tibor VassandGitHub a6feb55a48 Merge pull request #11 from tiborvass/update-cli 
Update cli folder with newer changes from moby/moby
 2017-05-05 15:04:48 -07:00
Ian CampbellandTibor Vass 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
Tibor Vass 03a36f9d50 Fix expected output in test due to linter-induced change on error string 
Signed-off-by: Tibor Vass <tibor@docker.com>
 2017-05-03 19:26:45 -07:00
Tibor Vass ae84e6dd5e Update cli folder with newer changes from moby/moby 
Signed-off-by: Tibor Vass <tibor@docker.com>
 2017-05-03 19:25:17 -07:00
Daniel NephinandTibor Vass 779012af69 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>
 2017-05-03 18:49:14 -07:00
yupengzteandTibor Vass 9ca78094b5 delete ineffectual assignment 
Signed-off-by: yupengzte <yu.peng36@zte.com.cn>
 2017-05-03 18:49:14 -07:00
Flavio CriscianiandTibor Vass 169160ba63 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>
 2017-05-03 18:45:48 -07:00
Ying LiandTibor Vass 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 HazlettandTibor Vass 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 LehmannandTibor Vass 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 HazlettandTibor Vass 25809f8991 move service runtime filter to server 
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
 2017-05-03 18:44:11 -07:00
Vincent DemeesterandTibor Vass c67589a52c Fix docker run -it on windows 
Signed-off-by: Vincent Demeester <vincent@demeester.fr>
 2017-05-03 18:41:19 -07:00
Boaz ShusterandTibor Vass 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 CapurroandTibor Vass 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 HendersonandTibor Vass 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 NephinandTibor Vass 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 HebertandTibor Vass 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 HebertandTibor Vass 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 HebertandTibor Vass 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 ChenandTibor Vass 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 GoffandTibor Vass 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 MurdacaandTibor Vass dea809813e remove --init-path from client 
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
 2017-05-03 17:46:39 -07:00
GaetanandGitHub 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 DemeesterandGitHub 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 NephinandGitHub 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 NephinandGitHub 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 NephinandGitHub 589afd2f50 Merge pull request #9 from gdevillele/pr-update-makefile 
update Makefile
 2017-05-03 15:43:26 -04:00
Vincent DemeesterandGitHub 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