3705ed705e
Clone LVM using https: instead of git:
...
The ports for the git protocol are not open in all corporate environments
Upstream-commit: ad23745456f9bb9c1c3da3796a2ab769f192bf36
Component: engine
2013-11-25 17:12:18 +00:00
627f045fff
Merge branch 'master' into 0.6.5-dm-plugin
...
Upstream-commit: e69bbd239ee8dc4bdc0963810448d9f34e4c30c4
Component: engine
2013-11-22 14:06:59 -08:00
a684772eab
Merge pull request #56 from shykes/creack-dm-plugin
...
Use variable to call functions in devmapper_wrapper + some formatting
Upstream-commit: a26f9183bd2c0bed032fc9f7f2359352167ab3ea
Component: engine
2013-11-22 14:05:59 -08:00
a1d40e81ca
Use variable to call functions in devmapper_wrapper + some formatting
...
Upstream-commit: 79e2b33ede415736f9124089a61f4512c16ddddd
Component: engine
2013-11-22 12:25:37 -08:00
6e7d75df95
Format CmdRun
...
Upstream-commit: 076c0eab704e5c4819611a42b1551f1d759fb376
Component: engine
2013-11-22 12:14:34 -08:00
4a4a051d8a
Use a constant for PortSpecTemplate + display the template in the CmdRun help
...
Upstream-commit: 1f9223a7c2c0e5c04936c56a071830f8792c3dd7
Component: engine
2013-11-22 12:00:34 -08:00
c04337f42e
Reformatting parseRun and partParse
...
Upstream-commit: 476559458d49b6d4eacfdbe9025ddf69947ae2b7
Component: engine
2013-11-22 11:58:02 -08:00
7c2bc2f42b
Merge pull request #2769 from vbatts/none_bridge
...
Do not setup bridge ip if 'none' bridge is provided
Upstream-commit: d4c8fb9ee27222e4d33b616bd63ea7863e0064ee
Component: engine
2013-11-22 11:48:33 -08:00
d8bc0d9deb
Merge pull request #2823 from dotcloud/2817-run_rm-fix
...
Fix docker run -rm
Upstream-commit: ae8c589d35e9cd7148d98a0471d0c5c9c77e3908
Component: engine
2013-11-22 11:35:29 -08:00
92b39790ed
fix the nil pointer panic on closing a disabled network manager
...
Issue #2768
Upstream-commit: ef14aaf627377b24edb55fe2080e10f748c0e444
Component: engine
2013-11-22 14:28:49 -05:00
f1afbc9e5f
fix -rm
...
Upstream-commit: 1e7c04fcfe0b1dbc93a8d70e7bf94e963aa764d8
Component: engine
2013-11-22 11:23:48 -08:00
65390c08ce
Pass terminal setting to display utils
...
Upstream-commit: 8b0cd60019b33488f8819da5c7bdd28d1d3fc737
Component: engine
2013-11-22 00:05:55 -06:00
3f82c6cf46
Merge pull request #2812 from dotcloud/bump_v0.6.7
...
Bump v0.6.7
Upstream-commit: a93e40a158aad6f7364db5db69298e8ad7c38949
Component: engine
2013-11-21 18:39:15 -08:00
89913b0834
Bump version to v0.6.7
...
Upstream-commit: 53f1bf0f995d4c0e6af3eb14cd76a1b049c851a2
Component: engine
2013-11-21 18:03:41 -08:00
cf914fd88c
Merge branch 'master' into 0.6.5-dm-plugin
...
Conflicts:
container.go
image.go
Upstream-commit: 0cecc2a78c246a5b809954059650a4c22442e0d6
Component: engine
2013-11-21 17:18:41 -08:00
6ea3214afa
Merge pull request #62 from shykes/devmapper-unit-tests
...
Devmapper unit tests
Upstream-commit: 437bdeee5901daa9d73db393767b1c5030c15143
Component: engine
2013-11-21 16:54:50 -08:00
b82d2b8801
Merge pull request #2798 from dotcloud/fix_state_race
...
Refactor State to be 100% thread safe
Upstream-commit: 25e443a3c7f55d5ccfb1f5a96c427bd50b978f4d
Component: engine
2013-11-21 16:39:50 -08:00
915356af08
Refactor State to be 100% thread safe
...
Upstream-commit: 33e70864a2c4321bf6968d6d521c159a1b72b220
Component: engine
2013-11-21 16:34:58 -08:00
26fbc2e027
Forbid syscalls in tests, add 2 new unit tests
...
Upstream-commit: bc82940a575944e4686db203356a8a3fb3a75217
Component: engine
2013-11-21 16:32:16 -08:00
0e00966e8f
Merge pull request #2678 from cxmcc/minor
...
Minor code simplification for Containers api
Upstream-commit: d6e6214d37499977110e05d5d01cbf25dcae878f
Component: engine
2013-11-21 16:27:15 -08:00
8c720af218
Merge pull request #2488 from viirya/fix_container_volumes_delete
...
Skip the volumes mounted when deleting the volumes of container.
Upstream-commit: 70f1bd31041f9207ae06be5fe2680152eb154047
Component: engine
2013-11-21 16:20:22 -08:00
b7afbe130d
Merge pull request #2304 from unclejack/fix_layer_size_computation
...
Fix layer size computation: handle hard links correctly
Upstream-commit: f7c2a00557a304af753e487d87ef5ed9b6266e27
Component: engine
2013-11-21 16:10:24 -08:00
4718170d22
Merge pull request #2731 from SvenDowideit/docker-commit-doc
...
make the docker commit help more copy&pasteable
Upstream-commit: 8498b44eac24f4f62cd082aa9ecac7ce503bb3ef
Component: engine
2013-11-21 15:33:05 -08:00
de93f1b190
Merge pull request #2772 from bitoiu/patch-3
...
Change to documentation for AWS AMI request
Upstream-commit: e2dcfc2cf7ea00619e327a900d1b87cb437a634c
Component: engine
2013-11-21 15:15:04 -08:00
1eafcb9d5e
Merge pull request #2717 from metalivedev/2342-uploadingcontext
...
Fix #2342 . Harmonize information about ADD. Cross-link build info.
Upstream-commit: 9b4c15114201bab21437853463d58652c8e1624a
Component: engine
2013-11-21 15:09:47 -08:00
96fa8485ac
Merge pull request #2799 from rosenhouse/patch-1
...
Fix title on doc page for remote_api_client_libraries.rst
Upstream-commit: 50239e057309f4efdb6f9ed39d988a8316601103
Component: engine
2013-11-21 14:40:33 -08:00
e859413830
Merge pull request #2763 from dotcloud/use_full_id_delete
...
Do ont truncate ID on docker rmi
Upstream-commit: 42c23b0f048b417bd233bef3f57e529102ae1177
Component: engine
2013-11-21 14:39:38 -08:00
f8ba7a65e3
Fix typo in pullImage
...
Upstream-commit: 3f17844b6ec3edb981653ca237d085909d5be671
Component: engine
2013-11-21 17:29:03 -05:00
68f143de04
Merge pull request #2794 from dotcloud/fix_status_code_and_usage
...
fix status code and usage
Upstream-commit: bcdeb37bb64eca25bee9b1736a53f8ef4684c9a0
Component: engine
2013-11-21 13:48:38 -08:00
63c337d326
Fix title on doc page for remote_api_client_libraries.rst
...
Upstream-commit: 362e9d6b3c7049d44c016ee72fe255b76ec80c5a
Component: engine
2013-11-21 12:45:01 -08:00
9dfa0ceb9c
Revert "Lock state before we modify."
...
This reverts commit d7e2fc898284fe29ed43f7b28eae56e7e052e854.
Upstream-commit: cb70eedfdad40538983f9610322262ce84e284a0
Component: engine
2013-11-21 12:11:25 -08:00
06096928cc
Return status exit status 2 on usage, move parserun into commands.go, display usage on stderr
...
Upstream-commit: 75a7f4d90cde0295bcfb7213004abce8d4779b75
Component: engine
2013-11-21 11:43:07 -08:00
9331f255c0
Merge pull request #63 from tianon/flag-help-consistency
...
Update a few flag help strings for consistency and clarity
Upstream-commit: da824b4a5a1acd3409ff46f1795180f3303e99a8
Component: engine
2013-11-21 11:31:34 -08:00
cdba895115
Update a few flag help strings for consistency and clarity
...
Upstream-commit: 1ab6b8bf4970b050575b008dd658471e185f2a2c
Component: engine
2013-11-21 12:30:17 -07:00
ef47b4e273
Merge pull request #2795 from pnasrat/docker-testmultipleattachrestart-race
...
Lock state before we modify.
Upstream-commit: eaeb969138205349c08e485c0bc4d29dbe2567d7
Component: engine
2013-11-21 11:28:02 -08:00
a3c4139aad
Update ImageExport after merge fail
...
Upstream-commit: 253214f07da1a58931e6a256c351105eb2eee8bc
Component: engine
2013-11-21 10:26:21 -08:00
ebbbc781a4
Merge branch 'master' into 0.6.5-dm-plugin
...
Upstream-commit: a2c9d2da93e5106b82e8f3951947a90508a8f430
Component: engine
2013-11-21 10:21:30 -08:00
7a482f2a8c
Lock state before we modify.
...
When we start a container we lock state, we should do the same in stop.
Detected via -race.
Upstream-commit: d7e2fc898284fe29ed43f7b28eae56e7e052e854
Component: engine
2013-11-21 08:06:02 -05:00
3152efa2ba
Merge pull request #2793 from crosbymichael/offline-ids
...
Allow images to be saved and loaded by id and repository
Upstream-commit: f20c738963cb54884037e54a62743398eebfc0c2
Component: engine
2013-11-21 02:44:00 -08:00
50d7661c9b
Devmapper: test driver initialization and its interaction with libdevmapper
...
Upstream-commit: df258f5861794057c303a33c000bf830bc543631
Component: engine
2013-11-21 02:17:03 +00:00
fe06edbbd1
Devmapper: wrap calls to os/exec for easier mocking
...
Upstream-commit: 60f728b170f550262b22b7905dfb280a405df4a7
Component: engine
2013-11-21 02:16:26 +00:00
840cf279cf
devmapper: skip test which are not unit tests
...
Upstream-commit: 2b7c63b1b5d62515cd876f189dea6e5a5257cd49
Component: engine
2013-11-21 02:12:51 +00:00
10c7f84432
Allow images to be saved and loaded by id and repository
...
Upstream-commit: fd7ab143bf1ecfbf20df90edd876f73dc28c264d
Component: engine
2013-11-20 17:28:19 -08:00
94ec1bcdfe
Merge pull request #2727 from SvenDowideit/docker-images-doc
...
add some common examples for docker images, and tell the user what -a filters out
Upstream-commit: 82cdd21a3492789a47fc4c3bb3f8a4d85b89d14c
Component: engine
2013-11-20 16:30:48 -08:00
ead56a419b
Merge pull request #57 from shykes/wait_on_pull_already
...
Wait on pull already in progress
Upstream-commit: a9230af52e819add5055aa0336e225f77dc62d2a
Component: engine
2013-11-20 15:58:51 -08:00
ad45902f80
Merge pull request #59 from crosbymichael/fix-image-save-size
...
Fix image save size
Upstream-commit: 2f0d18ac4a344826167d0e0217ba9963a7841b03
Component: engine
2013-11-20 15:58:31 -08:00
2cabd3e833
Add more aufs tests and implement Status
...
Upstream-commit: 5306053e21cb2a22884d2d281c2cc855cf22fc69
Component: engine
2013-11-20 15:41:37 -08:00
91acb2bfd6
Devmapper: mock all calls to libdevmapper in the unit tests, and deny them by default
...
Upstream-commit: e2390318bb4cc98886777bdad3fbb860942b8e65
Component: engine
2013-11-20 23:39:02 +00:00
6fbdd28642
Ensure that only the layers are compressed and not mnt points
...
Upstream-commit: 4e0c76b321cf42d36cdbedcf84103f4fcc123ecd
Component: engine
2013-11-20 15:37:26 -08:00
f3353c818b
Devmapper: remove deprecated test helpers
...
Upstream-commit: da514223d1e441e2bab82bf3b30e1a1e0e222ac6
Component: engine
2013-11-20 23:25:27 +00:00
