246243d186
Add filesystemtype for containers
...
If no type is specified then assume aufs.
Upstream-commit: 80bd64245f14d4d8a6fc8349cff8b441d770da42
Component: engine
2013-10-15 11:49:13 -07:00
821d8910fe
Rename loopback dir to devicemapper
...
Upstream-commit: 4431e9edb7cf49ec7da8201da1221b5b03ea09ee
Component: engine
2013-10-15 11:30:06 -07:00
67ef149cd9
Fixed broken tests
...
Some tests failed because the `auplink` binary was not found inside of the
"docker" container.
Upstream-commit: ca56b35e5334d9f6a6741830951eb1535ca6f9b2
Component: engine
2013-10-15 11:44:56 +02:00
ef800becac
Refactor mkimage-debootstrap.sh to be much more full-featured
...
This includes the following:
- options to control certain parameters
- an option specifically for creating tarballs directly, esp. for dockerbrew
- the addition of the updates and security repositories for Debian images
- the addition of the universe, updates, and security repositories for Ubuntu images
- more correct tagging of Debian images
- tagging of Ubuntu image versions (12.04, 12.10, etc) and latest tag for LTS
Upstream-commit: 095aab9d975a149c33729a0b4981d5b2649167d2
Component: engine
2013-10-15 03:44:03 -06:00
baeaf54d26
Add vim syntax highlighting for Dockerfiles from @honza
...
See https://github.com/honza/dockerfile.vim
See also https://twitter.com/_honza/status/390046317579620352
Upstream-commit: ace059e409f0df056ace0191b02504d051b81d92
Component: engine
2013-10-15 03:35:13 -06:00
56ffd7de59
Add zsh completion from @felixr with permission
...
See https://github.com/felixr/docker-zsh-completion for the original.
See also https://github.com/dotcloud/docker/issues/2202#issuecomment-26313287
Fixes #2202
Upstream-commit: 9da2b3590e52d7f3409d70f183382cee6d6ff81f
Component: engine
2013-10-15 03:04:06 -06:00
66869bbf80
Move contrib/docker.bash to contrib/completion/bash/docker for better organization
...
Upstream-commit: e99ab1df9758bd7bd819e87bf231399ef8f031d6
Component: engine
2013-10-15 03:02:31 -06:00
6d8f5d1b1a
Rename mkimage-debian.sh to mkimage-debootstrap.sh to more clearly reflect its true function
...
Upstream-commit: 4967f9f19ca9ead375f7d0b3252f543082806c36
Component: engine
2013-10-15 02:26:10 -06:00
c2ea620041
Merge pull request #2218 from tianon/ksid
...
Remove @KSid from contrib maintainers for now
Upstream-commit: fde157425c48a7d05e2cafb87c1ac0b168f46ee9
Component: engine
2013-10-15 00:13:58 -07:00
4181aa5aa7
Remove @KSid from contrib maintainers for now
...
His availability has been very limited, so I'll take over completely for the short term until he can find more time to help out.
Upstream-commit: a0e5657cb6c795ddc7c124a9dadd10bac26a5ed3
Component: engine
2013-10-15 00:58:34 -06:00
5b6d6020fa
Initialize devicemapper in NewRuntimeFromDIrectory
...
Upstream-commit: 7093411a8dd36612ddc636c14395e33ecff47f7f
Component: engine
2013-10-15 03:53:48 +00:00
3b33148b08
Make sure the base device is well created before running the tests
...
Upstream-commit: 5778ed7db2fee3b7005a53a06d010272504924e9
Component: engine
2013-10-14 18:36:18 -07:00
ceadf83972
Use incrementing prefix on pool and loopback to allow dind
...
Upstream-commit: 3455c1a0983ae74d22b05abc3c0552460c6a2710
Component: engine
2013-10-14 17:48:43 -07:00
b5fc16147b
Ignore cleanup with /dev/mapper does not exist
...
Upstream-commit: 5dd12ba20a962c0f67e5eefb7b0e00e5caccb1e1
Component: engine
2013-10-14 14:23:58 -07:00
7b56be4cc4
Merge pull request #2211 from mzdaniel/2190-docker-ci
...
Prevent docker-ci to test closing PRs
Upstream-commit: f4a98b4598bfa46c0ae69c853d01c50adb9d4a8a
Component: engine
2013-10-14 14:12:23 -07:00
23160a9e26
Prevent docker-ci to test closing PRs
...
Upstream-commit: 53a07d547554adc61b82f3ff794c0c9c0686be73
Component: engine
2013-10-14 14:00:06 -07:00
7b24c05ec6
Merge pull request #2199 from alexlarsson/dm-docs
...
Add some docs for newly exported functions
Upstream-commit: 5892c8e46950268faa9cc02b611a71d0a182d47c
Component: engine
2013-10-14 13:33:21 -07:00
2718936441
Merge pull request #2200 from alexlarsson/dm-remove-unused
...
Runtime: Remove unused funtion hasFilesystemSupport()
Upstream-commit: 20e3e8c07d0ac9927d7c74a8edc6742874c32a78
Component: engine
2013-10-14 13:24:53 -07:00
4088975de9
Merge pull request #2182 from dotcloud/cleanup-dm-unittests
...
Clean up better from previous unit-test runs
Upstream-commit: 79c0c4470f095cf30138dd4b5f19ad737497e9bd
Component: engine
2013-10-14 12:29:59 -07:00
83a87303bf
Merge pull request #2183 from dotcloud/migrate-aufs
...
Migrate aufs to new device mapper backend
Upstream-commit: 4dedd9a9aac47669df24c9c6c96e2e3a6b28ed0d
Component: engine
2013-10-14 12:28:28 -07:00
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
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
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
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
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
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
db72642777
Add some docs for newly exported functions
...
Upstream-commit: 8e4b3a33906785c3181151cc46bb323952f6eb2b
Component: engine
2013-10-14 10:53:12 +02:00
9c63bb13cc
check return value of syscall.Chdir when changing working directory
...
Upstream-commit: 1043055b10443c3b8d6b7c67c3e858a6b3ca9e00
Component: engine
2013-10-14 15:27:38 +08:00
c072ec522a
Change the base filesystem size in unit tests
...
Upstream-commit: 48070274ee93bf0d4cef7486a4ec19c4d97ac9ce
Component: engine
2013-10-12 15:06:53 -07:00
0e3ebd255a
Allow loopback and base fs sizes set by env var
...
Upstream-commit: c3f1bb3287a10ed0d49f48630b92c69ff6ca4ff7
Component: engine
2013-10-11 20:37:11 -07:00
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
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
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
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
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
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
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
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
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
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
029a9420f7
testing infrastructure, issue #1766 : Dockerize deployment of docker-ci
...
Upstream-commit: d542318d63b847e4494a2688b091baeb5dbde1e1
Component: engine
2013-10-10 18:29:10 -07:00
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
168dc23d28
testing, issue #1766 : Upgrade tooling for Docker nightly release
...
Upstream-commit: fac190959ffbacc95e34fc8615ff82879f8ffd18
Component: engine
2013-10-10 18:29:10 -07:00
3b2cc7dac9
testing, issue #1766 : Add nightly release to docker-ci
...
Upstream-commit: 1dcdc3deb7cc41fe3c84c579df19c9578098a172
Component: engine
2013-10-10 18:29:10 -07: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
