docker/cli
1
0
Fork 0
mirror of https://github.com/docker/cli.git synced 2026-01-18 08:21:31 +03:00
Code Activity
13,589 Commits 12 Branches 296 Tags
fbeafd00f24ecfbad77384d2b41907e6af706159
Commit Graph

549 Commits

Author SHA1 Message Date
moxiegirl
e209023d26 Merge pull request #11227 from coolljt0725/fix_start_help_message 
Fix docker start help message
Upstream-commit: b85c137f1d8c7d803653cab43c886a3c5d7e3f02
Component: engine
 2015-03-09 09:54:36 -07:00
moxiegirl
943c9020e9 Merge pull request #11177 from duglin/10805-cp-to-stdot 
Add support for 'docker cp' to write to stdout
Upstream-commit: 8b516bf5ce85641095378ed8900aa63f0f32a619
Component: engine
 2015-03-09 09:51:48 -07:00
Alexander Morozov
102aaf6e25 Merge pull request #11219 from icecrime/remove_maintainers_files 
Remove subdirectories MAINTAINERS files
Upstream-commit: c5f9aa18f4a09a0ab6743d1e7c2de1ee355461cc
Component: engine
 2015-03-09 09:02:58 -07:00
Phil Estes
b3c11decb8 Merge pull request #11225 from coolljt0725/show_error_message 
Add docker start show error message form daemon when start failed
Upstream-commit: 93e78ac8e7a0d4d08638ae4a7cd987505915cfb9
Component: engine
 2015-03-08 14:39:40 -04:00
Lei Jitang
d549c28940 Fix docker start muliple containers continue on one failed and 
add docker start show error message from daemon when start failed

Signed-off-by: Lei Jitang <leijitang@huawei.com>
Upstream-commit: 2a5a50dca7dc56d390a70c0258ac1b8df3cd4d94
Component: engine
 2015-03-08 13:44:25 +08:00
Doug Davis
a67e12d0d3 Merge pull request #11212 from cpuguy83/better_error_message_for_tls_issues 
Improve error messages for loading tls keys
Upstream-commit: 6f0733a9e3ea96af823e750ff67925b05b6b4e33
Component: engine
 2015-03-07 16:47:16 -05:00
Lei Jitang
143601c86b Fix docker start help message 
Signed-off-by: Lei Jitang <leijitang@huawei.com>
Upstream-commit: 3c37f88aff42c1d900d18d1a8c81fc857e650d44
Component: engine
 2015-03-07 20:45:46 +08:00
Arnaud Porterie
5506a9a27c Remove subdirectories MAINTAINERS files 
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com>
Upstream-commit: 89bdaa35e04b74b7c6528783e0f7b8154b2a3d31
Component: engine
 2015-03-06 18:21:51 -08:00
Brian Goff
1c4e8d93e0 Improve error messages for loading tls keys 
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Upstream-commit: 2ea6c2c264f0f43beb877a83aea3e6e6ad38ae5d
Component: engine
 2015-03-06 20:40:09 -05:00
Lei Jitang
75ac7aea87 Fix start container failed hijack the stdin of terminal 
Signed-off-by: Lei Jitang <leijitang@huawei.com>
Upstream-commit: 518fdf972d874a9fd0e1af739ffc978c6b39e126
Component: engine
 2015-03-06 09:06:14 -08:00
Zhang Wentao
6bfc416abd docker info display http/https_proxy setting 
Signed-off-by: Zhang Wentao <zhangwentao234@huawei.com>
Upstream-commit: 06a40f0f281b4679855a406bc202e122d2875949
Component: engine
 2015-03-06 09:02:21 +08:00
Doug Davis
312da52079 Add support for 'docker cp' to write to stdout 
Closes #10805

Signed-off-by: Doug Davis <dug@us.ibm.com>
Upstream-commit: f3d96e81e9c2a738ec577b814092f8953932de3a
Component: engine
 2015-03-05 15:22:08 -08:00
Jessie Frazelle
97033cc69f Merge pull request #10586 from resouer/10532-fix-cors-hardcode 
Fix 10532 to change --api-enable-cors to string.
Upstream-commit: 7b3ffd5cc0b293aac67e2c07948b2e68525b72d1
Component: engine
 2015-03-04 18:42:20 +00:00
Jessie Frazelle
cd57675c32 Merge pull request #11134 from duglin/CheckMultiLineHelp 
Fix 'docker ps --help' so the options don't span more than one line
Upstream-commit: ffc755ac14a49f41d0b27204b0a50034397c946e
Component: engine
 2015-03-04 05:53:47 -08:00
