ef6f38c75b
Do not allow image to be deleted when containers are dependent
...
Upstream-commit: 7f429e0cebf9f7d0b203191646f2afa7b4bee35b
Component: engine
2013-10-14 09:47:01 -07:00
f3a38555ac
device-mapper: Move all devicemapper spew to log through utils.Debugf().
...
Upstream-commit: b440ec0136793ebcfbf8d76e6cd16ccba0785382
Component: engine
2013-10-11 16:31:06 -07:00
ecfa6df5b6
devmapper: Move all "raw" libdevmapper wrappers to devmapper.go
...
This separates out the DeviceSet logic a bit better from the raw
device mapper operations.
devicemapper: Serialize addess to the devicemapper deviceset
This code is not safe to run in multiple threads at the same time,
and neither is libdevmapper.
DeviceMapper: Move deactivate into UnmountDevice
This way the deactivate is atomic wrt othe device mapper operations
and will not fail with EBUSY if someone else starts a devicemapper
operation inbetween unmount and deactivate.
devmapper: Fix loopback mounting regression
Some changes were added to attach_loop_device which added
a perror() in a place that caused it to override errno so that
a later errno != EBUSY failed. This fixes that and cleans up
the error reporting a bit.
devmapper: Build on old kernels without LOOP_CTL_GET_FREE define
Upstream-commit: c77697a45ca615f66351a7363e93c3903e92553f
Component: engine
2013-10-11 16:30:02 -07:00
715688eb5e
Merged master into device-mapper branch
...
Upstream-commit: 1804fcba93368b4e115f607e060eb345b0594e62
Component: engine
2013-10-10 12:50:30 -07:00
6443c6c995
Add vagrant user to the docker group
...
Upstream-commit: d62df6b2b587fce29eec769ab60efb81cf4062b5
Component: engine
2013-10-11 11:00:04 -06:00
5a263e053c
Merge pull request #2118 from karlgrz/936-enhance-logging
...
Add utils.Errorf for error logging
Upstream-commit: 97779ff7cfc2dbee34ad6741223534181079a6af
Component: engine
2013-10-11 08:51:37 -07:00
ff166898e1
Merge pull request #2169 from dotcloud/remove-deprecated-packaging
...
Remove deprecated packaging directory
Upstream-commit: 9afa48a92f7ffb0a2e4d6ccc7446180070a69010
Component: engine
2013-10-11 08:44:34 -07:00
b2ba4dc1a1
Initial steps to fix Issue #936
...
Use utils.Errorf instead of utils.Debugf
Upstream-commit: ad723bbfe7cda7839b3c7f82e63699bf2b9c4911
Component: engine
2013-10-11 08:04:40 -05:00
b33972f66c
Revamp install.sh to be usable by more people, and to use official install methods whenever possible (apt repo, portage tree, etc.), thus making it an official script and moving it to hack/
...
Upstream-commit: 94bf5b00112890ed84c38b9840802fa0142b507b
Component: engine
2013-10-11 00:53:15 -06:00
df618dc294
Merge pull request #2038 from tianon/mkimage-debian-fixes
...
Fix contrib/mkimage-debian.sh apt caching prevention
Upstream-commit: ee256ce6bfc08fbd6d04f5abd4c69f796145abb2
Component: engine
2013-10-10 17:59:17 -07:00
ae4bb19110
Merge pull request #2166 from pnasrat/document-approval
...
Clarify LGTM process to contributors.
Upstream-commit: 5fe699f8132a5b6d6f7c5a876f65416228ba9d37
Component: engine
2013-10-10 17:55:32 -07:00
38757f890c
Merge pull request #2159 from nathankleyn/fix-references-to-param-names
...
Small fixes to parameter names in docs for ADD command.
Upstream-commit: 7561e2570c8db781d9be04cdd0d57ec5c40c4a2c
Component: engine
2013-10-10 17:53:57 -07:00
cabafc4b2a
Merge pull request #2128 from titanous/update-authors
...
Update AUTHORS
Upstream-commit: 640ca68e4f77ef46802ef70233b4f75ce2b3e52e
Component: engine
2013-10-10 16:40:33 -07:00
612ed2548f
Merge pull request #2164 from pnasrat/add-finished-time
...
* Runtime: Record termination time in state.
Upstream-commit: f9b9dfc82dcec3d5a1468318721a10a68f975686
Component: engine
2013-10-10 16:29:07 -07:00
a0e0dc0bf5
Clarify LGTM process to contributors.
...
Upstream-commit: 310a1742604173ac88a052b04f0b117772ab63ff
Component: engine
2013-10-10 18:32:33 -04:00
e57f722bf3
Record termination time in state.
...
Supercedes pull #1946
Upstream-commit: 2eb404ab14ef4b70e101cbb43c124651553de5d2
Component: engine
2013-10-10 14:47:25 -04:00
843c777913
Small fixes to parameter names in docs for ADD command.
...
Upstream-commit: 8abd328f53a207bd7b560197927ca49f12d2c9c8
Component: engine
2013-10-10 12:14:18 +01:00
1c11c22e42
Remove deprecated packaging directory (distro-specific packaging is now managed downstream by their respective package maintainers)
...
Upstream-commit: ae780fb5ea4520822ea3526e43113822ed13de5c
Component: engine
2013-10-10 03:54:10 -07:00
068d644efe
Corrected error in the package name
...
Upstream-commit: 152037f011de00cbe06069687024bc345c76b0c6
Component: engine
2013-10-10 10:10:33 +02:00
0aae080c92
Merge pull request #2144 from shamrin/patch-5
...
document what `vagrant up` is actually doing
Upstream-commit: 0367032bd174b279eb24f53b277f352833601bf4
Component: engine
2013-10-09 17:42:37 -07:00
f5bb2953bd
Merge pull request #2139 from metalivedev/2115-AUFScleanup
...
Fix #2115 Clean AUFS references.
Upstream-commit: edca9f7e9c704fdfd394429dc18d7e139883ebfe
Component: engine
2013-10-09 17:35:05 -07:00
a20f1f498c
Merge pull request #2125 from dotcloud/2099_rm-v_fix
...
- Runtime: fix `docker rm` with volumes
Upstream-commit: e19cc1e843d18aedad196be0dbe01515f4b0dc0b
Component: engine
2013-10-09 16:01:51 -07:00
59519a52dc
Merge pull request #2119 from SvenDowideit/2117-hardcoded-tmp-dir
...
use empty string so TempDir uses the OS's temp dir automatically (Closes...
Upstream-commit: feabce3bcc076c9bffeb99b3c210dd41d72fc85d
Component: engine
2013-10-09 16:00:40 -07:00
4d7c2bfb0d
Merge pull request #2133 from dotcloud/improve_tests
...
Make sure to close the network allocators
Upstream-commit: ded74b0bb37d328a8c1a69f1f9b9aca2bba58199
Component: engine
2013-10-09 15:45:16 -07:00
db700fabdd
Merge pull request #2145 from dotcloud/remove-panic-test
...
* Runtime: replace panic by log.Fatal in tests
Upstream-commit: ffee5faae8037cc352a1d5f0a5d7f2b7d38f6523
Component: engine
2013-10-09 15:37:08 -07:00
e754634d16
Merge pull request #2114 from metalivedev/2113-searchbump
...
Fix #2113 improve doc search results
Upstream-commit: c1bb33ea4d94d38b66f4e8582a584d12818d733a
Component: engine
2013-10-09 12:24:33 -07:00
a5787f2874
Clean up javascript comment.
...
Upstream-commit: 6545e53803a3f0d908510d87b350ca9641f50df2
Component: engine
2013-10-09 12:22:14 -07:00
2971930d8c
Merge pull request #2127 from titanous/close-body
...
Fix some error cases where a HTTP body might not be closed
Upstream-commit: d30806590c8436941e5c4f2349af61de0128c49e
Component: engine
2013-10-09 06:52:03 -07:00
177e714a8f
replace panic by log.Fatal in tests
...
Upstream-commit: 823174de4d1acb93613c1b5ba53873906f43f62c
Component: engine
2013-10-09 13:47:49 +00:00
d81c62612b
Merge pull request #1956 from tianon/bash-completion
...
Add proper bash completion for "docker push"
Upstream-commit: d5f9160441eac56448dbf8418e2f178ea2bcdd06
Component: engine
2013-10-09 05:47:55 -07:00
1671af4f28
document what vagrant up is actually doing
...
* don't mention outdated PPA that Vagrantfile doesn't use
* point to official Ubuntu installation instructions that Vagrant appears to be following; should be future proof
Upstream-commit: 37df1d92d8d2b167bb90bb82c086b947371d7497
Component: engine
2013-10-09 15:05:09 +04:00
4af9c06750
Update AUTHORS
...
Upstream-commit: dabac81824f8ab9ec0bd80f1fcaa026aa103b1e3
Component: engine
2013-10-08 23:51:38 -04:00
cb3a2394e0
Merge pull request #2130 from tianon/swap-contrib-maintainers
...
Swap contrib MAINTAINERS
Upstream-commit: bb62c281f57f7f36480b4d2f971105cad7df9f88
Component: engine
2013-10-08 17:57:52 -07:00
65b5bca147
Fix #2115 Clean AUFS references. Also fixes some links to client libraries and mongo example.
...
Upstream-commit: f4c17a202b5f6021d48c3cb3342c37607b509630
Component: engine
2013-10-08 17:33:19 -07:00
d8303ba769
Add devenvironment link to CONTRIBUTING.md
...
Upstream-commit: 9a4b0b982393e0612fef70c37a04654ea46b4c1d
Component: engine
2013-10-08 16:48:19 -06:00
921ffe0649
Make sure to close the network allocators
...
Upstream-commit: 9107565d0634ea3eed3290c6c4b6c0f006fdefe8
Component: engine
2013-10-08 15:42:02 -07:00
eb4a3a8402
Swap contrib MAINTAINERS
...
Upstream-commit: 4fda3314d871a28e33b0d901d6ca3a6d987c8dfa
Component: engine
2013-10-08 15:15:58 -06:00
6dfdc03073
Fix some error cases where a HTTP body might not be closed
...
Refs #2126
Upstream-commit: e906485b07fbf32a2c38495651d907af6b229962
Component: engine
2013-10-08 15:35:00 -04:00
bbfd951535
fix rm -v
...
Upstream-commit: 1daf242c8bafa0447c099b0e49826667a8155c5c
Component: engine
2013-10-08 16:35:47 +00:00
537fcd112e
Use correct auth config when logging in.
...
Upstream-commit: 967010ae8c7eb2f6482a9245b42731b7ead61e4b
Component: engine
2013-10-08 06:46:29 +02:00
4878575100
use empty string so TempDir uses the OS's temp dir automatically ( Closes #2117 )
...
Upstream-commit: d03022b9ca5e658e551ab3b9907da946b11a0b4c
Component: engine
2013-10-08 13:24:20 +10:00
aa13b96b8a
Insert popularity and boost docs results.
...
Upstream-commit: 6d67ac2a1b93d6c95881cb2f17250a7a8279def6
Component: engine
2013-10-07 17:51:07 -07:00
22bcf655f6
Merge pull request #2103 from tianon/clean-out-fixme
...
Clean out a few outdated FIXME items
Upstream-commit: 2d425af1b1675cfc6399d99a2b00f8efc219d7a9
Component: engine
2013-10-07 15:19:01 -07:00
e57acec080
Merge pull request #2106 from mastahyeti/api_1.5_docs_whitespace
...
Cleanup whitespace in API 1.5 docs
Upstream-commit: ed19693f50dec769daaa1d2c4dd702d0421e5d6c
Component: engine
2013-10-07 13:23:55 -07:00
e8211a620d
Fix contrib/mkimage-debian.sh apt caching prevention
...
Upstream-commit: ee27444098aa91d69f8df6dd07139b9637719b1d
Component: engine
2013-10-07 13:41:10 -06:00
c5b5b5d5ad
[docs] use angle brackets in MAINTAINER example email
...
Upstream-commit: a9eac7eab4c9867114c94cace52d1c889c249293
Component: engine
2013-10-07 20:29:54 +04:00
a8d55bfe7b
Cleanup whitespace in API 1.5 docs
...
remove whitespace on blank lines
Upstream-commit: 7c28683f08a485916e748713b0697ea3eb84a9e2
Component: engine
2013-10-06 19:52:18 -06:00
8cca5d988d
Merge pull request #2061 from dotcloud/1948-test-detach
...
testing, issue #1948 : Increase TestRunDetach timeout
Upstream-commit: c18e849451a3f48cecb82a5747f131e310cb0433
Component: engine
2013-10-06 13:26:44 -07:00
0722c6f3b0
Clean out a few outdated FIXME items
...
Upstream-commit: a665517151911866285e5a72164c5f2d2f31ba65
Component: engine
2013-10-06 13:55:26 -06:00
7bc3cd3dbe
Merge pull request #2087 from alexlarsson/device-mapper-test
...
Device mapper test branch update
Upstream-commit: f6913592a12b0ae98b4f2c9132da7101f74b859a
Component: engine
2013-10-04 07:54:43 -07:00
