Commit Graph
22634 Commits
Author SHA1 Message Date
Solomon Hykes 3254b3eb55 Merge pull request #2184 from dotcloud/dm-rmi
Do not allow image to be deleted when containers are dependent
Upstream-commit: 063ebbab68e966545f534827fbc371c19dd1064e
Component: engine
2013-10-14 12:27:19 -07:00
Guillaume J. Charmes 1bca3c7d07 Add error return to cleanup, use os.OpenFile instead of syscall.Open, Make sure the pools are removed after all other devices
Upstream-commit: ea92dc2e8c42c4387eccf1ebb88e20ccc92c1853
Component: engine
2013-10-14 12:26:46 -07:00
Andy Rothfusz 6de23da0ea Merge pull request #2160 from iffy/patch-1
Minor updates to postgresql_service.rst
Upstream-commit: 93b258413f07861cc3b57917fb102313881f4630
Component: engine
2013-10-14 11:59:57 -07:00
Andy Rothfusz 6888bbec73 Merge pull request #2142 from SvenDowideit/patch-1
tell the new developer how they can replace the real docker binary with ...
Upstream-commit: c0bfb75e5f2cafe8d63c0bfe588f6ff6ea517259
Component: engine
2013-10-14 11:55:42 -07:00
Michael Crosby 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
Alexander Larsson d4b9fc2a32 Runtime: Remove unused funtion hasFilesystemSupport()
This used to be used to be used to detect AUFS support, but is not
used anymore.
Upstream-commit: bb42801cdcd0924ada0ff5ccb3a84aa9a1cbd916
Component: engine
2013-10-14 10:54:50 +02:00
Alexander Larsson db72642777 Add some docs for newly exported functions
Upstream-commit: 8e4b3a33906785c3181151cc46bb323952f6eb2b
Component: engine
2013-10-14 10:53:12 +02:00
Yang Bai 9c63bb13cc check return value of syscall.Chdir when changing working directory
Upstream-commit: 1043055b10443c3b8d6b7c67c3e858a6b3ca9e00
Component: engine
2013-10-14 15:27:38 +08:00
Solomon Hykes c072ec522a Change the base filesystem size in unit tests
Upstream-commit: 48070274ee93bf0d4cef7486a4ec19c4d97ac9ce
Component: engine
2013-10-12 15:06:53 -07:00
Michael Crosby 0e3ebd255a Allow loopback and base fs sizes set by env var
Upstream-commit: c3f1bb3287a10ed0d49f48630b92c69ff6ca4ff7
Component: engine
2013-10-11 20:37:11 -07:00
Daniel Mizyrycki fc812228ba Merge pull request #1823 from dotcloud/1766-nightly-release
testing, issue #1766: Add nightly release to docker-ci
Upstream-commit: 620bc5b9e1cdc04e61821fa0775656fd0227da59
Component: engine
2013-10-11 17:38:06 -07:00
Michael Crosby a829b7de69 Verbose migration add warning for running container
Conflicts:
	hack/make.sh
	runtime.go
	runtime_test.go
Upstream-commit: 562e4f1e23a52cff05078f68e21199514ba58250
Component: engine
2013-10-11 17:11:18 -07:00
Michael Crosby 58c60c1584 Migrate AUFS containers to devmapper
Conflicts:
	hack/make.sh
	runtime.go
