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

4898 Commits

Author SHA1 Message Date
Aaron Lehmann 275c488734 Merge pull request #72 from thaJeztah/fix-prefix-matching 
Fix prefix-matching for service ps
 2017-06-13 14:59:37 -07:00
Aaron Lehmann 25bc9f1ce7 Merge pull request #184 from yongtang/167-network-inspect-scope 
Use scope=swarm for service related network inspect and revendor docker/docker
 2017-06-13 14:47:20 -07: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
Daniel Nephin 676b71eaaa Fix some problems with image remove force. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2017-06-13 12:12:54 -07:00
Sebastiaan van Stijn 7baaa90481 Merge pull request #186 from adshmh/fix-output-leak-from-config-remove-test-case 
fix the output leak from error test case for config/remove
 2017-06-13 21:04:47 +02:00
Arash Deshmeh 006b9b126d fixed the output leak from error test case for config/remove 
Signed-off-by: Arash Deshmeh <adeshmeh@ca.ibm.com>
 2017-06-13 12:24:42 -04:00
Vincent Demeester feeeb2c550 Merge pull request #185 from vdemeester/fix-image-remove-tests 
Fix remove_test output duplication
 2017-06-13 14:21:32 +02:00
Vincent Demeester dd924ebf4f
Fix remove_test output duplication 
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
 2017-06-13 14:02:56 +02:00
Vincent Demeester ecc8e0a204 Merge pull request #160 from e11137/master 
fixes #46 Always exit 0 when remove image with force option
 2017-06-13 14:02:02 +02:00
Yong Tang 8c2f81892b Update docker/docker to 4310f7da7e6bcd8185bf05e032f9b7321cfa6ea2 
This fix updates docker/docker to 4310f7da7e6bcd8185bf05e032f9b7321cfa6ea2

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 02:53:25 +00:00
Tibor Vass 8545341709 Merge pull request #157 from dnephin/make-compose-check-fail 
Fix check-git-diff in CI
 2017-06-12 17:15:35 -07:00
Sebastiaan van Stijn f82f61efc6 Merge pull request #175 from dnephin/golang-version 
Print CircleCI docker version
 2017-06-10 15:03:07 +02:00
Tibor Vass 6a963c5cbe Merge pull request #173 from StefanScherer/update-golang-1.8.3 
Update golang 1.8.3
 2017-06-09 15:10:04 -07:00
Daniel Nephin cda8281da8 Add a docker version print to CI 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2017-06-09 15:54:09 -04:00
Stefan Scherer b38c49411b
Update golang 1.8.3 
Signed-off-by: Stefan Scherer <scherer_stefan@icloud.com>
 2017-06-09 21:43:00 +02:00
Vincent Demeester dd585ad4fb Merge pull request #172 from adshmh/fix-secret-remove-testcase-error-message-leak 
fixed the output leak from the error test case for secret/remove command
 2017-06-09 21:03:33 +02:00
Vincent Demeester 45b02769f9 Merge pull request #171 from adshmh/fix-stack-remove-testcase-error-message-leak 
removed the output leaked from stack remove error test case
 2017-06-09 21:03:22 +02:00
Arash Deshmeh 77062a09dc fixed the output leak from secret/remove command error test case 
Signed-off-by: Arash Deshmeh <adeshmeh@ca.ibm.com>
 2017-06-09 13:21:14 -04: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
Victor Vieux a74e715b1a Merge pull request #166 from thaJeztah/update-term 
Bump docker/docker to cd35e4beee13a7c193e2a89008cd87d38fcd0161
 2017-06-08 13:45:32 -07:00
Aaron Lehmann 4d980880f3 Merge pull request #121 from nishanttotla/digest-pinning-stack-deploy 
Enable client side digest pinning for stack deploy
 2017-06-08 23:20:02 +03:00
Daniel Nephin 0310de5213 Move IsArchive and HeaderSize to build/context 
Previously these were in docker/docker/pkg/archive, but unused

Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2017-06-08 16:08:11 -04:00
Brian Goff b1ea2e4eb5 Merge pull request #168 from thaJeztah/bump-version 
Update version to 17.07-dev
 2017-06-08 15:58:35 -04:00
Sebastiaan van Stijn 75238f3aa9
Update version to 17.07-dev 
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2017-06-08 21:45:37 +02:00
Rogelio Canedo 5c8d702af5 Always exit whith -1 when remove image with force option 
Signed-off-by: Rogelio Canedo <rcanedo@mappy.priv>
 2017-06-08 20:15:37 +02:00