Jessie Frazelle
6827e12a3d Merge pull request #10858 from duglin/10807-MixedcaseDockerfile 
Support dockerfile and Dockerfile
Upstream-commit: beea697be365631ceeb92761e094f1ffe307ca33
Component: engine
 2015-03-04 03:52:49 -08:00
Doug Davis
bc3e4a6737 Support dockerfile and Dockerfile 
Closes #10807

Adds support for `dockerfile` ONLY when `Dockerfile` can't be found.
If we're building from a Dockerfile via stdin/URL then always download
it a `Dockerfile` and ignore the -f flag.

Signed-off-by: Doug Davis <dug@us.ibm.com>
Upstream-commit: 15924f238503ffe44e5fcb99415ff753a36e5971
Component: engine
 2015-03-03 18:38:50 -08:00
Doug Davis
8c703a14a3 Fix 'docker ps --help' so the options don't span more than one line 
and add a testcase to catch this in the future.

While in there I also:
- removed extra periods from the few options that had them (new test)
- made the --filter option consistent across all command

Signed-off-by: Doug Davis <dug@us.ibm.com>
Upstream-commit: 5595da2bde6574fe13785f07c55a155a2e90a7ca
Component: engine
 2015-03-03 10:02:23 -08:00
resouer
d382609cd2 Rebase & update api doc v1.18 instead 
Signed-off-by: harry zhang <resouer@163.com>
Upstream-commit: dc0a6c1f5edd78d23ab676c54c3e84df3c2b2bbf
Component: engine
 2015-03-03 12:32:17 +08:00
resouer
f947fbc4ae Add cors header flag and leave boolean flag not changed 
Deprecate api-enable-cors

Update docs & man files

Signed-off-by: harry zhang <resouer@163.com>
Upstream-commit: f3dd2db4ff7de1399a49af928cd3eae4fccf8764
Component: engine
 2015-03-03 11:21:19 +08:00
Jessie Frazelle
7023b06ad1 Merge pull request #10971 from Microsoft/10662-api_server_factor_out_windows 
api\server: Factored out UnixHttp on Windows, supported on Linux only.
Upstream-commit: c5ecdfd878d67d0595561a04e4945f60893f8c6f
Component: engine
 2015-03-02 12:40:20 -08:00
Jessie Frazelle
c6435e1b51 Merge pull request #10986 from crosbymichael/create-api-type 
Create api types package for structured responses
Upstream-commit: 2bfa701f45b55fbfd7e5d5a1d6fa45a8d84cd19a
Component: engine
 2015-03-02 12:22:02 -08:00
John Howard (VM)
d7d038bd8a api\server: Factored out UnixHttp on Windows, supported on Linux only. 
Signed-off-by: John Howard <John.Howard@microsoft.com>
Upstream-commit: 69246e15276d7010c00269be140b9fb1a5c11ae5
Component: engine
 2015-02-25 09:24:34 -08:00
Ahmet Alp Balkan
bdccc883c1 Support windows style dockerfile paths for build cmd 
Currently TestBuildRenamedDockerfile fails since passing
custom dockerfile paths like:

    docker build -f dir/file .

fails on windows because those are unix paths. Instead, on
windows accept windows style paths like:

    docker build -f dir\file .

and convert them to unix style paths using the helper we
have in `pkg/archive` so that daemon can correctly locate
the path in the context.

Signed-off-by: Ahmet Alp Balkan <ahmetalpbalkan@gmail.com>
Upstream-commit: 5ecab9e831c6d39e649430013087a3e2a85fb949
Component: engine
 2015-02-24 20:23:53 -08:00
Michael Crosby
ab99465eeb Add ContainerCreateResponse type 
This type is produced on the server side and is a type safe struct that
can be encoded to json.  It is consumed via the client.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
Upstream-commit: f57c26553b91e16fa3ee6a815943eaf8f29af82b
Component: engine
 2015-02-24 15:27:49 -08:00
Michael Crosby
aab969a855 Move stats api types into api/types package 
Move the stats structs from the api/stats package into a new package
api/types that will contain all the api structs for docker's api request
and responses.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
Upstream-commit: 7fed7d7eb4d7766d9342821f2667d160c5f958eb
Component: engine
 2015-02-24 10:47:47 -08:00
