Guillaume J. Charmes
28d4cbbc59
Merge branch 'master' into creack-merge-master
...
Conflicts:
api_params.go
graph.go
graph_test.go
image.go
integration/api_test.go
integration/container_test.go
integration/runtime_test.go
runtime.go
2013-11-19 14:58:12 -08:00
Guillaume J. Charmes
5e941f1ca0
Lintify code with confidence=1
2013-11-18 16:24:11 -08:00
Josh Poimboeuf
440422a963
don't forward SIGCHLD to container
...
It makes no sense to forward SIGCHLD to the container.
2013-11-18 11:45:29 -06:00
Alexander Larsson
243843c078
Print devicemapper status details in docker info
...
This adds a generic Status call in the Driver api and
implements if for the devicemapper backend.
The status is an array of key/value strings rather than a map so that
we can guarantee some static order of the docker info output.
2013-11-15 11:04:02 +01:00
Alexander Larsson
062810caed
Show active driver in docker info output
2013-11-15 10:24:48 +01:00
Guillaume J. Charmes
7cf60da388
Merge branch 'master' into shykes-0.6.5-dm-plugin
...
Conflicts:
utils.go
utils_test.go
2013-11-14 14:02:44 -08:00
Solomon Hykes
359a6f49b9
Move integration tests to integration/, expose missing public methods in the core
2013-11-14 10:50:00 -08:00
Victor Vieux
388057f11a
Merge pull request #2648 from dotcloud/docker_kill_exit_code
...
Make sure docker kill exit with failure in case of error
2013-11-12 14:40:17 -08:00
Guillaume J. Charmes
08623dc216
Fix ImageTree test
2013-11-12 12:25:35 -08:00
Victor Vieux
dcc9980550
Merge pull request #2657 from dotcloud/fix_docker_images_output
...
use utils.ParseRepositoryTag instead of strings.split in docker images
2013-11-12 11:01:29 -08:00
Victor Vieux
b314f19db8
Merge branch 'tests/insert' of https://github.com/mrallen1/docker into mrallen1-tests/insert
...
Conflicts:
server.go
2013-11-12 10:19:29 -08:00
Michael Crosby
5d9723002b
Allow drivers to implement ApplyDiff in Differ interface
2013-11-11 19:09:57 -08:00
Victor Vieux
e2ac0e6b80
add wait, stop, start, restart, rm, rmi
2013-11-11 14:47:23 -08:00
Victor Vieux
84a3600ea8
use utils.ParseRepositoryTag instead of strings.split in docker images
2013-11-11 13:54:17 -08:00
Guillaume J. Charmes
8149439d95
Make sure docker kill exit with failure in case of error
2013-11-11 09:15:51 -08:00
David Sissitka
5957dd9091
Make "docker insert" errors obvious
...
Closes #1130
See also #1942
2013-11-08 00:15:19 -06:00
Guillaume J. Charmes
ef57752bce
Deprecate old tagging format
2013-11-07 17:30:51 -08:00
Sven Dowideit
01fea3cf11
Closes #2328 - allow the user to specify a string timestamp (not just a unix epoch) in the string format that the docker cli shows to the user
2013-11-08 09:32:13 +10:00
Andy Rothfusz
807a305f36
Merge pull request #1794 from justone/add-images-tree
...
add -tree option to images
2013-11-06 16:12:36 -08:00
Guillaume J. Charmes
45aba3dc95
Merge pull request #2334 from SvenDowideit/2149-small-cli-usability-change
...
change ID to CONTAINER ID/IMAGE ID
2013-11-06 09:45:23 -08:00
Nate Jones
b7d1d35c27
add image size to -tree
2013-11-06 04:23:07 +00:00
Nate Jones
ec9a9a08b8
implement "images -tree"
2013-11-06 03:58:16 +00:00
Nate Jones
2a5998baf1
move "images -viz" to client
2013-11-06 03:58:15 +00:00
Nate Jones
15867ff430
rework images JSON
2013-11-06 03:58:15 +00:00
Andy Rothfusz
962a66cd36
Merge pull request #2460 from SvenDowideit/2294-use-repo-colon-tag-everywhere
...
covert docker (commit|import|tag) to use REPOSITORY[:TAG]
2013-11-05 10:29:54 -08:00
Victor Vieux
a482bfd715
Merge pull request #2382 from dotcloud/reflect_future_changes_search_api
...
Update docker search to reflect future changes of the api
2013-11-04 16:14:14 -08:00
Victor Vieux
854cc5f559
remove column size hack
2013-11-04 15:34:51 -08:00
Victor Vieux
1f44fd8624
Fix logs with tty
2013-11-04 12:19:20 -08:00
Sven Dowideit
b840b73b08
tiny table heading tweak for #2149 - change ID to CONTAINER ID/IMAGE ID or IMAGE (the later if it could be an ID or a repo:tag
2013-11-04 22:10:51 +10:00
Sven Dowideit
1f3cdc11ee
conert docker (commit|import|tag) to use REPOSITORY[:TAG] (and repove support for REPOSITORY TAG)
2013-11-04 22:07:55 +10:00
Victor Vieux
fc45535197
Merge pull request #2503 from dotcloud/2500-inspect-fix
...
Client: Inspect fix
2013-11-01 15:24:05 -07:00
Victor Vieux
8f27e23b4b
Merge pull request #2457 from dotcloud/2454_do_not_split_last_column
...
RemoteAPI: Do not split last column docker top
2013-11-01 15:21:47 -07:00
Victor Vieux
747967b4a4
rebase and add some filters
2013-10-31 19:25:55 -07:00
Victor Vieux
02b5202432
update docker search to reflect future changes of the api
2013-10-31 19:14:11 -07:00
Victor Vieux
a89a98e594
fix inspect error message
2013-10-31 18:50:58 -07:00
Victor Vieux
40ed10cc32
fix inspect when it returns nothing valid
2013-10-31 18:39:44 -07:00
Michael Crosby
96d1e9bb5a
Move archive.go to sub package
2013-10-31 16:57:45 -07:00
Victor Vieux
4b8a176ee0
Merge pull request #2432 from SvenDowideit/doc-stop-kill-details
...
IRC: add SIGTERM and SIGKILL details to docker stop and kill docco
2013-10-30 18:57:07 -07:00
Travis Cline
1099d172a2
Add flags to history, add size flag
2013-10-30 19:41:20 -05:00
Victor Vieux
fb4672c52c
do not split last column docker top
2013-10-29 19:03:41 -07:00
Victor Vieux
700a71e6b6
stop proxy at one point
2013-10-29 14:29:01 -07:00
Victor Vieux
e0b59ab52b
Enable sig-proxy by default in run and attach
2013-10-29 11:18:34 -07:00
Sven Dowideit
82f1514895
docker stop sends SIGTERM and SIGKILL, docker kill sends SIGKILL
2013-10-29 13:37:43 +10:00
Michael Crosby
b038b0cd44
Merge pull request #2162 from dotcloud/links
...
Links and Container Naming
2013-10-28 19:24:10 -07:00
Michael Crosby
0d2924408b
Add -name for docker run
...
Remove docker link
Do not add container id as default name
Create an auto generated container name if not
specified at runtime.
2013-10-28 18:09:08 -07:00
Victor Vieux
d5c7e92a9a
fix docker ps display
2013-10-25 17:36:23 -07:00
Victor Vieux
13c521526d
only pass stdin to hijack when needed
2013-10-25 17:17:33 -07:00
Victor Vieux
66a159342b
update docker port command
2013-10-25 15:13:25 -07:00
Victor Vieux
6c863b49ef
remove docker ls and add docker link in usage and switch to go1.2rc2
2013-10-25 15:13:25 -07:00
Victor Vieux
256b7537e3
no more name encoding
2013-10-25 15:13:25 -07:00