beenull/moby
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
12179 commits 14 branches 412 tags 338 MiB
Commit graph

432 commits

Author SHA1 Message Date
Michael Crosby
b905f88ee5 Merge pull request #9582 from Mic92/tls_interactive_exec 
Fix interactive TLS postContainersAttach
 2014-12-10 10:37:50 -08:00
Jörg Thalheim
a25168d28d Fix interactive TLS postContainersAttach 
related to 266a1044de

Signed-off-by: Jörg Thalheim <joerg@higgsboson.tk>
 2014-12-10 08:57:38 +01:00
Arnaud Porterie
67e3ddb75f Forbid client piping to tty enabled container 
Forbid `docker run -t` with a redirected stdin (such as `echo test |
docker run -ti busybox cat`). Forbid `docker exec -t` with a redirected
stdin. Forbid `docker attach` with a redirect stdin toward a tty enabled
container.

Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com>
 2014-12-09 14:30:49 -08:00
Jessie Frazelle
58ce0146e1 Merge pull request #9512 from duglin/Issue9404 
Make 'docker build' send non-err output to stdout
 2014-12-08 11:08:13 -08:00
Arnaud Porterie
12252e39a0 Merge pull request #9489 from crosbymichael/info-root 
Return docker's root dir in docker -D info
 2014-12-08 09:05:00 -08:00
Jessie Frazelle
53d5299a40 Merge pull request #9497 from icecrime/86580-tls_interactive_exec 
Fix interactive exec over TLS
 2014-12-06 13:12:06 -08:00
Michael Crosby
654da4e151 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>
 2014-12-05 12:13:25 -08:00
Doug Davis
5c91bb93a7 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>
 2014-12-04 14:06:40 -08:00
Arnaud Porterie
266a1044de 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>
 2014-12-03 23:43:03 -08:00
Jessica Frazelle
7c7026bd22 Be consistent about libtrust import path. 
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
 2014-12-03 17:36:14 -08:00
Michael Crosby
5ec3a038a0 Merge pull request #9442 from icecrime/8658-tls_attach_hangs 
Fix client-side HTTP hijacking over TLS
 2014-12-02 09:47:29 -08:00
Arnaud Porterie
e98e56bb1e 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>
 2014-12-01 18:13:52 -08:00
Sven Dowideit
b487d2f2ff Merge pull request #9330 from TomasTomecek/master 
docs: man docker-images: inconsistent naming
 2014-12-02 11:42:29 +10:00
Victor Vieux
65e75998af Merge pull request #9425 from HuKeping/master 
inspect: format the output of docker inspect
 2014-12-01 16:51:47 -08:00
Huayi Zhang
51172493ab Attach goroutine blocking profiler 
/debug/pprof/block is 404 currently

Signed-off-by: Huayi Zhang <irachex@gmail.com>
 2014-12-01 16:46:59 +08:00
HuKeping
921346be48 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>
 2014-12-01 16:28:08 +08:00
Tomas Tomecek
095027944f docs: man docker-images: inconsistent naming 
Synopsis is mentioning "NAME" while description is describing "REPOSITORY".

Signed-off-by: Tomas Tomecek <ttomecek@redhat.com>
 2014-11-28 08:57:07 +01:00
Jessie Frazelle
00c2a8f323 Merge pull request #9208 from duglin/Issue8703 
Add support for docker exec to return cmd exitStatus
 2014-11-25 18:03:51 -08:00
Jessie Frazelle
9160e01cef Merge pull request #8893 from vieux/filter_events 
Events filtering (daemon side)
 2014-11-25 17:52:27 -08:00
Doug Davis
90928eb114 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>
 2014-11-25 17:49:25 -08:00
Michael Crosby
5794b5373e Update code for use of urlutil pkg 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2014-11-24 18:47:42 -05:00
Michael Crosby
5e19ecf25c Merge pull request #9281 from unclejack/build_pull_flag 
build: add pull flag to force image pulling
 2014-11-24 12:10:45 -08:00
Jessie Frazelle
d7626e97b6 Merge pull request #9188 from somaopensource/8777-fix 
Fix for #8777 (continuing PR #9061)
 2014-11-21 17:57:56 -08:00