Dan Walsh
4e766f5eaa pass --change changes to the import job 
Docker-DCO-1.1-Signed-off-by: Dan Walsh <dwalsh@redhat.com> (github: rhatdan)
Upstream-commit: 17abfc3ddc79592753289a8556a343e276fb15b5
Component: engine
 2015-02-24 13:01:36 -05:00
Daniel, Dao Quang Minh
280f363541 pass --change changes to the commit job 
Docker-DCO-1.1-Signed-off-by: Daniel, Dao Quang Minh <dqminh89@gmail.com> (github: dqminh)

Docker-DCO-1.1-Signed-off-by: Daniel, Dao Quang Minh <dqminh89@gmail.com> (github: rhatdan)
Upstream-commit: f8e77dfb3de50b3c4f0f8c852389a6ed5bcbcd6e
Component: engine
 2015-02-24 13:01:35 -05:00
Alexander Morozov
f3462cd410 Merge pull request #10933 from ahmetalpbalkan/version-daemon-os-arch 
cli: Add server OS/Arch info to 'version' cmd
Upstream-commit: 02c888159666ee53df9eeb1397c7d597dabf3b60
Component: engine
 2015-02-23 15:26:53 -08:00
Ahmet Alp Balkan
4fbdef753d cli: Add server OS/Arch info to 'version' cmd 
Signed-off-by: Ahmet Alp Balkan <ahmetalpbalkan@gmail.com>
Upstream-commit: 3346c2e4d9ce0cf92b056b6ddc883adf5b8beddd
Component: engine
 2015-02-23 14:32:25 -08:00
Srini Brahmaroutu
bdb65abebf Removing dependencies from pkg into Docker internal code 
Closes #10922

Signed-off-by: Srini Brahmaroutu <srbrahma@us.ibm.com>
Upstream-commit: 7a9c944b827dc0cd416d701fe6460264f05166bb
Component: engine
 2015-02-23 18:43:10 +00:00
Alexander Morozov
5330278b47 Merge pull request #10730 from mattyw/fix-10728 
api/server: don't print warning if serving on localhost
Upstream-commit: 4cc8ccb8d2635aaff5cf8525f2f83b5211259579
Component: engine
 2015-02-20 10:43:56 -08:00
Michael Crosby
3f76171b24 Merge pull request #10665 from brahmaroutu/autogen_removeXflag 
Removing -X flag option and autogenerating code to create Dockerversion....
Upstream-commit: b32564798df90222fd455a6db52a61f9b4ae2100
Component: engine
 2015-02-20 09:53:07 -08:00
Chen Hanxiao
34debd5101 commands: fix a comment typo 
s/overide/override

Signed-off-by: Chen Hanxiao <chenhanxiao@cn.fujitsu.com>
Upstream-commit: 0050efcd8f82144ea7f6c74f9bc9af357743370d
Component: engine
 2015-02-20 23:46:29 +08:00
Srini Brahmaroutu
f634216d52 Removing -X flag option and autogenerated code to create Dockerversion.go functionality 
Addresses #9207

Signed-off-by: Srini Brahmaroutu <srbrahma@us.ibm.com>
Upstream-commit: 6871b9b16afe46e7566ac2937246b4a64be97269
Component: engine
 2015-02-20 05:40:12 +00:00
mattyw
05600313fd api/server: don't print warning if serving on localhost 
Fixes bug #10728

Signed-off-by: mattyw <gh@mattyw.net>
Upstream-commit: 0ae455333b3357f30f27da10557e4d9c006b5ba7
Component: engine
 2015-02-20 12:37:17 +08:00
Jessie Frazelle
d5362cffa1 Merge pull request #10468 from noironetworks/10457-Pause-and-unpause-accept-multi-containers 
Allow docker pause and unpause to accept multiple containers
Upstream-commit: 934535db9c78b20481c8ccabdf174926c6e04d4d
Component: engine
 2015-02-19 15:16:05 -08:00
Steve Francia
b3d291c64f Merge pull request #10835 from jfrazelle/port-ranges 
Upstream-commit: 1875cc2ef42787375055710fc6b359ca3dd85752
Component: engine
 2015-02-19 16:11:59 -05:00
Rich Seymour
2b138a5eaf calcuate -> calculate typo fix 
Signed-off-by: Rich Seymour <rseymour@gmail.com>
Upstream-commit: ea8cb16af7e8c83a264a1d1c48db3cacd4cc082b
Component: engine
 2015-02-19 12:44:38 -05:00
