Guest24897
/
DockerCLI
mirror of https://github.com/docker/cli.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
7,479 Commits 11 Branches 241 Tags 240 MiB
Commit Graph

185 Commits

Author SHA1 Message Date
Vincent Demeester 87345ed117 Merge pull request #277 from thaJeztah/dont-remove-what-isnt-there 
Don't attempt to remove unsupported resources on older daemon
 2017-07-12 10:43:54 +02:00
Daniel Nephin 42a3800783 Update some tests to remove unnecessary buffers. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2017-07-11 17:52:43 -04:00
Daniel Nephin 3da0cbfdd1 Remove unnecessary use of SetConfigfile 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2017-07-11 14:49:30 -04:00
Daniel Nephin 69b142b52a Update FakeCli to remove duplication in tests. 
Use byte buffers by default, since that is what is done most of the time.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2017-07-11 14:49:30 -04:00
Sebastiaan van Stijn 2429f15672
Don't attempt to remove unsupported resources on older daemon 
When running `docker stack rm <some stack>` against an older daemon,
a warning was printed for "configs" being ignored;

    WARNING: ignoring "configs" (requires API version 1.30, but the Docker daemon API version is 1.26)

Given that an old daemon cannot _have_ configs, there should not be
a need to warn, or _attempt_ to remove these resources.

This patch removes the warning, and skips fetching (and removing)
configs.

A check if _secrets_ are supported by the daemon is also added,
given that this would result in an error when attempted against
an older (pre 1.13) daemon.

There is one situation where this could lead to secrets or
configs being left behind; if the client is connecting to a
daemon that _does_ support secrets, configs, but the API version
is overridden using `DOCKER_API_VERSION`, no warning is printed,
and secrets and configs are not attempted to be removed.

Given that `DOCKER_API_VERSION` is regarded a feature for
debugging / "power users", it should be ok to ignore this.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2017-07-11 10:29:03 -07:00
Vincent Demeester af6c0896f5 Merge pull request #298 from dnephin/fix-stack-out-stream 
Fix stack output stream
 2017-07-10 09:23:23 +02:00
Sebastiaan van Stijn 4d4c789cac
Fix error variable being overwritten 
The `err` variable was set in a loop, so only
the last result was taken into account to return
"failure" or not.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2017-07-05 13:54:57 -07:00
Daniel Nephin 0030bfea9f Remove duplication in task formatting. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2017-07-05 13:40:47 -04:00
Daniel Nephin fb6deb1077 Fix stream for 'nothing found in stack' message 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2017-07-05 13:32:54 -04:00
Vincent Demeester b7fad8f1dc
Add a line break after warning 👼 
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
 2017-06-23 20:15:00 +02:00
Vincent Demeester d5d0ec56c1 Merge pull request #214 from adshmh/add-unit-tests-to-stack-package 
add unit tests to stack package
 2017-06-21 10:00:08 +02:00
Arash Deshmeh 535af2d868 add unit tests to stack package 
Signed-off-by: Arash Deshmeh <adeshmeh@ca.ibm.com>
 2017-06-20 14:31:00 -04:00
Daniel Nephin 3724fb7f37 Add gosimple lint 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2017-06-14 16:55:08 -07:00
Daniel Nephin 759e59e4a4 Merge pull request #182 from vdemeester/180-fix-stack-rm-config-endpoint 
Do not call the config endpoint if API is lower than 1.30
 2017-06-14 14:31:01 -04:00
Vincent Demeester 2128b3f112
Do not call the config endpoint if API is lower than 1.30 
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
 2017-06-14 09:56:53 +02:00
Yong Tang 657457ee2c Use `scope=swarm` for service related network inspect. 
This fix use `scope=swarm` for service related network inspect.
The purpose is that, in case multiple networks with the same
name exist in different scopes, it is still possible to obtain
the network for services.

This fix is related to moby/moby#33630 and docker/cli#167

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
 2017-06-13 20:26:12 +00:00
Arash Deshmeh 852bf0f96d removed the output leaked from stack remove error test case 
Signed-off-by: Arash Deshmeh <adeshmeh@ca.ibm.com>
 2017-06-09 12:14:18 -04:00
Nishant Totla f790e839fc
Change --no-resolve-image flag to --resolve-image string flag 
Signed-off-by: Nishant Totla <nishanttotla@gmail.com>
 2017-06-07 12:30:11 -07:00
Nishant Totla 9f1bea2657
Enable client side digest pinning for stack deploy 
Signed-off-by: Nishant Totla <nishanttotla@gmail.com>
 2017-06-07 12:30:11 -07:00
Daniel Nephin 729d07a371 Compose: Improve error messages when resource creation/updates fail. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2017-06-01 15:03:04 -04:00
Vincent Demeester efaadcf465 Merge pull request #132 from mavenugo/stack-host 
Host and Bridge network support in docker stack deploy
 2017-05-31 15:07:56 -07:00
John Stephens f05cd11ee2
Remove stack configs on stack removal 
Signed-off-by: John Stephens <johnstep@docker.com>
 2017-05-26 18:17:43 -07:00
Daniel Nephin 341703d21e Add tests for verifyExternalNetwork 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2017-05-26 12:21:04 -04:00
Madhu Venugopal 123f0bfd98 With the introduction of node-local network support, docker services can 
be attached to special networks such as host and bridge. This fix brings
in the required changes to make sure the stack file accepts these
networks as well.

Signed-off-by: Madhu Venugopal <madhu@docker.com>
 2017-05-25 19:50:08 -07:00
Brian Goff e574286ba2 Add support for configs to compose format 
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
 2017-05-16 17:10:14 -04:00
Vincent Demeester d7f6563efc
Update cli imports to using local package 
Also, rename a bunch of variable to not *shadow* the `opts` package
name.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
 2017-05-15 14:45:19 +02:00
Daniel Nephin 37ccc00d0e Add interfacer linter 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2017-05-08 15:57:50 -04: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 Vass 57230a7212 rm client and vendor it instead 
Signed-off-by: Tibor Vass <tibor@docker.com>
 2017-05-08 10:33:56 -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
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
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
Daniel Nephin 690ef8af79 Enable golint 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2017-05-02 17:57:46 -04:00
Daniel Nephin 10641c2aae Update imports. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2017-04-17 18:07:56 -04:00
Daniel Nephin 1630fc40f8 Import docker/docker/cli 
Signed-off-by: Daniel Nephin <dnephin@gmail.com>
 2017-04-17 17:40:59 -04:00