Upstream-commit: a263e07678c813af2a7b0859034cc76c9a888c7b
Component: engine
2013-10-11 16:54:08 -07:00
Alexander Larsson 53581a197d Clean up better from previous unit-test runs
This makes sure we unmount existing mounts (as well as removing the
devmapper devices), and it fails with proper logs rather than just
panic()ing.
Upstream-commit: e7986da531568040e0185aafce03cdae2169baac
Component: engine
2013-10-11 16:42:11 -07:00
Alexander Larsson 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
Alexander Larsson 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
Daniel Mizyrycki daf88bbd0c Merge pull request #1813 from doubleyou/patch-1
Improve network performance for VirtualBox
Upstream-commit: 6d6097cddf19494acc86347b992be8e77fe5d317
Component: engine
2013-10-11 16:23:19 -07:00
Daniel Mizyrycki 9a01794c54 Merge pull request #2178 from tianon/vagrant-docker-group
Add vagrant user to the docker group
Upstream-commit: 42277d0329c62018019efc92a09a0a81c266b478
Component: engine
2013-10-11 15:10:50 -07:00
Tianon Gravi 6443c6c995 Add vagrant user to the docker group
Upstream-commit: d62df6b2b587fce29eec769ab60efb81cf4062b5
Component: engine
2013-10-11 11:00:04 -06:00
Michael Crosby 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
Michael Crosby 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
Karl Grzeszczak 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
Solomon Hykes 1bd54db78b Merge pull request #2037 from tianon/install-script-revamp
Revamp install.sh to be usable by more people, and to use official install methods whenever possible (apt repo, portage tree, etc.)
Upstream-commit: f15cd71bb8a60473318a97564bd4b061d8b9cf6d
Component: engine
2013-10-10 23:56:13 -07:00
Tianon Gravi 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
Daniel Mizyrycki 029a9420f7 testing infrastructure, issue #1766: Dockerize deployment of docker-ci
Upstream-commit: d542318d63b847e4494a2688b091baeb5dbde1e1
Component: engine
2013-10-10 18:29:10 -07:00
Daniel Mizyrycki 736b960e2d testing infrastructure, issue #1766: Temporarily install docker with proper apparmor handling
Upstream-commit: 6e3068700fb32299cf733acd74785e29609b1974
Component: engine
2013-10-10 18:29:10 -07:00
Daniel Mizyrycki 168dc23d28 testing, issue #1766: Upgrade tooling for Docker nightly release
Upstream-commit: fac190959ffbacc95e34fc8615ff82879f8ffd18
Component: engine
2013-10-10 18:29:10 -07:00
Daniel Mizyrycki 3b2cc7dac9 testing, issue #1766: Add nightly release to docker-ci
Upstream-commit: 1dcdc3deb7cc41fe3c84c579df19c9578098a172
Component: engine
2013-10-10 18:29:10 -07:00
Solomon Hykes 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
Solomon Hykes 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
Solomon Hykes 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
Guillaume J. Charmes cabafc4b2a Merge pull request #2128 from titanous/update-authors
Update AUTHORS
Upstream-commit: 640ca68e4f77ef46802ef70233b4f75ce2b3e52e
Component: engine
2013-10-10 16:40:33 -07:00
Guillaume J. Charmes 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
Guillaume J. Charmes 72308eafdd Merge pull request #2165 from jrydberg/master
- Registry: Use correct auth config when logging in.
Upstream-commit: c978f0fa5cd548fe672aacfc186da15b19ab3ef4
Component: engine
2013-10-10 16:28:46 -07:00
Sven Dowideit 955c1f64b4 tell the new developer how they can replace the real docker binary with the one they've been hacking on (#2142)
Upstream-commit: d91bf33df3d48ec9a1f2d460433ce719ede1a6f7
Component: engine
2013-10-11 08:47:32 +10:00
Paul Nasrat a0e0dc0bf5 Clarify LGTM process to contributors.
Upstream-commit: 310a1742604173ac88a052b04f0b117772ab63ff
Component: engine
2013-10-10 18:32:33 -04:00
Solomon Hykes 715688eb5e Merged master into device-mapper branch
Upstream-commit: 1804fcba93368b4e115f607e060eb345b0594e62
Component: engine
2013-10-10 12:50:30 -07:00
Paul Nasrat e57f722bf3 Record termination time in state.
Supercedes pull #1946
Upstream-commit: 2eb404ab14ef4b70e101cbb43c124651553de5d2
Component: engine
2013-10-10 14:47:25 -04:00
Ken Cochrane 10fc3f9886 Merge pull request #2155 from jdubois/patch-1
- Documentation: Corrected error in the package name
Upstream-commit: 60e426938e491a8b10b353bbeb67b2e3cbc3d439
Component: engine
2013-10-10 11:19:22 -07:00
Zilin Du 8ac7033a81 change 127.0.0.1 -> 127.0.1.1 & remove ::1 -> hostname mapping
Upstream-commit: c2912c82aa7398a10d39fe114eb6328abd636d82
Component: engine
2013-10-10 09:44:48 -07:00
Matt Haggard c24e35d823 Minor updates to postgresql_service.rst
I've added the steps that were missing/wrong for me when I went through this just now.
Upstream-commit: 9041d6a47bef475aa58bb47b38f49ac408fb94bf
Component: engine
2013-10-10 10:23:24 -06:00
Nathan Kleyn 843c777913 Small fixes to parameter names in docs for ADD command.
Upstream-commit: 8abd328f53a207bd7b560197927ca49f12d2c9c8
Component: engine
2013-10-10 12:14:18 +01:00
Solomon Hykes 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
Julien Dubois 068d644efe Corrected error in the package name
Upstream-commit: 152037f011de00cbe06069687024bc345c76b0c6
Component: engine
2013-10-10 10:10:33 +02:00
Andy Rothfusz 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
Andy Rothfusz 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
Guillaume J. Charmes 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
Guillaume J. Charmes 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
Michael Crosby 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
Guillaume J. Charmes 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