Victor Vieux
f5ea2a9958
Merge pull request #2235 from dotcloud/update_dockerfile
...
Update Dockerfile test comment
Upstream-commit: adb48ef319e0b15fde3376c96ff69a304836d24d
Component: engine
2013-10-15 17:32:48 -07:00
Victor Vieux
8846d6c443
Update Dockerfile test comment
...
Upstream-commit: ee7d9b0bdec40d02ba5ef25f557cca9444a19669
Component: engine
2013-10-16 00:31:34 +00:00
Victor Vieux
de1101cd9e
Merge pull request #2221 from flavio/fix_broken_tests
...
Fixed broken tests
Upstream-commit: 2f4526d5c43eeba53f32a37c456cc9d761d95648
Component: engine
2013-10-15 17:26:19 -07:00
Victor Vieux
0332f84dd7
Merge pull request #2232 from shykes/error-should-be-debug
...
Remove error messages which are not actually errors
Upstream-commit: 261285c2c220aab326dcbdf1682560bddea0e496
Component: engine
2013-10-15 17:12:51 -07:00
Solomon Hykes
05176434d1
WIP: debugging dm-base-hash + dm-refactor-init
...
Upstream-commit: cd61fb2e6f9d2a7bbd3c4db2ab9091674746126d
Component: engine
2013-10-15 23:56:04 +00:00
Solomon Hykes
58a19a7d93
Merge branch 'dm-refactor-init' into dm
...
Conflicts:
runtime_test.go
Upstream-commit: fdba1aeed8c80b3c2f8cd14c3b393581e7ef99a8
Component: engine
2013-10-15 23:27:28 +00:00
Solomon Hykes
8c6c389ec3
Remove error messages which are not actually errors
...
Upstream-commit: cbc49d7d76dfc9e259d5227a0077a83e5faf1202
Component: engine
2013-10-15 23:12:27 +00:00
Solomon Hykes
990549480d
Merge branch 'dm-base-hash' into dm
...
Upstream-commit: c9f3e54c3148aeaaa668bcdff184e14d016d2613
Component: engine
2013-10-15 23:09:26 +00:00
Solomon Hykes
560c0ccd10
hack: don't set DEBUG when running tests
...
Upstream-commit: 3997b8a923c3e95c14237657f0e2c9301fc5f66d
Component: engine
2013-10-15 23:07:26 +00:00
Solomon Hykes
242fae9ab3
hack: only run certain tests with TESTFLAGS='-run TestName' make.sh
...
Upstream-commit: ec885d91806595add47c793e1e6bb8a4b9e8d100
Component: engine
2013-10-15 23:06:41 +00:00
Solomon Hykes
8bf263047f
Merge pull request #2230 from shykes/hack-select-test
...
hack: only run certain tests with TESTFLAGS='-run TestName' make.sh
Upstream-commit: 4dc90405e35b406a71c72923e082e86852a080c9
Component: engine
2013-10-15 15:58:54 -07:00
Solomon Hykes
ac2cdb6787
hack: only run certain tests with TESTFLAGS='-run TestName' make.sh
...
Upstream-commit: b7abe9dab56f79e410ef2821cbea6344a65b555b
Component: engine
2013-10-15 22:57:40 +00:00
Andy Rothfusz
6c0068a0fa
Fix #1919 document how to edit and release docs.
...
Upstream-commit: cd455ca6fa3a899153880a7b95b9d07762b4c97c
Component: engine
2013-10-15 15:52:21 -07:00
Solomon Hykes
9549f4f9e3
Merge branch 'dm-missing-mapper' into dm
...
Upstream-commit: 54b0cd7cd1cbea8ca35716bd1b4a20a1900029f4
Component: engine
2013-10-15 22:51:20 +00:00
Solomon Hykes
80b9a304af
Merge branch 'dm-fix-test-2' into dm
...
Upstream-commit: 66db2ac9d8176a847936afbad901e97249c27f37
Component: engine
2013-10-15 22:42:49 +00:00
Alexander Larsson
3dc4429624
devmapper: create device nodes 'on create' instead of 'on resume'
...
Upstream-commit: 5ebaca7e55e006083e6e9c2782e4f8b421275579
Component: engine
2013-10-15 21:27:47 +00:00
Solomon Hykes
b68cf98632
Merge pull request #2227 from dotcloud/dm-rename-loopback
...
Rename loopback dir to devicemapper
Upstream-commit: 432ff7e3c3be315b475c59310c1d3889f361f744
Component: engine
2013-10-15 12:23:43 -07:00
Michael Crosby
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
Michael Crosby
821d8910fe
Rename loopback dir to devicemapper
...
Upstream-commit: 4431e9edb7cf49ec7da8201da1221b5b03ea09ee
Component: engine
2013-10-15 11:30:06 -07:00
Flavio Castelli
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
Tianon Gravi
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
Tianon Gravi
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
Tianon Gravi
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
Tianon Gravi
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
Tianon Gravi
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
Solomon Hykes
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
Tianon Gravi
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
Solomon Hykes
5b6d6020fa
Initialize devicemapper in NewRuntimeFromDIrectory
...
Upstream-commit: 7093411a8dd36612ddc636c14395e33ecff47f7f
Component: engine
2013-10-15 03:53:48 +00:00
Guillaume J. Charmes
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
Michael Crosby
ceadf83972
Use incrementing prefix on pool and loopback to allow dind
...
Upstream-commit: 3455c1a0983ae74d22b05abc3c0552460c6a2710
Component: engine
2013-10-14 17:48:43 -07:00
Michael Crosby
b5fc16147b
Ignore cleanup with /dev/mapper does not exist
...
Upstream-commit: 5dd12ba20a962c0f67e5eefb7b0e00e5caccb1e1
Component: engine
2013-10-14 14:23:58 -07:00
Daniel Mizyrycki
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
Daniel Mizyrycki
23160a9e26
Prevent docker-ci to test closing PRs
...
Upstream-commit: 53a07d547554adc61b82f3ff794c0c9c0686be73
Component: engine
2013-10-14 14:00:06 -07:00
Solomon Hykes
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
Solomon Hykes
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
Solomon Hykes
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
Solomon Hykes
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
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