Victor Vieux
894a68d2ee
Merge pull request #2349 from shykes/runtime-cleanup
...
Runtime: remove unused field kernelVersion
2013-10-23 09:54:00 -07:00
Tianon Gravi
dc57d4ca26
Merge pull request #2353 from wrouesnel/mkimage-debootstrap-improvements
...
mkimage-debootstrap.sh: Add -p option to invoke debootstrap with http_proxy
2013-10-23 09:26:45 -07:00
Will Rouesnel
bc8a1081b0
mkimage-debootstrap.sh: Add -p option to invoke debootstrap with http_proxy.
...
This patch allows debootstrap to be run with the http_proxy environment
variable. This is principally useful when you're using apt-cacher and
apt-cacher-ng locally.
2013-10-24 03:21:10 +11:00
Greg Thornton
33ccd29ae7
Typo in host integration docs
2013-10-23 10:19:12 -05:00
Tianon Gravi
2aaaf90320
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
2013-10-23 07:38:12 -06:00
Yang Bai
99f1675566
refactor utils.ParseHost with switch-case, so we can add other proto support easily
2013-10-23 18:29:35 +08:00
Solomon Hykes
7e4d008403
Runtime: remove unused field kernelVersion
2013-10-23 00:44:57 -06:00
Victor Vieux
b0515a7016
Merge pull request #2279 from dotcloud/fix_docker_inspect
...
Client: improve docker inspect
2013-10-22 17:17:35 -07:00
Victor Vieux
8ff7b70c91
Merge pull request #2341 from dotcloud/1327-race_build_verbose-fix
...
fix race condition in docker build with verbose + cleanup hostIntegration debug
2013-10-22 16:46:36 -07:00
Victor Vieux
01284cbf73
fix status code
2013-10-22 15:39:51 -07:00
Victor Vieux
10e10c9573
fix race condition in docker build with verbose + cleanup hostIntegration debug
2013-10-22 15:01:06 -07:00
Michael Crosby
b73065ab33
Merge pull request #2338 from proppy/patch-1
...
Registry: Fix content-type for PushImageJSONIndex
2013-10-22 14:48:12 -07:00
Johan Euphrosine
d93023daa9
registry: fix content-type for PushImageJSONIndex
2013-10-22 11:56:48 -07:00
Andy Rothfusz
81866087fe
Merge pull request #2261 from edmund-wagner/master
...
make copy paste user friendly
2013-10-22 11:31:49 -07:00
Michael Crosby
e70030a0c3
Merge pull request #2150 from pnasrat/fix-mnt-subdir-volumes
...
Fixes issues with mounting subdirectories of /mnt in container.
2013-10-22 11:26:50 -07:00
Andy Rothfusz
3bd45824da
Merge pull request #2318 from Tranquility/master
...
Fix github link in docs
2013-10-22 09:55:33 -07:00
Victor Vieux
13c913d883
Merge pull request #2198 from hamo/hamo/chdir_error
...
check return value of syscall.Chdir when changing working directory
2013-10-22 09:54:25 -07:00
Tianon Gravi
92beaed066
Merge pull request #2326 from justinforce/commentstring
...
Set commentstring in Vim syntax plugin
2013-10-22 00:41:34 -07:00
Victor Vieux
6b04913e73
Merge pull request #2307 from gurjeet/sorted_commands_in_help
...
Place 'top' subcommand's help in proper order.
2013-10-21 18:07:39 -07:00
Victor Vieux
93810b289c
fix wrong untag while docker rmi
2013-10-21 17:03:32 -07:00
Justin Force
ea59ce60c5
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.
2013-10-21 16:15:10 -07:00
Andy Rothfusz
a1fc8e17a7
Clean up level 3 headers.
2013-10-21 14:03:09 -07:00
Ole Reifschneider
f903feee03
Fix github link in docs
2013-10-21 22:58:56 +02:00
Andy Rothfusz
26adda6c31
Merge pull request #2303 from metalivedev/2302-fixintro
...
Fix #2302
2013-10-21 09:39:34 -07:00
Gurjeet Singh
7e09c6332d
Place 'top' subcommand's help in proper order.
2013-10-20 02:15:36 -04:00
Tianon Gravi
3b0cbc59ea
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)
2013-10-19 23:56:14 -06:00
Andy Rothfusz
bba5fd4555
Fix #2302
2013-10-18 18:00:44 -07:00
Guillaume J. Charmes
9bceae2440
Add a chan to hijack() to block until the hijack is completed
2013-10-18 16:26:29 -07:00
Guillaume J. Charmes
e7269b9841
Fix issue with autoremove
2013-10-18 16:26:29 -07:00
Andy Rothfusz
8cf0f2dbe5
Update documentation
2013-10-18 16:26:29 -07:00
Guillaume J. Charmes
3e014aa662
Fix attach race condition, improve unit tests, make sure the container is started before unblocking Start
2013-10-18 16:26:16 -07:00
Guillaume J. Charmes
333bc23f21
Fix issue killing container while sending signal
...
Fix rebase issue
Update docs
2013-10-18 16:19:27 -07:00
Tianon Gravi
7cf1877098
Add POSIX shell version of host_integration/manager.go in the style of hack/make.sh
...
Rename host_integration to host-integration for consistency
2013-10-18 16:16:29 -07:00
Guillaume J. Charmes
4918769b1a
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
2013-10-18 16:16:29 -07:00
Tianon Gravi
4b7c071e9c
Merge pull request #2222 from tianon/debootstrap
...
Renamed and refactored mkimage-debian to mkimage-debootstrap to more clearly reflect its true function
2013-10-18 14:46:14 -07:00
Andy Rothfusz
ad7c6bc950
Merge pull request #2281 from metalivedev/cleanupformat
...
Clean up build warnings. Remove redundant files.
2013-10-18 11:39:46 -07:00
Victor Vieux
2e4ee72201
Merge pull request #2282 from shykes/fix-tests
...
Tests: Cleanup the test suite
2013-10-18 11:31:13 -07:00
Tianon Gravi
4870265a9f
Add "vendor/pkg/" to .gitignore now that we "go test -i"
2013-10-18 12:18:13 -06:00
Roger Peppe
43fd85eb8f
Merge remote-tracking branch 'upstream/master'
...
Conflicts:
commands.go
2013-10-18 09:22:20 +01:00
Solomon Hykes
b629810fe0
hack: encode the name of the current test in temporary directories, for easier tracking
...
Conflicts:
utils_test.go
2013-10-18 07:29:07 +00:00
Solomon Hykes
07d9e4353b
Increase readbility of unit tests by using mkRuntime everywhere
2013-10-18 07:20:39 +00:00
Tianon Gravi
ac5bc86771
Merge pull request #1 from jpetazzo/cherry-on-top-of-hack-release
...
Cherry on top of hack release
2013-10-17 23:21:41 -07:00
Jérôme Petazzoni
85956c70b5
Change bundle order, and fix shell array expansion.
...
I believe that it is helpful to build the binary first. That way,
if you interrupt the tests, you still get a binary to play with.
If you run the tests first and interrupt them, no binary for you!
Also, the second part of this commit is an undeniable proof that
Bash array syntax is nothing else than an elaborate troll by Bash
authors.
2013-10-17 23:20:18 -07:00
Jérôme Petazzoni
8c38c30985
Remove spurious messages, and use proper args expansion.
...
Also, display some (hopefully helpful) message when no command was given.
2013-10-17 23:19:36 -07:00
Tianon Gravi
89a2c8e2cd
Merge pull request #2283 from tmc/master
...
Make mkimage-arch.sh a little more clear
2013-10-17 23:05:01 -07:00
Travis Cline
f34a62ea19
Use heredoc to make expect script more clear
2013-10-18 00:35:12 -05:00
Jérôme Petazzoni
255b6aadfa
Work around an exotic bug affecting Docker-in-Docker + systemd.
2013-10-17 20:42:11 -07:00
Solomon Hykes
5c175357aa
Hack: fix tests which didn't cleanup properly
2013-10-18 02:13:36 +00:00
Solomon Hykes
240d5b3fa1
Hack: don't run integration tests in /var/lib/docker/unit-tests; add missing cleanups in a few tests
2013-10-18 02:13:36 +00:00
Andy Rothfusz
689bcd1dc3
Clean up build warnings. Remove redundant files.
2013-10-17 17:57:01 -07:00