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

182 commits

Author SHA1 Message Date
Sven Dowideit
b487d2f2ff Merge pull request #9330 from TomasTomecek/master 
docs: man docker-images: inconsistent naming
 2014-12-02 11:42:29 +10: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
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
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
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
Sven Dowideit
6dc11cc992 makes the -s --size option documentation clearer #8950 
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
 2014-11-07 11:56:56 +10:00
Jessie Frazelle
a34f31b488 Merge pull request #8871 from tonistiigi/start-wait-hijack 
Wait for hijack on docker start command
 2014-11-04 08:46:56 -08:00
Tibor Vass
a85f58719f Merge pull request #8739 from duglin/CleanupDockerIgnores 
Do some cleanup on .dockerignore paths
 2014-11-03 16:05:24 -05:00
Doug Davis
c0f0f5c988 Do some cleanup on .dockerignore paths 
While working on the fix for #8330 I noticed a few things:
1 - the split() call for the .dockerignore process will generate a blank
    "exclude".  While this isn't causing an issue right now, I got worried
	that in the future some code later on might interpret "" as something bad,
	like "everything" or ".".  So I added a check for an empty "exclude"
	and skipped it
2 - if someone puts "foo" in their .dockerignore then we'll skip "foo".
    However, if they put "./foo" then we won't due to the painfully
	simplistic logic of go's filepath.Match algorithm.  To help things
	a little (and to treat ./Dockerfile just like Dockerfile) I added
	code to filepath.Clean() each entry in .dockerignore.  It should
	result in the same semantic path but ensure that no matter how the
	user expresses the path, we'll match it.

Signed-off-by: Doug Davis <dug@us.ibm.com>
 2014-11-02 11:29:46 -08:00
Jessie Frazelle
9cc71b4597 Merge pull request #8468 from laktek/master 
Fix URL check in build from Git.
 2014-10-31 14:43:21 -07:00
Lei Jitang
d8b17d785a Fix docker exec command help messages 
Signed-off-by: Lei Jitang <leijitang@huawei.com>
 2014-10-31 09:36:07 +08:00
Tonis Tiigi
79a77a396e Wait for hijack on docker start command 
With current implementation there was a possibility
that /start responds quicker than /attach, meaning that
some output would be clipped.

Fixed so the implementation matches with `docker run`.

This also fixes the flaky test results for TestCreateEchoStdout.

Signed-off-by: Tõnis Tiigi <tonistiigi@gmail.com> (github: tonistiigi)
 2014-10-31 01:13:31 +02:00
Jessie Frazelle
eb1b785e67 Merge pull request #8772 from aluzzardi/docker-info-mem-cpu 
Expose # of CPUs and memory available on docker info.
 2014-10-28 14:14:10 -07:00
Alexandr Morozov
339173dd5b Merge pull request #8743 from vieux/hostconfig_start 
do not send hostconfig at start, as we do on create now
 2014-10-27 11:09:57 -07:00
Jessie Frazelle
15b6b7be01 Merge pull request #8770 from LK4D4/logrus_support 
Logrus support
 2014-10-27 09:05:24 -07:00
Lakshan Perera
d3ac9ea98e Add HasValidGITPrefix to utils/utils.go 
This will allow us to use a common Git prefix check for both api/clients/commands.go and
builder/job.go. Previous prefix check in build from Git (in builder/jobs.go) ignored valid prefixes such as "git@", "http://" or "https://".

Signed-off-by: Lakshan Perera <lakshan@laktek.com>
 2014-10-26 03:25:25 +00:00
Tibor Vass
350e1b783d Merge pull request #8321 from erikh/ui_save_output 
docker save: Do not save to a terminal.
 2014-10-24 19:37:14 -04:00
Andrea Luzzardi
61f8001c23 Expose # of CPUs and memory available on docker info. 
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
 2014-10-24 15:56:37 -07:00
Alexandr Morozov
7c62cee51e Use logrus everywhere for logging 
Fixed #8761

Signed-off-by: Alexandr Morozov <lk4d4@docker.com>
 2014-10-24 15:03:06 -07:00
Victor Vieux
12028fc159 do not send hostconfig at start, as we do on create now 
Signed-off-by: Victor Vieux <vieux@docker.com>
 2014-10-24 00:22:21 +00:00
unclejack
25c32d3167 Merge pull request #8672 from estesp/CmdRun-fix-typos-comments 
Clean up comment sections and fix typos in CmdRun
 2014-10-22 14:32:39 +03:00
Michael Crosby
95d1cd0bde Merge pull request #8661 from estesp/8555-start-exit-code 
Return container exit code with start -a/-i
 2014-10-21 16:22:15 -07:00
Phil Estes
d2cd8e77a6 Clean up comment sections and fix typos in CmdRun 
Docker-DCO-1.1-Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com> (github: estesp)
 2014-10-19 02:47:53 -04:00
Phil Estes
65edb07065 Return container exit code with start -a/-i 
Addresses #8555

Docker-DCO-1.1-Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com>
 2014-10-18 23:00:20 -04:00
Alexandr Morozov
ad136e1ae3 Don't write pull output to stdout on container creating 
Fixes #8632

Signed-off-by: Alexandr Morozov <lk4d4@docker.com>
 2014-10-17 11:08:53 -07:00