Jessica Frazelle
a1047d5010 fix naming, add a test for port range on docker ps 
Docker-DCO-1.1-Signed-off-by: Jessie Frazelle <jess@docker.com> (github: jfrazelle)
Upstream-commit: ba99a73c2fc3050475bd6c066c32dcb557cf6f25
Component: engine
 2015-02-16 11:08:32 -08:00
Colm Hally
0e5cf57545 Group published and exposed ports by contiguous ranges 
Signed-off-by: Colm Hally <colmhally@gmail.com>
Upstream-commit: 5dfef4fe08b890022f600fe742e5a4372b023767
Component: engine
 2015-02-16 10:52:23 -08:00
Doug Davis
79ea7dd989 Fix 'docker stats' help message 
Closes #10771

Signed-off-by: Doug Davis <dug@us.ibm.com>
Upstream-commit: b55346b3279a3243da8cab82a7ddc427454aba61
Component: engine
 2015-02-13 12:45:50 -08:00
Brian Goff
106678e894 Do not use HTTP_PROXY for unix sock 
Makes sure the CLI does not use HTTP_PROXY when connecting to unix
socket.
Also adds some tests to make sure this functionality works as expected.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Upstream-commit: f6e697d2ace2ea659c1b3f7e3dcef7493baa481c
Component: engine
 2015-02-12 11:38:52 -05:00
Alexander Morozov
5c56835bc1 Bump api version to 1.18 
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
Upstream-commit: d92b4232f7c7cb64efd8e56c33238b4426fe22af
Component: engine
 2015-02-10 10:48:54 -08:00
André Martins
19b7fc9336 Fixes #10457-Pause-and-unpause-accept-multi-containers 
Applied multi parameters to pause and unpause.
Created a new test file dedicated for pause commands.
Created a new utility function to get a slice of paused containers.
Updated documentation

Signed-off-by: André Martins <martins@noironetworks.com>
Upstream-commit: 0ce42dcc96d0f3bbfb89b23eb3c255d2ddaa9624
Component: engine
 2015-02-07 00:28:49 +00:00
Michael Crosby
acc900171e Merge pull request #10421 from noironetworks/10388-Specifying_confliting_options 
Specifying -a and -d to docker run should throw an error
Upstream-commit: eb79acd7a0db494d9c6d1b1e970bdabf7c44ae4e
Component: engine
 2015-02-06 14:58:08 -08:00
Michael Crosby
dfd79f3c67 Merge pull request #9705 from acbodine/9311-truncindex-error-duplicate-id-on-ambiguous-id 
Closes #9311 Handles container id/name collisions against daemon functionalities according to #8069
Upstream-commit: 34c804a139cc086e9fa6d3f99442f083b6d5e1e7
Component: engine
 2015-02-06 14:01:28 -08:00
Ahmet Alp Balkan
62119ca587 Export $HOME lookup to pkg/homedir 
Signed-off-by: Ahmet Alp Balkan <ahmetb@microsoft.com>
Upstream-commit: f9ae2d4fd4c5b4afb7a2299b93a800f718b63a2a
Component: engine
 2015-02-06 11:42:45 -08:00
Ahmet Alp Balkan
63b6feced2 Extract $HOME usages into utils.GetHomeDir() 
Refactored getHomeDir in docker/docker to GetHomeDir in utils
pkg. Currently covers all use cases on the client-side.

Signed-off-by: Ahmet Alp Balkan <ahmetb@microsoft.com>
Upstream-commit: 6ffb77afd4c3705322417f0673d254038f01a187
Component: engine
 2015-02-05 16:13:51 -08:00
Jessica Frazelle
160a9d328c Fix compilation on Go 1.3.3 
Docker-DCO-1.1-Signed-off-by: Jessie Frazelle <jess@docker.com> (github: jfrazelle)
Upstream-commit: 4855612aaecf7719edc36693d402279c743be7fc
Component: engine
 2015-02-04 13:35:20 -08:00
Doug Davis
013dbb146f Pretty the help text 
This modifies the "docker help" text so that it is no wider than 80 chars
and each description fits on one line. This will also try to use ~ when
possible

Added a test to make sure we don't go over 80 chars again.
Added a test to make sure we use ~

Applied rules/tests to all docker commands - not just main help text

Closes #10214

Signed-off-by: Doug Davis <dug@us.ibm.com>
Upstream-commit: 2203b37733e76d653cfe3b0ec5870786076adce7
Component: engine
 2015-02-04 07:59:16 -08:00