ce1466ed6d
Typo in host integration docs
...
Upstream-commit: 33ccd29ae7b6e9c8e5b463c7066426f825c74d0a
Component: engine
2013-10-23 10:19:12 -05:00
a5e651dbd2
Update hack/make/ubuntu to make less ubuntu-centric packages, to fix the issue of deleting the docker group on every upgrade, to use the new init library scripts for upstart and sysvinit, and to include the dependency on iptables
...
Upstream-commit: 2aaaf9032052af472aaf2eaa1a5b934c9bfeb0a8
Component: engine
2013-10-23 07:38:12 -06:00
4cbb2084bc
refactor utils.ParseHost with switch-case, so we can add other proto support easily
...
Upstream-commit: 99f16755661de79cac1ccda78e3e96552f6a4491
Component: engine
2013-10-23 18:29:35 +08:00
0d8e2ee2ed
Runtime: remove unused field kernelVersion
...
Upstream-commit: 7e4d00840392a80c0946291848c4caa18a5ec108
Component: engine
2013-10-23 00:44:57 -06:00
1050f660ec
Merge pull request #2279 from dotcloud/fix_docker_inspect
...
Client: improve docker inspect
Upstream-commit: b0515a7016d9be58e989401f65645af756d904ef
Component: engine
2013-10-22 17:17:35 -07:00
5c37701dc5
Merge pull request #2341 from dotcloud/1327-race_build_verbose-fix
...
fix race condition in docker build with verbose + cleanup hostIntegration debug
Upstream-commit: 8ff7b70c91387a0e868371b2b4055f57a26a057e
Component: engine
2013-10-22 16:46:36 -07:00
5658c0e9c4
fix status code
...
Upstream-commit: 01284cbf7350d1b4537e83ddd60274afccf32ecf
Component: engine
2013-10-22 15:39:51 -07:00
d8ab9dfa35
fix race condition in docker build with verbose + cleanup hostIntegration debug
...
Upstream-commit: 10e10c9573a0f20243212192fa782feb35651b18
Component: engine
2013-10-22 15:01:06 -07:00
92782b4f08
registry: fix content-type for PushImageJSONIndex
...
Upstream-commit: d93023daa9db2b6d38f7eefc8611e8226d75bbaf
Component: engine
2013-10-22 11:56:48 -07:00
185088440f
Merge pull request #2261 from edmund-wagner/master
...
make copy paste user friendly
Upstream-commit: 81866087fe6260eccfd9490f990ad01fec911b15
Component: engine
2013-10-22 11:31:49 -07:00
e3e02821f6
Merge pull request #2150 from pnasrat/fix-mnt-subdir-volumes
...
Fixes issues with mounting subdirectories of /mnt in container.
Upstream-commit: e70030a0c347b2fe8a8ea7b92fab3dde6b928f3b
Component: engine
2013-10-22 11:26:50 -07:00
f2236c43dc
Merge pull request #2318 from Tranquility/master
...
Fix github link in docs
Upstream-commit: 3bd45824da739d98745193e68c15e85edbbb7b60
Component: engine
2013-10-22 09:55:33 -07:00
86b2904f93
Merge pull request #2198 from hamo/hamo/chdir_error
...
check return value of syscall.Chdir when changing working directory
Upstream-commit: 13c913d883a8d26f18de4a833786a5bb305d3d94
Component: engine
2013-10-22 09:54:25 -07:00
91978e1533
Fix typo that made change detection break
...
We were comparing the old and old mtimes rather than the old and
the new. This meant we missed some file changes where only the mtime
changed.
Upstream-commit: bc1c5ddf2ebbb74dd2e2bc2d4a7a24c75edf6877
Component: engine
2013-10-22 11:13:24 +02:00
01e56b8651
Merge pull request #2326 from justinforce/commentstring
...
Set commentstring in Vim syntax plugin
Upstream-commit: 92beaed06601a799ef927ab7222415e25e684415
Component: engine
2013-10-22 00:41:34 -07:00
b0bd7be583
Merge pull request #2307 from gurjeet/sorted_commands_in_help
...
Place 'top' subcommand's help in proper order.
Upstream-commit: 6b04913e730b6ae11c7ec6a63820b41d429071a9
Component: engine
2013-10-21 18:07:39 -07:00
9e9829e4a7
fix wrong untag while docker rmi
...
Upstream-commit: 93810b289c6c8394061da41a59f7fa5c655be0d7
Component: engine
2013-10-21 17:03:32 -07:00
22344a9b8e
Set commentstring in Vim syntax plugin
...
By setting the commentstring, you support commenting with plugins like tComment.
Now Vim won't default to incorrect `/* */` comments.
Upstream-commit: ea59ce60c5fc40e6708c22cf90d7cce08d12e294
Component: engine
2013-10-21 16:15:10 -07:00
fcf658a6b5
Clean up level 3 headers.
...
Upstream-commit: a1fc8e17a79818977375d5e97a1afdc5f2d2fca8
Component: engine
2013-10-21 14:03:09 -07:00
4785dd0921
Fix github link in docs
...
Upstream-commit: f903feee03d4df4361c79a44b6f5d78d4718b350
Component: engine
2013-10-21 22:58:56 +02:00
b3abc383b4
Place 'top' subcommand's help in proper order.
...
Upstream-commit: 7e09c6332de11538e170b4d25ccd5bfa068ffd1e
Component: engine
2013-10-20 02:15:36 -04:00
5cdd5ff8f0
Update hack/install.sh with some more Ubuntu-specific installation stuff while we're still on AUFS (installing linux-image-extra-$(uname -r) when we can't find AUFS to try to find AUFS)
...
Upstream-commit: 3b0cbc59ea4da94cd9013fe60e83919d1a5859aa
Component: engine
2013-10-19 23:56:14 -06:00
8802449935
testing infrastructure, issue #1800 : Refactor docker testing using Docker in Docker
...
Upstream-commit: 95f3f77fc417bbc55f03e869136deec27e26bc51
Component: engine
2013-10-18 22:33:16 -07:00
8f6b16d850
Fix #2302
...
Upstream-commit: bba5fd455567f831270ff60bd6991481d5340958
Component: engine
2013-10-18 18:00:44 -07:00
cc12d3d32e
Add a chan to hijack() to block until the hijack is completed
...
Upstream-commit: 9bceae244044435647e843ffdd040322507d182b
Component: engine
2013-10-18 16:26:29 -07:00
d6470d0bf3
Fix issue with autoremove
...
Upstream-commit: e7269b98416e8228930dde9461bfcad38eeb2c56
Component: engine
2013-10-18 16:26:29 -07:00
295b7a4df7
Update documentation
...
Upstream-commit: 8cf0f2dbe54e5ff5175a830af30ba428f8b1f526
Component: engine
2013-10-18 16:26:29 -07:00
fbbaaa37c7
Fix attach race condition, improve unit tests, make sure the container is started before unblocking Start
...
Upstream-commit: 3e014aa6624bdc3411bb6f5bc2c297e45a47ad68
Component: engine
2013-10-18 16:26:16 -07:00
b3613b29c9
Fix issue killing container while sending signal
...
Fix rebase issue
Update docs
Upstream-commit: 333bc23f21e8423d3085632db99a6d1df227c5f1
Component: engine
2013-10-18 16:19:27 -07:00
9e4d782d8f
Add POSIX shell version of host_integration/manager.go in the style of hack/make.sh
...
Rename host_integration to host-integration for consistency
Upstream-commit: 7cf1877098edb7d4874509a338f663d550ef0ede
Component: engine
2013-10-18 16:16:29 -07:00
02bbabf14d
Add -nostdin and -proxy to docker attach, allow arbirary signal to be sent via docker kill api endpoint
...
Allow attach from `docker start`
Add host integration script generation
Update doc with host integration
Upstream-commit: 4918769b1ac2d38f23087b766140e6a7f8979310
Component: engine
2013-10-18 16:16:29 -07:00
4b6a99ff24
Merge pull request #2222 from tianon/debootstrap
...
Renamed and refactored mkimage-debian to mkimage-debootstrap to more clearly reflect its true function
Upstream-commit: 4b7c071e9c1f2ec839e2d4f5be915850405a8686
Component: engine
2013-10-18 14:46:14 -07:00
f83e69dc32
Merge branch 'master' into dm
...
Conflicts:
Dockerfile
buildfile.go
container.go
hack/make/test
runtime_test.go
utils/utils.go
Upstream-commit: e9ee860c91b6e9cdcafc03cff9941affb6341a0d
Component: engine
2013-10-18 12:38:29 -07:00
439158e160
Switch back some Errorf to Debugf.
...
Upstream-commit: c2175ae736e6b77119ec92a832e325ec076a1e78
Component: engine
2013-10-18 12:29:16 -07:00
0e0977a62e
Merge pull request #2281 from metalivedev/cleanupformat
...
Clean up build warnings. Remove redundant files.
Upstream-commit: ad7c6bc9507d69db4cf13aaf6386c474bf492962
Component: engine
2013-10-18 11:39:46 -07:00
02ebda558b
Merge pull request #2282 from shykes/fix-tests
...
Tests: Cleanup the test suite
Upstream-commit: 2e4ee72201bf7c853266e0c7959fb9f080eccfc2
Component: engine
2013-10-18 11:31:13 -07:00
6bdd999b91
Add "vendor/pkg/" to .gitignore now that we "go test -i"
...
Upstream-commit: 4870265a9f07b443fa06df07c50ddd6f13c9f13f
Component: engine
2013-10-18 12:18:13 -06:00
e878830be2
devmapper: Fix prefix name to work with udev
...
Udev escapes "," used in device names to 0\x2c which breaks libdevmapper.
Instead use : to escape minor and minor which works.
Upstream-commit: 2812baf3957391bf8871bd56c00a58f4fbc0b715
Component: engine
2013-10-18 11:39:47 +02:00
1357281d03
devmapper: Fix major/minor extraction
...
The way devices are mapped is a bit more complex than before.
This implements the method from new_decode_dev in:
https://github.com/mirrors/linux-2.6/blob/master/include/linux/kdev_t.h
Which is what is needed on kernels > 2.6
Upstream-commit: 572b1fd9be69c20a98d885e18b327031ef4f4b51
Component: engine
2013-10-18 11:38:21 +02:00
5be5b89b7a
devmapper: use major,minor of underlying device in devmapper device name, for readability.
...
Upstream-commit: 4756ad248a6b8c70a7f4d6cb1aacd6e60e27b1e6
Component: engine
2013-10-18 08:30:53 +00:00
e658fc1a1d
devmapper: clearer make the 'unknown base hash' error message more understandable
...
Upstream-commit: dfb77274cef85c0561d98de2eee8b2562c329d1f
Component: engine
2013-10-18 08:22:42 +00:00
f793996ad4
Merge remote-tracking branch 'upstream/master'
...
Conflicts:
commands.go
Upstream-commit: 43fd85eb8f1a3eb8f6dcf9dba818fdcc4602e47e
Component: engine
2013-10-18 09:22:20 +01:00
d53bf7553c
hack: encode the name of the current test in temporary directories, for easier tracking
...
Conflicts:
utils_test.go
Upstream-commit: b629810fe08dc864674a6e64a7f1b418096bc448
Component: engine
2013-10-18 07:29:07 +00:00
21aae43f3a
Increase readbility of unit tests by using mkRuntime everywhere
...
Upstream-commit: 07d9e4353bc199db7abb52b4b4bba1c2feb75c1a
Component: engine
2013-10-18 07:20:39 +00:00
89f16d267d
Merge remote-tracking branch 'alexlarsson/dm-status' into dm
...
Conflicts:
devmapper/deviceset.go
Upstream-commit: 73545199a8e84ebc7e44bf2595c7f7b0e20f04a1
Component: engine
2013-10-18 07:17:13 +00:00
c588125712
devmapper: cleanup error reporting
...
Upstream-commit: 0ad35c67462ce3343b99d40ea78755d2ad92a754
Component: engine
2013-10-18 07:09:13 +00:00
8069d98b90
Merge branch 'dm' of ssh://github.com/dotcloud/docker into dm
...
Upstream-commit: 5e363072f54ec1cf0fdb7feb70cdce38622dcbe0
Component: engine
2013-10-18 06:51:50 +00:00
b73358fb51
devmapper: the tests are fast enough that we no longer need a workaround to avoid timeouts
...
Upstream-commit: cad913c57bbd1d9f9b3b2284ee9e2c262734047b
Component: engine
2013-10-18 06:48:20 +00:00
cc3628cab5
hack: encode the name of the current test in temporary directories, for easier tracking
...
Upstream-commit: 5f58a1fbe4733c1415046d6e16afd17a41b595a8
Component: engine
2013-10-18 06:47:08 +00:00
e20e669277
Increase readbility of unit tests by using mkRuntime everywhere
...
Upstream-commit: 07e09d57af29bf9b59945ab2f31c4dc5ab52bb5b
Component: engine
2013-10-18 06:44:30 +00:00
