toolshed/docker-cli
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
11,963 Commits 3 Branches 295 Tags
3f619723e5c5fa0cbc5b3c122646358a4e2de193
Commit Graph
430 Commits
Author SHA1 Message Date
Jörg Thalheim 3f619723e5 Fix interactive TLS postContainersAttach 
related to 266a1044deb9a085ed43dccdc6

Signed-off-by: Jörg Thalheim <joerg@higgsboson.tk>
Upstream-commit: a25168d28d552c33988c1a0f3d6a54355c246566
Component: engine
 2014-12-10 08:57:38 +01:00
Jessie Frazelle 1c6f987783 Merge pull request #9512 from duglin/Issue9404 
Make 'docker build' send non-err output to stdout
Upstream-commit: 58ce0146e16e2e63b7a94d34a48722a9c7400c18
Component: engine
 2014-12-08 11:08:13 -08:00
Arnaud Porterie be5e940362 Merge pull request #9489 from crosbymichael/info-root 
Return docker's root dir in docker -D info
Upstream-commit: 12252e39a0abc188e1cd1fe9e921eef967308e1c
Component: engine
 2014-12-08 09:05:00 -08:00
Jessie Frazelle 7f2911210b Merge pull request #9497 from icecrime/86580-tls_interactive_exec 
Fix interactive exec over TLS
Upstream-commit: 53d5299a40ad149be420bb87e5c97c616c1df821
Component: engine
 2014-12-06 13:12:06 -08:00
Michael Crosby 0703a67ce9 Return docker's root dir in docker -D info 
This adds the docker daemon's root directory to docker info when running
in debug mode.  This allows the user to view the root directory where
docker is writing and storing state.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
Upstream-commit: 654da4e151c449725b6996d47b7ff33767e87da9
Component: engine
 2014-12-05 12:13:25 -08:00
Doug Davis 52bfe6086a Make 'docker build' send non-err output to stdout 
Right now 'docker build' will send:
   Sending build context to Docker daemon
to stderr, instead of stdout.  This PR fixes that.

I looked in the rest of api/client/commands.go for other cases
that might do this and only one jumped out at me:
  https://github.com/docker/docker/blob/master/api/client/commands.go#L2202
but I think if I changed that to go to stdout then it'll mess people up
who are expecting just the container ID to be printed to the screen and
there is no --quiet type of flag we can check.

Closes #9404

Signed-off-by: Doug Davis <dug@us.ibm.com>
Upstream-commit: 5c91bb93a7e35b2d443090cabc7ec0a2ca59b6ee
Component: engine
 2014-12-04 14:06:40 -08:00
Arnaud Porterie 1c71415b94 Fix interactive exec over TLS 
The code no longer assumes a net.TCPConn underlying the HTTP connection
in order to close attached streams.

Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com>
Upstream-commit: 266a1044deb9a085ed43dccdc6cfa0723e5142b0
Component: engine
 2014-12-03 23:43:03 -08:00
Jessica Frazelle 482d9b0df3 Be consistent about libtrust import path. 
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
Upstream-commit: 7c7026bd2255cef47cbb026afe0b984d4c9a9130
Component: engine
 2014-12-03 17:36:14 -08:00
Michael Crosby 958b540000 Merge pull request #9442 from icecrime/8658-tls_attach_hangs 
Fix client-side HTTP hijacking over TLS
Upstream-commit: 5ec3a038a05116e3b3983d3271ada74408fee0e3
Component: engine
 2014-12-02 09:47:29 -08:00
Arnaud Porterie c0a5d7486b Fix client-side HTTP hijacking over TLS 
Properly CloseWrite() the client socket once done with stdin when using
TLS connection (this used to rely on an erroneous type assertion).

Fixes #8658.
Fixes #8642.

Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com>
Signed-off-by: Michael Crosby <crosby.michael@gmail.com>
Upstream-commit: e98e56bb1edc3835bc835c9e034780845c64d797
Component: engine
 2014-12-01 18:13:52 -08:00
Sven Dowideit 3e14694b93 Merge pull request #9330 from TomasTomecek/master 
docs: man docker-images: inconsistent naming
Upstream-commit: b487d2f2ff9562301c1e9a1e705876ff3e3f3c10
Component: engine
 2014-12-02 11:42:29 +10:00