unclejack
07b7bdb4fc Merge pull request #9270 from jfrazelle/8919-tag-output 
Output image with tag name when image is not found
 2014-11-22 01:56:31 +02:00
unclejack
054e57a622 build: add pull flag to force image pulling 
Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com>
 2014-11-21 19:59:44 +02:00
Jessica Frazelle
e527be1f14 Fix tag output where image is not found. 
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
 2014-11-20 15:09:09 -08:00
Lei Jitang
7a7890950d Fix create container output messages. 
Signed-off-by: Lei Jitang <leijitang@huawei.com>
Signed-off-by: Jessica Frazelle <jess@docker.com>
 2014-11-20 15:03:27 -08:00
Victor Vieux
7ff3b81054 events filtering 
Signed-off-by: Victor Vieux <vieux@docker.com>
 2014-11-20 19:46:48 +00:00
Victor Vieux
2fe36baa0a add daemon labels 
Signed-off-by: Victor Vieux <vieux@docker.com>
 2014-11-20 19:23:58 +00:00
Tibor Vass
998b591a71 Merge pull request #9201 from vieux/add_hostname_docker_info 
Add hostname and ID docker info
 2014-11-20 13:11:16 -05:00
Victor Vieux
227f4bbdb3 Hostname -> Name 
Signed-off-by: Victor Vieux <vieux@docker.com>
 2014-11-20 17:40:08 +00:00
Victor Vieux
6e92dfdfd8 Update libtrust version 
Signed-off-by: Victor Vieux <vieux@docker.com>
 2014-11-20 17:39:54 +00:00
Oh Jinkyun
4deac03c65 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>
 2014-11-20 13:36:46 +09:00
Michael Crosby
d4ca9e5cce Merge pull request #9211 from mtesselH/login 
Fixed a bug - no panic anymore when logining in without TTY
 2014-11-19 17:52:35 -08:00
Sven Dowideit
c7e6ad8e98 Merge pull request #9144 from miminar/sigproxy_tty 
Corrected description of --sig-proxy
 2014-11-19 14:52:01 -08:00
Victor Vieux
f676891192 Merge pull request #8905 from 13W/x-registry-auth 
allow to use x-registry-auth header with enabled cors
 2014-11-18 17:21:22 -08:00
Jessica Frazelle
7fe8d0aeeb Fix steam where it should be stream. 
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
 2014-11-18 10:49:01 -08:00
Marianna
e6fd57b90b Fixed a bug - no panic anymore when logining in without TTY 
Fixes #8956

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

Signed-off-by: John Gossman <johngos@microsoft.com>
 2014-11-14 18:20:54 -08:00
Ahmet Alp Balkan
91a86670aa 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>
 2014-11-14 18:20:53 -08:00
Michael Crosby
df603eb4e4 Merge pull request #9108 from vieux/handle_redirects 
handle GET redirects over HTTP
 2014-11-14 12:07:22 -08:00
Victor Vieux
454f56e37e use _, _ string 
Signed-off-by: Victor Vieux <vieux@docker.com>
 2014-11-14 19:31:52 +00:00
Michael Crosby
967354d488 Merge pull request #9131 from vieux/empty_lines_dockerinfo 
Do not display empty lines in docker info if the key doesn't exists
 2014-11-13 19:08:32 -08:00
Victor Vieux
4f5be9da86 Do not display empty lines in docker info if the key doesn't exists 
Signed-off-by: Victor Vieux <vieux@docker.com>
 2014-11-14 02:50:34 +00:00
Michal Minar
e71f241c4b 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>
 2014-11-13 10:50:06 +01:00
Lei Jitang
3c3968692d Cleanup:change latest to graph.DEFAULTTAG 
Signed-off-by: Lei Jitang <leijitang@huawei.com>
 2014-11-13 16:21:34 +08:00
Victor Vieux
5fbfec333a update timeout 
Signed-off-by: Victor Vieux <vieux@docker.com>
 2014-11-13 03:21:18 +00:00
Alexandr Morozov
e12572f265 Merge pull request #9031 from cpuguy83/cleanup_api_server_creation 
Cleanup api server creation
 2014-11-12 15:37:34 -08:00