Michael Crosby
|
d8f4b733f2
|
Add daemon docs with selecting graph driver
|
2013-11-25 09:44:55 -08:00 |
|
Michael Crosby
|
e69bbd239e
|
Merge branch 'master' into 0.6.5-dm-plugin
|
2013-11-22 14:06:59 -08:00 |
|
Victor Vieux
|
a26f9183bd
|
Merge pull request #56 from shykes/creack-dm-plugin
Use variable to call functions in devmapper_wrapper + some formatting
|
2013-11-22 14:05:59 -08:00 |
|
Victor Vieux
|
944a48ec5a
|
Merge pull request #2822 from dotcloud/better_port_help
Better port help
|
2013-11-22 13:59:35 -08:00 |
|
Guillaume J. Charmes
|
79e2b33ede
|
Use variable to call functions in devmapper_wrapper + some formatting
|
2013-11-22 12:25:37 -08:00 |
|
Guillaume J. Charmes
|
076c0eab70
|
Format CmdRun
|
2013-11-22 12:14:34 -08:00 |
|
Guillaume J. Charmes
|
1f9223a7c2
|
Use a constant for PortSpecTemplate + display the template in the CmdRun help
|
2013-11-22 12:00:34 -08:00 |
|
Guillaume J. Charmes
|
476559458d
|
Reformatting parseRun and partParse
|
2013-11-22 11:58:02 -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
|
ae8c589d35
|
Merge pull request #2823 from dotcloud/2817-run_rm-fix
Fix docker run -rm
|
2013-11-22 11:35:29 -08:00 |
|
Guillaume J. Charmes
|
6130f2531e
|
Merge pull request #2677 from mrallen1/fix/2627
Check for a terminal before using escapes
|
2013-11-22 11:30:16 -08:00 |
|
Vincent Batts
|
ef14aaf627
|
fix the nil pointer panic on closing a disabled network manager
Issue #2768
|
2013-11-22 14:28:49 -05:00 |
|
Victor Vieux
|
1e7c04fcfe
|
fix -rm
|
2013-11-22 11:23:48 -08:00 |
|
Mark Allen
|
8b0cd60019
|
Pass terminal setting to display utils
|
2013-11-22 00:05:55 -06:00 |
|
Victor Vieux
|
a93e40a158
|
Merge pull request #2812 from dotcloud/bump_v0.6.7
Bump v0.6.7
|
2013-11-21 18:39:15 -08:00 |
|
Victor Vieux
|
53f1bf0f99
|
Bump version to v0.6.7
|
2013-11-21 18:03:41 -08:00 |
|
Victor Vieux
|
9dc59797e0
|
Merge branch 'master' into bump_v0.6.7
|
2013-11-21 17:40:29 -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 |
|
Michael Crosby
|
437bdeee59
|
Merge pull request #62 from shykes/devmapper-unit-tests
Devmapper unit tests
|
2013-11-21 16:54:50 -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 |
|
Guillaume J. Charmes
|
bc82940a57
|
Forbid syscalls in tests, add 2 new unit tests
|
2013-11-21 16:32:16 -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 |
|
Michael Crosby
|
f7c2a00557
|
Merge pull request #2304 from unclejack/fix_layer_size_computation
Fix layer size computation: handle hard links correctly
|
2013-11-21 16:10:24 -08:00 |
|
Victor Vieux
|
8498b44eac
|
Merge pull request #2731 from SvenDowideit/docker-commit-doc
make the docker commit help more copy&pasteable
|
2013-11-21 15:33:05 -08:00 |
|
Andy Rothfusz
|
e2dcfc2cf7
|
Merge pull request #2772 from bitoiu/patch-3
Change to documentation for AWS AMI request
|
2013-11-21 15:15:04 -08:00 |
|
Andy Rothfusz
|
9b4c151142
|
Merge pull request #2717 from metalivedev/2342-uploadingcontext
Fix #2342. Harmonize information about ADD. Cross-link build info.
|
2013-11-21 15:09:47 -08:00 |
|
Andy Rothfusz
|
50239e0573
|
Merge pull request #2799 from rosenhouse/patch-1
Fix title on doc page for remote_api_client_libraries.rst
|
2013-11-21 14:40:33 -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 |
|
Guillaume J. Charmes
|
eec91e7941
|
Merge pull request #2805 from pmorie/typo
Fix typo in pullImage
|
2013-11-21 14:35:07 -08:00 |
|
Paul Morie
|
3f17844b6e
|
Fix typo in pullImage
|
2013-11-21 17:29:03 -05:00 |
|
Guillaume J. Charmes
|
bcdeb37bb6
|
Merge pull request #2794 from dotcloud/fix_status_code_and_usage
fix status code and usage
|
2013-11-21 13:48:38 -08:00 |
|
Gabe Rosenhouse
|
362e9d6b3c
|
Fix title on doc page for remote_api_client_libraries.rst
|
2013-11-21 12:45:01 -08:00 |
|
Guillaume J. Charmes
|
c4ab498920
|
Merge pull request #2797 from crosbymichael/revert-exit-lock
Revert "Lock state before we modify."
|
2013-11-21 12:19:23 -08:00 |
|
Michael Crosby
|
cb70eedfda
|
Revert "Lock state before we modify."
This reverts commit d7e2fc8982.
|
2013-11-21 12:11:25 -08:00 |
|
Victor Vieux
|
75a7f4d90c
|
Return status exit status 2 on usage, move parserun into commands.go, display usage on stderr
|
2013-11-21 11:43:07 -08:00 |
|
Victor Vieux
|
da824b4a5a
|
Merge pull request #63 from tianon/flag-help-consistency
Update a few flag help strings for consistency and clarity
|
2013-11-21 11:31:34 -08:00 |
|
Tianon Gravi
|
1ab6b8bf49
|
Update a few flag help strings for consistency and clarity
|
2013-11-21 12:30:17 -07:00 |
|
Victor Vieux
|
eaeb969138
|
Merge pull request #2795 from pnasrat/docker-testmultipleattachrestart-race
Lock state before we modify.
|
2013-11-21 11:28:02 -08: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 |
|
Paul Nasrat
|
d7e2fc8982
|
Lock state before we modify.
When we start a container we lock state, we should do the same in stop.
Detected via -race.
|
2013-11-21 08:06:02 -05: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 |
|
Solomon Hykes
|
df258f5861
|
Devmapper: test driver initialization and its interaction with libdevmapper
|
2013-11-21 02:17:03 +00:00 |
|
Solomon Hykes
|
60f728b170
|
Devmapper: wrap calls to os/exec for easier mocking
|
2013-11-21 02:16:26 +00:00 |
|
Solomon Hykes
|
2b7c63b1b5
|
devmapper: skip test which are not unit tests
|
2013-11-21 02:12:51 +00: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 |
|