Victor Vieux 70cf9e5532 Merge pull request #9425 from HuKeping/master 
inspect: format the output of docker inspect
Upstream-commit: 65e75998afc53eacdac8784434dd1a7baa92be70
Component: engine
 2014-12-01 16:51:47 -08:00
Huayi Zhang cc225fbb9e Attach goroutine blocking profiler 
/debug/pprof/block is 404 currently

Signed-off-by: Huayi Zhang <irachex@gmail.com>
Upstream-commit: 51172493ab6d2b31760b9fe273c7d4d0917a9bb7
Component: engine
 2014-12-01 16:46:59 +08:00
HuKeping a5fafedf3b inspect: format the output of docker inspect 
Prior to this patch, one would get the output of docker inspect xxx
as below:

user@server:/mnt$ docker inspect ubuntu
[{
    "Architecture": "amd64",

    ...

    "VirtualSize": 199257566
}
]user@server:/mnt$

The last ']' was on the same line with the prompt, i wonder if it is
really what we want it be, it is a little weird, so i add a '\n' to it.

Signed-off-by: Hu Keping <hukeping@huawei.com>
Upstream-commit: 921346be48d20a66b2b5763144b064395285bb32
Component: engine
 2014-12-01 16:28:08 +08:00
Tomas Tomecek f8672e482a docs: man docker-images: inconsistent naming 
Synopsis is mentioning "NAME" while description is describing "REPOSITORY".

Signed-off-by: Tomas Tomecek <ttomecek@redhat.com>
Upstream-commit: 095027944f16205c1c75d47d2f60a7c1ac666bf1
Component: engine
 2014-11-28 08:57:07 +01:00
Jessie Frazelle 3253386751 Merge pull request #9208 from duglin/Issue8703 
Add support for docker exec to return cmd exitStatus
Upstream-commit: 00c2a8f323548b7d0aa54cfd10a594dd93ddbed0
Component: engine
 2014-11-25 18:03:51 -08:00
Jessie Frazelle 039ddfff8b Merge pull request #8893 from vieux/filter_events 
Events filtering (daemon side)
Upstream-commit: 9160e01cefbc4a7dd2ad38167c928c959dde3fad
Component: engine
 2014-11-25 17:52:27 -08:00
Doug Davis c28ef478d3 Add support for docker exec to return cmd exitStatus 
Note - only support the non-detached mode of exec right now.
Another PR will add -d support.

Closes #8703

Signed-off-by: Doug Davis <dug@us.ibm.com>
Upstream-commit: 90928eb1140fc0394e2a79d5e9a91dbc0f02484c
Component: engine
 2014-11-25 17:49:25 -08:00
Michael Crosby 033a9598e5 Update code for use of urlutil pkg 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
Upstream-commit: 5794b5373ef26846b3cc5e48e651208771d12b19
Component: engine
 2014-11-24 18:47:42 -05:00
Michael Crosby b6f3cebe53 Merge pull request #9281 from unclejack/build_pull_flag 
build: add pull flag to force image pulling
Upstream-commit: 5e19ecf25c942ae809ad5b5cf0bb010845395e58
Component: engine
 2014-11-24 12:10:45 -08:00
Jessie Frazelle 17175863b2 Merge pull request #9188 from somaopensource/8777-fix 
Fix for #8777 (continuing PR #9061)
Upstream-commit: d7626e97b61f5f8f5d585ec82d6154395a3f9404
Component: engine
 2014-11-21 17:57:56 -08:00
unclejack d66b329d87 Merge pull request #9270 from jfrazelle/8919-tag-output 
Output image with tag name when image is not found
Upstream-commit: 07b7bdb4fcd97efee02d9eb3c19ada7f54d60c25
Component: engine
 2014-11-22 01:56:31 +02:00
unclejack 19f9fcbc25 build: add pull flag to force image pulling 
Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com>
Upstream-commit: 054e57a622e6a065c343806e7334920d17a03c5b
Component: engine
 2014-11-21 19:59:44 +02:00