Sebastiaan van Stijn efd11bf69d
Bump docker/docker to cd35e4beee13a7c193e2a89008cd87d38fcd0161 
Reverts changes in pkg/term related to `OPOST` that pulled in through;
3574e6a674

And reverted upstream in;
cd35e4beee

Full diff;
c8141a1fb1...cd35e4beee

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2017-06-08 16:27:49 +02:00
Sebastiaan van Stijn ab3ea637b6 Merge pull request #111 from keloyang/attach-restarting-check 
Add a restarting check to runAttach
 2017-06-08 12:53:15 +02:00
Vincent Demeester c944d20b1f Merge pull request #163 from vdemeester/export-convertservice 
Update ConvertService for external usage 👼
 2017-06-08 10:55:56 +02:00
Vincent Demeester 96dc07a8cf Update ConvertService for external usage 👼 
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
 2017-06-08 10:44:05 +02:00
Shukui Yang 90f497302f Add a restarting check to runAttach 
Signed-off-by: Shukui Yang <yangshukui@huawei.com>
 2017-06-08 07:12:39 +08:00
Shukui Yang e8cc2cf760 Replace command.DockerCli to command.Cli in docker attach/exec command 
Signed-off-by: Shukui Yang <yangshukui@huawei.com>
 2017-06-08 07:03:52 +08: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
Kenfe-Mickaël Laventure 08cb0bddfd Merge pull request #162 from vdemeester/150-configs-fixes-on-old-daemon 
Handle case of configs on old daemon
 2017-06-07 12:18:32 -07:00
Misty Stanley-Jones b5d33c6e76 Clarify ability to attach multiple times 
Signed-off-by: Misty Stanley-Jones <misty@docker.com>
 2017-06-07 09:40:43 -07:00
Aaron Lehmann 9d12d6fc87 Merge pull request #145 from dnephin/improve-compose-secrets-errors 
Compose: Improve error messages when resource create/update fails
 2017-06-07 18:51:10 +03:00
Daniel Nephin 230b9eaf1a Merge pull request #161 from vdemeester/update-codecov-threshold 
Update codecov project threshold to 15%
 2017-06-07 11:13:19 -04:00
Vincent Demeester cf5550c426
Handle case of configs on old daemon 
If configs are declared for a service and pointing on an old
daemon, error out properly (instead of "page not found").

If there is no configs declared, don't call convertServiceConfigObjs
to avoid having an error.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
 2017-06-07 17:02:46 +02:00
Vincent Demeester a132733939
Update codecov project threshold to 15% 
That way, the build will fail less.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
 2017-06-07 13:26:24 +02:00
Aaron Lehmann 583ed2e3be Merge pull request #155 from vdemeester/fix-and-update-vendor 
Update vendoring of docker/docker
 2017-06-07 14:25:57 +03:00
Daniel Nephin f75a44ffd8 Fix check-git-diff so that it fails on CI 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2017-06-06 15:06:34 -04:00
Sebastiaan van Stijn 51b00f966e Merge pull request #158 from tiborvass/fix-manpages-script 
Fix manpages script
 2017-06-06 10:44:58 +02:00
Tibor Vass dc81def89c fix manpages script 
Signed-off-by: Tibor Vass <tibor@docker.com>
 2017-06-06 05:00:10 +00:00
Vincent Demeester 44ac80881f
Update vendoring of docker/docker 
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
 2017-06-06 00:23:21 +02:00
Tibor Vass ed5b663082 Merge pull request #154 from tiborvass/add-man-docs-scripts 
Add scripts and targets for manpages and yamldocs
 2017-06-05 13:20:56 -07:00
Tibor Vass ff615dbc4d Add scripts and targets for manpages and yamldocs 
Signed-off-by: Tibor Vass <tibor@docker.com>
 2017-06-05 19:10:44 +00:00
Tibor Vass d95fd2f38c Merge pull request #147 from tiborvass/import-man-docs-completion 
Import man docs completion
 2017-06-02 12:36:15 -07:00
Daniel Nephin d2976d599f Remove old manpage generation dockerfiles and glide config. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2017-06-02 12:00:23 -04:00
Daniel Nephin 3718833f2c Add unit tests for service/ps 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2017-06-02 11:29:19 -04:00
Daniel Nephin 875daf0130 Add missing dependencies to vendor, and fix generation imports 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2017-06-02 11:12:43 -04:00