 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 |
|
|
Victor Vieux
|
f20c738963
|
Merge pull request #2793 from crosbymichael/offline-ids
Allow images to be saved and loaded by id and repository
|
2013-11-21 02:44:00 -08:00 |
|
|
Michael Crosby
|
fd7ab143bf
|
Allow images to be saved and loaded by id and repository
|
2013-11-20 17:28:19 -08:00 |
|
|
Andy Rothfusz
|
82cdd21a34
|
Merge pull request #2727 from SvenDowideit/docker-images-doc
add some common examples for docker images, and tell the user what -a filters out
|
2013-11-20 16:30:48 -08:00 |
|
|
Michael Crosby
|
a9230af52e
|
Merge pull request #57 from shykes/wait_on_pull_already
Wait on pull already in progress
|
2013-11-20 15:58:51 -08:00 |
|
|
Victor Vieux
|
2f0d18ac4a
|
Merge pull request #59 from crosbymichael/fix-image-save-size
Fix image save size
|
2013-11-20 15:58:31 -08:00 |
|
|
Michael Crosby
|
6469422465
|
Merge pull request #58 from crosbymichael/update-aufs-tests
Add more aufs tests and implement Status
|
2013-11-20 15:41:59 -08:00 |
|
|
Michael Crosby
|
5306053e21
|
Add more aufs tests and implement Status
|
2013-11-20 15:41:37 -08:00 |
|
|
Michael Crosby
|
4e0c76b321
|
Ensure that only the layers are compressed and not mnt points
|
2013-11-20 15:37:26 -08:00 |
|
|
Michael Crosby
|
8fdbf46afb
|
Fix image size calc on initial save
|
2013-11-20 14:51:04 -08:00 |
|
|
Victor Vieux
|
8a756f417e
|
wait on pull already in progress
|
2013-11-20 14:04:19 -08:00 |
|
|
Michael Crosby
|
2bc35287a0
|
Merge pull request #2723 from SvenDowideit/doc-build-image
Use the work Path for docker cp CONTAINER:PATH
|
2013-11-20 11:10:13 -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
|
579a5c843b
|
Merge pull request #51 from crosbymichael/driver-specific-image
Handle image metadata when drivers are switched
|
2013-11-20 10:45:51 -08:00 |
|
|
Guillaume J. Charmes
|
6ebb236aa1
|
Merge pull request #55 from alexlarsson/dm-plugins-cleanup-graph-test
graph_test: Clean up drivers allocated in tempGraph()
|
2013-11-20 10:41:18 -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 |
|
|
Guillaume J. Charmes
|
9e68913397
|
Merge pull request #2760 from dotcloud/improve_engine_test
improve tests on the engine
|
2013-11-20 10:38:46 -08:00 |
|
|
Michael Crosby
|
1b28cdc7f9
|
Handle image metadata when drivers are switched
|
2013-11-20 10:31:51 -08:00 |
|
|
Victor Vieux
|
304a80fcd5
|
Merge pull request #2747 from jpoimboe/test-fixes
Test fixes
|
2013-11-20 10:07:40 -08:00 |
|
|
Guillaume J. Charmes
|
04f1d4dcdb
|
Merge pull request #2788 from jpoimboe/resize-after-start
resize pty after starting
|
2013-11-20 10:01:59 -08:00 |
|
|
Josh Poimboeuf
|
171d681724
|
resize pty after starting
Since ptyMaster is created during container start (startPty), it should
resized after starting, not before.
|
2013-11-20 11:40:30 -06:00 |
|
|
Alexander Larsson
|
cfdc284abe
|
tags test: cleanup driver
If not we leak a devicemapper pool
|
2013-11-20 14:52:06 +01:00 |
|
|
Alexander Larsson
|
7192be47c5
|
graph_test: Clean up drivers allocated in tempGraph()
If we don't do this we leak devicemapper pools with the dm backend.
|
2013-11-20 14:42:32 +01:00 |
|
|
Michael Crosby
|
cd4c1ac356
|
Merge pull request #2779 from crosbymichael/pin-python-deps
Pip python deps to a specific version
|
2013-11-19 21:29:09 -08:00 |
|
|
Michael Crosby
|
b8af68a92b
|
Merge pull request #1974 from dotcloud/1155-offline-image-transfer
Implement offline image transfers
|
2013-11-19 20:00:58 -08: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
|
383f95bba1
|
Adding 1.7 documentation
|
2013-11-20 03:52:33 +00:00 |
|
|
Frederick F. Kautz IV
|
1211065c8d
|
Adding content type to images/(name)/get
|
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
|
bf504f2afa
|
Adding spaces to fix docs build
|
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 |
|
|
Michael Crosby
|
2cccbbdadd
|
Pip python deps to a specific version
|
2013-11-19 19:25:54 -08:00 |
|
|
Michael Crosby
|
24586d7af5
|
Merge pull request #54 from shykes/vieux_merge_master
Merge from master
v0.7.0-rc6
|
2013-11-19 18:38:15 -08:00 |
|
|
Victor Vieux
|
b700ee006a
|
Merge pull request #2777 from dotcloud/fix_port_stop_start
don't import emport empty hostconfig
|
2013-11-19 18:36:22 -08:00 |
|
|
Victor Vieux
|
880a0e9c36
|
Merge branch 'master' into vieux_merge_master
|
2013-11-19 18:34:19 -08:00 |
|
|
Victor Vieux
|
0169cf15dd
|
don't import emport empty hostconfig
|
2013-11-19 18:28:50 -08:00 |
|
|
Victor Vieux
|
cd022376b8
|
Merge branch 'master' into vieux_merge_master
Conflicts:
runtime.go
|
2013-11-19 17:32:08 -08:00 |
|
|
Michael Crosby
|
234f5ac39f
|
Merge pull request #2750 from jpoimboe/simplify-register-reconnect
Simplify the runtime Register reconnect logic
|
2013-11-19 17:30:59 -08:00 |
|
|
Michael Crosby
|
d4ef551d65
|
Merge pull request #53 from shykes/improve_cleanup
Improve aufs cleanup and debugging
|
2013-11-19 17:16:36 -08:00 |
|
|
Victor Vieux
|
76f54f3a28
|
Merge pull request #39 from crosbymichael/add-driver-flag
Add flag to set default graph driver
|
2013-11-19 17:16:25 -08:00 |
|
|
Victor Vieux
|
43b709ab36
|
Merge pull request #52 from crosbymichael/rename-aufs-driver
Rename AufsDriver to Driver to be consistent
|
2013-11-19 17:13:44 -08:00 |
|
|
Victor Vieux
|
43899a77bf
|
improve aufs cleanup and debugging
|
2013-11-19 17:12:37 -08:00 |
|
|
Victor Vieux
|
d575918038
|
Merge pull request #2748 from jpoimboe/fix-restart-race-condition
fix container restart race condition
|
2013-11-19 16:26:13 -08:00 |
|
|
Guillaume J. Charmes
|
f6629bbbd5
|
Merge pull request #50 from crosbymichael/limit-dm
Prohibit more than 42 layers in the core
|
2013-11-19 15:42:00 -08:00 |
|
|
Guillaume J. Charmes
|
91330243b5
|
Merge pull request #48 from crosbymichael/reset-mtime
Ensure same atime, mtime after applying whiteouts
|
2013-11-19 15:40:12 -08:00 |
|
|
Guillaume J. Charmes
|
3e0a5ac48b
|
Merge pull request #41 from alexlarsson/dm-plugin-device-tool
Update docker-device-tool
|
2013-11-19 15:38:47 -08:00 |
|