Jessica Frazelle 0e1ef24503 Fix tag output where image is not found. 
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
Upstream-commit: e527be1f14eda5a3d9077517a0398d85c4d7fac6
Component: engine
 2014-11-20 15:09:09 -08:00
Lei Jitang 49be3bdeb0 Fix create container output messages. 
Signed-off-by: Lei Jitang <leijitang@huawei.com>
Signed-off-by: Jessica Frazelle <jess@docker.com>
Upstream-commit: 7a7890950d59abf7bc4f826c605289e1d7586390
Component: engine
 2014-11-20 15:03:27 -08:00
Victor Vieux f6afb58177 events filtering 
Signed-off-by: Victor Vieux <vieux@docker.com>
Upstream-commit: 7ff3b81054b028a4399c86340489fe3937049abe
Component: engine
 2014-11-20 19:46:48 +00:00
Victor Vieux 35fec2c425 add daemon labels 
Signed-off-by: Victor Vieux <vieux@docker.com>
Upstream-commit: 2fe36baa0a39840e64f1dc585af41b5ee0ed6df5
Component: engine
 2014-11-20 19:23:58 +00:00
Tibor Vass fa056c1bc9 Merge pull request #9201 from vieux/add_hostname_docker_info 
Add hostname and ID docker info
Upstream-commit: 998b591a71094b3f0112dac9b0c35a93745ac28f
Component: engine
 2014-11-20 13:11:16 -05:00
Victor Vieux addb2d43fa Hostname -> Name 
Signed-off-by: Victor Vieux <vieux@docker.com>
Upstream-commit: 227f4bbdb3a1e9ff0011d1ebaed39b3cb19d9e75
Component: engine
 2014-11-20 17:40:08 +00:00
Victor Vieux 4b4f9725e6 Update libtrust version 
Signed-off-by: Victor Vieux <vieux@docker.com>
Upstream-commit: 6e92dfdfd843aec909572a405337efb25beb6f58
Component: engine
 2014-11-20 17:39:54 +00:00
Oh Jinkyun 313de46eb6 Fix for #8777 
Now filter name is trimmed and lowercased before evaluation for case
insensitive and whitespace trimemd check.

Signed-off-by: Oh Jinkyun <tintypemolly@gmail.com>
Upstream-commit: 4deac03c65edf34affd66abd3ef8fb88287d2f5a
Component: engine
 2014-11-20 13:36:46 +09:00
Michael Crosby f35e467fb4 Merge pull request #9211 from mtesselH/login 
Fixed a bug - no panic anymore when logining in without TTY
Upstream-commit: d4ca9e5cce2ff7e08750123609df1864e0befdcf
Component: engine
 2014-11-19 17:52:35 -08:00
Sven Dowideit e390ce1d8e Merge pull request #9144 from miminar/sigproxy_tty 
Corrected description of --sig-proxy
Upstream-commit: c7e6ad8e987d06385894ee8cd77fe2571ca9bb50
Component: engine
 2014-11-19 14:52:01 -08:00
Victor Vieux 5660f63578 Merge pull request #8905 from 13W/x-registry-auth 
allow to use x-registry-auth header with enabled cors
Upstream-commit: f676891192670df3e5c79c4612a86186329d658f
Component: engine
 2014-11-18 17:21:22 -08:00
Jessica Frazelle 1b2e957b5a Fix steam where it should be stream. 
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
Upstream-commit: 7fe8d0aeeb373a0fef92758819d8054fbd744ea5
Component: engine
 2014-11-18 10:49:01 -08:00
Marianna 16ad3a4d02 Fixed a bug - no panic anymore when logining in without TTY 
Fixes #8956

Signed-off-by: Marianna <mtesselh@gmail.com>
Upstream-commit: e6fd57b90bcdd3b0105fa5c7d17a64332f829ded
Component: engine
 2014-11-17 19:41:27 -08:00
Jessie Frazelle 5d1b12a860 Merge pull request #8993 from SvenDowideit/make-ps-size-docs-clearer 
makes the -s --size option documentation clearer #8950
Upstream-commit: 882db5f8858f36e213feabda459e6b5e639c5c85
Component: engine
 2014-11-17 17:42:27 -07:00
