Michael Crosby
e69bbd239e
Merge branch 'master' into 0.6.5-dm-plugin
2013-11-22 14:06:59 -08:00
Michael Crosby
d4c8fb9ee2
Merge pull request #2769 from vbatts/none_bridge
...
Do not setup bridge ip if 'none' bridge is provided
2013-11-22 11:48:33 -08:00
Michael Crosby
0cecc2a78c
Merge branch 'master' into 0.6.5-dm-plugin
...
Conflicts:
container.go
image.go
2013-11-21 17:18:41 -08:00
Guillaume J. Charmes
806abe90ba
Use UTC for time
2013-11-21 16:43:36 -08:00
Michael Crosby
25e443a3c7
Merge pull request #2798 from dotcloud/fix_state_race
...
Refactor State to be 100% thread safe
2013-11-21 16:39:50 -08:00
Guillaume J. Charmes
33e70864a2
Refactor State to be 100% thread safe
2013-11-21 16:34:58 -08:00
Michael Crosby
d6e6214d37
Merge pull request #2678 from cxmcc/minor
...
Minor code simplification for Containers api
2013-11-21 16:27:15 -08:00
Michael Crosby
70f1bd3104
Merge pull request #2488 from viirya/fix_container_volumes_delete
...
Skip the volumes mounted when deleting the volumes of container.
2013-11-21 16:20:22 -08:00
Guillaume J. Charmes
42c23b0f04
Merge pull request #2763 from dotcloud/use_full_id_delete
...
Do ont truncate ID on docker rmi
2013-11-21 14:39:38 -08:00
Paul Morie
3f17844b6e
Fix typo in pullImage
2013-11-21 17:29:03 -05:00
Michael Crosby
253214f07d
Update ImageExport after merge fail
2013-11-21 10:26:21 -08:00
Michael Crosby
a2c9d2da93
Merge branch 'master' into 0.6.5-dm-plugin
2013-11-21 10:21:30 -08:00
Michael Crosby
fd7ab143bf
Allow images to be saved and loaded by id and repository
2013-11-20 17:28:19 -08:00
Victor Vieux
8a756f417e
wait on pull already in progress
2013-11-20 14:04:19 -08:00
Michael Crosby
2382a0f920
Merge branch 'master' into 0.6.5-dm-plugin
...
Conflicts:
server.go
2013-11-20 11:07:42 -08:00
Guillaume J. Charmes
b4f7078a02
Merge pull request #2773 from dotcloud/speed_up_docker_ps
...
speedup docker ps
2013-11-20 10:40:03 -08:00
Vincent Batts
60cb5f1a34
do not setup bridge ip if bridgeNetwork is nil. This is the case when
...
-b='none' bridge is provided.
issue #2768
https://bugzilla.redhat.com/show_bug.cgi?id=1032094
2013-11-20 09:36:38 -05:00
Michael Crosby
9de4590498
Add typo in remove all. Ensure tmpDir is removed
2013-11-20 03:52:33 +00:00
Michael Crosby
0ef6fed5c7
Fix error checks for offline transfer and remove unneeded debug output
2013-11-20 03:52:33 +00:00
Frederick F. Kautz IV
844c13bce6
Fixing build
2013-11-20 03:52:33 +00:00
Frederick F. Kautz IV
6014db4a7e
Setting offline package version to 1.0
2013-11-20 03:52:33 +00:00
Frederick F. Kautz IV
61a8020e51
Adding version info, switching to defer for cleanup
2013-11-20 03:52:33 +00:00
Frederick F. Kautz IV
7eaa59f626
Offline Image Transfers #1155
2013-11-20 03:52:33 +00:00
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
Victor Vieux
145c2008ae
speedup docker ps
2013-11-19 11:02:10 -08:00
Victor Vieux
2fe4467d73
Do ont truncate ID on docker rmi
2013-11-18 18:39:02 -08:00
Guillaume J. Charmes
5e941f1ca0
Lintify code with confidence=1
2013-11-18 16:24:11 -08:00
Victor Vieux
f946a486ea
Merge pull request #2718 from dotcloud/fix_tmp_dir_never_cleanup
...
Fix tmp dir never cleanup
2013-11-18 12:20:23 -08:00
Victor Vieux
9261690593
Fix tmp dir never cleanup
2013-11-15 16:23:55 -08:00
Guillaume J. Charmes
cbd1281ec9
rename gograph in graphdb
2013-11-15 15:55:45 -08: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
Solomon Hykes
b00d5f0185
gofmt
2013-11-13 19:25:55 +00:00
Xiuming Chen
0013aa7d9f
Minor code simplification for Containers api
2013-11-13 01:29:00 -08:00
Liang-Chi Hsieh
1d7f22c0d4
use Binds key in hostConfig to detect volumes mounted from external.
2013-11-13 15:08:46 +08:00
Liang-Chi Hsieh
6a693176d6
skip the volumes mounted when deleting the volumes of container.
2013-11-13 14:58:24 +08:00
Solomon Hykes
6c4393ccbb
Merge branch 'job-create-start-clean' into engine-patch-2
...
Conflicts:
engine/engine.go
engine/job.go
server.go
utils_test.go
2013-11-13 00:36:20 +00:00
Michael Crosby
7301fbe035
Pull parent layers first before children
2013-11-12 11:48:35 -08:00
Victor Vieux
637850063c
Merge pull request #2614 from dotcloud/prevent_delete_image_running_container
...
Runtime: prevent deletion if image is used by a running container
2013-11-12 11:01:51 -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
Victor Vieux
87c8437a90
Merge pull request #2140 from SvenDowideit/2098-run-cidfile-should-return-longid
...
Server: always return long id's
2013-11-11 13:06:19 -08:00
Victor Vieux
da24945070
Merge branch 'master' of https://github.com/aanand/docker into aanand-master
2013-11-11 12:34:16 -08:00
Mark Allen
62f873aa1f
Just return the id; nothing else.
2013-11-11 13:26:24 -06:00
Mark Allen
8cc19765b4
Edits after code review
...
Return long image ID
Return streamformatted error or "raw" error
2013-11-10 00:06:55 -06:00
Sven Dowideit
b3974abe4f
make all image ID and container ID API responses use the Long ID ( Closes #2098 )
2013-11-09 12:16:49 +10:00
Victor Vieux
45c2b5dc1a
prevent deletion if image is used by a running container
2013-11-08 15:01:01 -08:00
David Sissitka
5957dd9091
Make "docker insert" errors obvious
...
Closes #1130
See also #1942
2013-11-08 00:15:19 -06:00
Solomon Hykes
9ae4bcaaf8
Move Change to the archive package, and fix a leftover merge in
...
Container.Inject()
2013-11-08 00:45:07 +00:00
