3ea5a20776
Merge pull request #8094 from smerrill/feature/avoid-docker-start-woes
...
Try to avoid issues when the Docker daemon restarts or stops on RHEL/CentOS 6
2014-09-22 19:06:51 -06:00
ec000cbf30
graph: add VirtualSize for inspect output
...
Currently inspect output just shows Size info, and that usally be
very small and even 0 which is confusing.
Fixes #8016
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
2014-09-23 08:42:32 +08:00
513f5a358a
Merge pull request #8156 from SvenDowideit/tedyoung-patch-1
...
Misc. fixes and formatting clean-up
2014-09-23 10:16:05 +10:00
ab43ad7d5f
Apply @tedyoung's changes to the entire set of API docs.
...
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@docker.com> (github: SvenDowideit)
2014-09-23 10:09:49 +10:00
f304d4b190
Misc. fixes and formatting clean-up
...
Cleaned up and corrected some invalid "example responses".
Added some missing double-quotes for examples that resulted in invalid JSON.
Other general cleanup of stray characters and typos.
Docker-DCO-1.1-Signed-off-by: Ted M. Young <tedyoung@gmail.com> (github: SvenDowideit)
2014-09-23 10:09:49 +10:00
99caa68a46
Merge pull request #7564 from unclejack/integcli-add_utils
...
integration cli: add some utility functions and use them
2014-09-22 17:00:01 -07:00
60f6b0299a
Merge pull request #8123 from dcro/docs-clarifications
...
Updated the documentation to to clarify random port mapping when using -...
2014-09-23 09:57:19 +10:00
9b755412ab
Update memory limit for container
...
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2014-09-22 21:41:14 +00:00
636e8561a8
devmapper: resizepool hardcodes files as well
...
Signed-off-by: Vincent Batts <vbatts@redhat.com>
2014-09-22 17:03:31 -04:00
7e9ba22dc3
devmapper: `docker info` devices hard coded
...
If `--storage-opt dm.datadev=/dev/loop0 --storage-opt
dm.metadatadev=/dev/loop1 ` were provided, the information was not
reflected in the information output.
Closes : #7137
Signed-off-by: Vincent Batts <vbatts@redhat.com>
2014-09-22 16:40:20 -04:00
4778d7d52d
Merge pull request #8125 from somaopensource/8102-fix
...
Check whether net.ParseIP returned nil or not
2014-09-22 23:00:25 +04:00
e315493b0c
Allow user to change email/passwd via login
...
Signed-off-by: Doug Davis <dug@us.ibm.com>
2014-09-22 11:58:09 -07:00
652cd6a842
Test on execdriver dir behavior
...
Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com>
2014-09-22 22:49:21 +04:00
623ebf203b
Persistent directory for container in execdriver
...
This is needed for persistent namespaces
Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com>
2014-09-22 22:48:26 +04:00
06d0853682
Merge pull request #8169 from unclejack/avoid_attach_alloc
...
daemon/attach: avoid mem alloc for interface
2014-09-22 21:29:50 +03:00
950bfe4193
daemon/attach: avoid mem alloc for interface
...
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)
2014-09-22 21:17:50 +03:00
350b1cf6ea
Merge pull request #5956 from vbatts/vbatts-tarsum_hashes
...
tarsum: allow for generic hashes
2014-09-22 11:11:25 -07:00
c6965e3e45
integcli: add & use dockerCmdWithTimeout & InDir
...
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)
2014-09-22 21:02:51 +03:00
28e308c25e
Merge pull request #7942 from estesp/7747-stderr-stdout-bug
...
Fix gh#7747: filter bare newline output and log client pull to stdout
2014-09-22 10:53:34 -07:00
5d1cb9d005
integcli: add util to fetch container status
...
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)
2014-09-22 20:34:57 +03:00
97b50e0f29
integcli: consolidate cmd exit code processing
...
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)
2014-09-22 20:32:50 +03:00
10ab2089ce
Change content-type for json stream to application/x-json-stream.
...
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
2014-09-22 10:29:56 -07:00
ac75835931
Merge pull request #8109 from unclejack/avoid_jsonlog_alloc
...
daemon/logs: avoid JSONLog struct alloc in loop
2014-09-22 12:53:31 -04:00
c8f5c686a5
Merge pull request #8166 from unclejack/integcli_pull_scratch
...
integcli: pull scratch for pull test
2014-09-22 19:16:30 +03:00
77d29847e2
integcli: pull scratch for pull test
...
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)
2014-09-22 19:03:19 +03:00
d2c104c3a0
daemon/logs: lower allocations in loop
...
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)
2014-09-22 18:57:28 +03:00
473bb5274c
pkg/jsonlog: avoid JSONLog allocation in loop
...
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)
2014-09-22 18:57:28 +03:00
9c7d975614
Merge pull request #8159 from LK4D4/fix_goroutine_leak_in_logs
...
Fix goroutine leak in logs following
2014-09-22 11:16:48 -04:00
1df4255102
Merge pull request #8164 from unclejack/fix_utils_race
...
integcli: fix race in runCommandWithStdoutStderr
2014-09-22 19:14:40 +04:00
c69896d8a0
integcli: fix race in runCommandWithStdoutStderr
...
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)
2014-09-22 17:53:12 +03:00
3c03506cc2
Merge pull request #8121 from bbinet/cleanup-hello-world-container
...
Automatically clean up hello-world container with --rm
2014-09-22 10:52:50 -04:00
9fb34ae571
Merge pull request #6101 from LK4D4/ip_range_#4986
...
Implement allocating IPs from CIDR within bridge network
2014-09-22 17:09:16 +03:00
5ad82d3ea6
Merge pull request #8137 from jfrazelle/8135-event-log-die-start-fail
...
After container fails to start, log the event die.
2014-09-22 12:47:04 +04:00
c2dc4245f1
Check whether net.ParseIP returned nil or not
...
This is fix of #8102
Signed-off-by: Oh Jinkyun <tintypemolly@gmail.com>
2014-09-22 16:52:23 +09:00
a7ee201ee8
Close logs pipes and catch write errors
...
Signed-off-by: Alexandr Morozov <lk4d4@docker.com>
2014-09-22 10:55:46 +04:00
fd3f2e175f
Change unused WriteCloser to Writer
...
Signed-off-by: Alexandr Morozov <lk4d4@docker.com>
2014-09-22 10:54:58 +04:00
a8775d2f9a
Doc update to clarify random port mapping on docker run -P
...
Signed-off-by: Dan Cotora <d@bluevision.ro>
2014-09-22 08:39:09 +03:00
7faa43d707
Fix for user kicked off after login on some hosts
...
Docker-DCO-1.1-Signed-off-by: SvenDowideit <SvenDowideit@home.org.au> (github: SvenDowideit)
2014-09-22 13:33:38 +10:00
27226d47c1
Merge pull request #8124 from jyrkiput/patch-1
...
Fix detaching from attached container
2014-09-22 09:28:10 +10:00
23fdbbfee4
Merge pull request #8151 from shazow/sort-exec-docs
...
Cleanup: Fixed cli docs' command header sorting
2014-09-22 09:21:38 +10:00
c5805c8772
Cleanup: Fix cli docs: Sorted command headers.
...
Signed-off-by: Andrey Petrov <andrey.petrov@shazow.net>
2014-09-20 18:10:11 -07:00
e7a9662974
Merge pull request #7972 from cpuguy83/split_volumes_from_daemon
...
Split volumes out from daemon
2014-09-20 16:23:20 +04:00
f8c998c605
Merge pull request #8144 from crosbymichael/reduce-logging
...
This reduces the amount of logging in the integration tests
2014-09-20 11:17:03 +04:00
8a9e827216
This reduces the amount of logging in the integration tests
...
There were a new areas in the brige driver that did not need to have log
output. Those were removed. Also set the engine's logging to false
when running the integration tests.
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2014-09-19 17:30:37 -07:00
d64d55eca8
After container fails to start, log the event die.
...
Fixes #8135 .
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
2014-09-19 16:06:49 -07:00
11446d30f7
Merge pull request #8139 from aluzzardi/fix-drone-integration-goenv
...
Fix drone integration
2014-09-19 16:05:52 -07:00
45407cf00a
Split volumes out from daemon
...
Docker-DCO-1.1-Signed-off-by: Brian Goff <cpuguy83@gmail.com> (github: cpuguy83)
2014-09-19 17:47:47 -05:00
07cedaab86
Drone Config: Disable integration-cli/docker_cli_exec_test as it breaks.
...
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
2014-09-19 15:40:48 -07:00
72fe4c8daa
Drone Config: Use AUTO_GOPATH instead of hacking around.
...
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
2014-09-19 15:20:35 -07:00
ba726d9148
Merge pull request #8129 from vbatts/vbatts-archive_comments
...
archive: adding comment to exported functions
2014-09-19 14:36:52 -07:00
Tianon Gravi
Qiang Huang
Sven Dowideit
Sven Dowideit
Ted M. Young
Victor Vieux
Michael Crosby
Vincent Batts
Alexandr Morozov
Doug Davis
unclejack
unclejack
Jessica Frazelle
Tibor Vass
Oh Jinkyun
Alexandr Morozov
Dan Cotora
SvenDowideit
Andrey Petrov
Jessie Frazelle
Brian Goff
Andrea Luzzardi