Victor Vieux f066184384 add ID and Hostname in docker info 
Signed-off-by: Victor Vieux <vieux@docker.com>
Upstream-commit: 9a85f60c75f2017b14ed5e7f2bae5dc4961cb74c
Component: engine
 2014-11-17 19:23:41 +00:00
John Gossman deefafa9d6 Remove unused sysinfo parameter to runconfig.Parse 
Removing dead code.

Signed-off-by: John Gossman <johngos@microsoft.com>
Upstream-commit: e45b0f92711ff190cff4b61b2ea80cdd53203a16
Component: engine
 2014-11-14 18:20:54 -08:00
Ahmet Alp Balkan 2e7196248a Extract client signals to pkg/signal 
SIGCHLD and SIGWINCH used in api/client (cli code) are not
available on Windows. Extracting into separate files with build
tags.

Signed-off-by: Ahmet Alp Balkan <ahmetb@microsoft.com>
Upstream-commit: 91a86670aac52d916c81a818aff3dfcf445da83e
Component: engine
 2014-11-14 18:20:53 -08:00
Michael Crosby ba50e8beb2 Merge pull request #9108 from vieux/handle_redirects 
handle GET redirects over HTTP
Upstream-commit: df603eb4e400f9ed4fa88d956f53ad80b244c376
Component: engine
 2014-11-14 12:07:22 -08:00
Victor Vieux 7632ac2e44 use _, _ string 
Signed-off-by: Victor Vieux <vieux@docker.com>
Upstream-commit: 454f56e37eefd072e350739a6c5a06743ff913ef
Component: engine
 2014-11-14 19:31:52 +00:00
Michael Crosby bb5bcd8e79 Merge pull request #9131 from vieux/empty_lines_dockerinfo 
Do not display empty lines in docker info if the key doesn't exists
Upstream-commit: 967354d48818eebf9ce706bbd4914a20a0375de8
Component: engine
 2014-11-13 19:08:32 -08:00
Victor Vieux f5a6597726 Do not display empty lines in docker info if the key doesn't exists 
Signed-off-by: Victor Vieux <vieux@docker.com>
Upstream-commit: 4f5be9da86ffed40b810bb1840c19526a9156ab3
Component: engine
 2014-11-14 02:50:34 +00:00
Michal Minar a56997089b Corrected description of --sig-proxy 
Signal proxy does work only in non-TTY mode (--tty=false). Man pages and
commands should not lie about it.

Signed-off-by: Michal Minar <miminar@redhat.com>
Upstream-commit: e71f241c4b8006f097e4c63f7b3ea28d4591ddee
Component: engine
 2014-11-13 10:50:06 +01:00
Lei Jitang 22cdb1d809 Cleanup:change latest to graph.DEFAULTTAG 
Signed-off-by: Lei Jitang <leijitang@huawei.com>
Upstream-commit: 3c3968692d3024fde90637dbdfe56f08de100cdd
Component: engine
 2014-11-13 16:21:34 +08:00
Victor Vieux a7280b07fa update timeout 
Signed-off-by: Victor Vieux <vieux@docker.com>
Upstream-commit: 5fbfec333a90b86add1dcf6bd8d5fcb728d34cdf
Component: engine
 2014-11-13 03:21:18 +00:00
Alexandr Morozov 4981609d4e Merge pull request #9031 from cpuguy83/cleanup_api_server_creation 
Cleanup api server creation
Upstream-commit: e12572f265383fa64b84c2a13fb1c23abfd7335e
Component: engine
 2014-11-12 15:37:34 -08:00
Victor Vieux ad5fd5c082 fix unix socket 
Signed-off-by: Victor Vieux <vieux@docker.com>
Upstream-commit: 6ca144ef3d62e358327249546bf83ce1e347be5c
Component: engine
 2014-11-12 00:37:58 +00:00
Victor Vieux f37e910c9f handle GET redirects 
Signed-off-by: Victor Vieux <vieux@docker.com>
Upstream-commit: 4b4ad26b977bba0b52f6ea15d08750a7453304a4
Component: engine
 2014-11-12 00:37:58 +00:00