43f9ad0fc4
Fixes the flags for nc
...
The `-p` flag for `nc` should not be used with `-l`.
Upstream-commit: 50bb4a1636ea84d90700c2dce308670c9715d378
Component: engine
2013-10-28 15:48:18 -04:00
a4dd698ace
Merge pull request #2413 from rutsky/patch-1
...
Fix typo
Upstream-commit: 3c0c75bbf9ddd335439d40139358f46fd9532fc7
Component: engine
2013-10-28 12:08:04 -07:00
e13ba798d9
fix typo
...
Upstream-commit: 395a24ffd5a34f2fe1e5d7b7b5ee6c7825f51581
Component: engine
2013-10-28 09:35:09 +03:00
b9f7264616
Fix typo
...
Upstream-commit: 45d94944f3afe32d04eb31faa0cd9a129383f42c
Component: engine
2013-10-28 02:45:12 +03:00
f817417133
Removes \\n from debugf calls
...
Upstream-commit: 8f39f0b57da8d06386ff915511ee4d5dd55352f6
Component: engine
2013-10-25 17:50:40 -07:00
98b1505702
only pass stdin to hijack when needed
...
Upstream-commit: 13c521526ddc88e2502d9fe331faef51fe747cd2
Component: engine
2013-10-25 17:17:33 -07:00
17d84be4be
Merge pull request #2385 from dotcloud/suppress_even_more_warnings_test
...
Improve tests again, remove warnings and prevent some mount issues
Upstream-commit: ff567f87293bfea3f9750bf2b07d97d7f3d1d85c
Component: engine
2013-10-25 15:04:56 -07:00
d3bb38b0f9
Merge pull request #2378 from tianon/linkify-github-ids
...
Linkify @github references in the infrastructure README.md
Upstream-commit: 279791bc7426b5fc940927b0a2e45ba3182856a4
Component: engine
2013-10-25 11:30:25 -07:00
8d92e60130
Merge pull request #2355 from xdissent/patch-1
...
Typo in host integration docs
Upstream-commit: 1e704a4ddce4de000311a2be0b09045025a25c87
Component: engine
2013-10-24 19:05:22 -07:00
116fed86d5
Merge pull request #1963 from rogpeppe/master
...
Client: Use less reflection in command-line method invocation
Upstream-commit: 31111f61e05afc625ea82f8751b31df08bd75c2d
Component: engine
2013-10-24 18:03:20 -07:00
c6acea144e
Merge pull request #2383 from jpetazzo/cleanup-errclosedpipe-for-stdin
...
Ignore ErrClosedPipe for stdin in Container.Attach.
Upstream-commit: 217b6070f0649b15f3b45477a27a671411ba6884
Component: engine
2013-10-24 17:18:28 -07:00
281b188b3c
fix workdir, hostname tests and a bunch on mount issue
...
Upstream-commit: a675e249b133fe35eaf02fb0bdb807cfd4efe969
Component: engine
2013-10-24 16:57:35 -07:00
264d4e8059
remove log
...
Upstream-commit: acc2aec988450b117c183f35a4e743b882a55113
Component: engine
2013-10-24 15:13:47 -07:00
74017d1538
swap cat by top to prevent 2 warnings
...
Upstream-commit: 0e021ed470a1014bb924ad7067d85540f8f1e71a
Component: engine
2013-10-24 15:06:10 -07:00
a76023f483
Ignore ErrClosedPipe for stdin in Container.Attach.
...
But pass `err` in the error channel anyway; don't ignore it anymore.
Upstream-commit: b9eb5e04aeac870a9a45ae8961cfb3578af26787
Component: engine
2013-10-24 15:04:58 -07:00
c79d5e702c
change logic for tty resize to avoid warning in tests
...
Upstream-commit: 0e44864b666b5b0139cdf8ec5a001fee661bf212
Component: engine
2013-10-24 14:54:04 -07:00
fe31da6fd6
Merge pull request #2379 from dotcloud/2377-remove_resize_race-fix
...
Monitor the tty after starting the container
Upstream-commit: e661473bcd6ff39ce7364cbed0b7b6455eb25f51
Component: engine
2013-10-24 12:31:31 -07:00
a7e39af256
Merge pull request #2364 from tianon/sudo-modprobe
...
Fix install.sh with $sh_c to get sudo/su for modprobe
Upstream-commit: 98c94dd4dbd900044ca807b763966858e61df597
Component: engine
2013-10-24 11:24:23 -07:00
f1c190c4d6
monitor the tty after starting the container
...
Upstream-commit: 656b66e51b18ff9f5f2720c3ce9ff9ec2937f05f
Component: engine
2013-10-24 11:19:06 -07:00
400a33f8d2
Linkify @github references in the infrastructure README.md
...
Upstream-commit: c9375d14fc6b7f2a0d3b40fc736b6aed20e010d3
Component: engine
2013-10-24 11:54:06 -06:00
4d15f54bd3
Merge pull request #2367 from dotcloud/remove_useless_exit
...
Remove useless os.Exit() after log.Fatalf
Upstream-commit: 489c370fcca781ae10faae19b69209745302de22
Component: engine
2013-10-24 09:18:45 -07:00
f677e2e101
Merge pull request #2363 from tianon/mkimage-numeric-owner
...
Update all the mkimage scripts to use --numeric-owner as a tar argument
Upstream-commit: aa6c99aff604faf3f483372c11e4e10f9d7fc80e
Component: engine
2013-10-24 06:42:52 -07:00
037a64a1b2
remove useless os.Exit() after log.Fatalf
...
Upstream-commit: 92384649cfd7d69a3e493231aadf616bf8704109
Component: engine
2013-10-24 00:25:55 -07:00
1c76b8e2b5
Merge pull request #2354 from hamo/refac_parsehost
...
refactor utils.ParseHost with switch-case, so we can add other proto support easily
Upstream-commit: c2413889bb5d76a57ef239d789d189ca94d73d99
Component: engine
2013-10-24 00:22:50 -07:00
3f6f7d77a8
let utils.ParseHost return err when errors happen
...
Upstream-commit: e81da876df57fb8e0562cc64e7b57dc7eb32284a
Component: engine
2013-10-24 13:23:02 +08:00
002ca069aa
Merge pull request #2263 from tianon/hack-release
...
Update hack/release.sh process to automatically invoke hack/make.sh and bail on building/testing issues
Upstream-commit: f0dbdba5c00f988da893627fe7b9d54b95bc7157
Component: engine
2013-10-23 15:31:16 -07:00
cea1ec67ae
Fix install.sh with $sh_c to get sudo/su for modprobe
...
Upstream-commit: 0324e567ad60d66358075bf866299abeae5241b3
Component: engine
2013-10-23 15:48:30 -06:00
bab3ffd21b
Merge pull request #2226 from tianon/init
...
Add initial init scripts library and better/safer Ubuntu packaging that works for Debian, too
Upstream-commit: ef5cf6c1ec88c71465075f272e58150ae26d25fa
Component: engine
2013-10-23 14:29:41 -07:00
6a3e04b0eb
Merge pull request #2306 from tianon/fix-ubuntu-install-aufs
...
Update hack/install.sh with some more Ubuntu-specific installation stuff...
Upstream-commit: afaddd04f77b1296ed42a2753d43e59d43d8cc35
Component: engine
2013-10-23 14:22:55 -07:00
24baeed431
Update all the mkimage scripts to use --numeric-owner as a tar argument to properly preserve ownership
...
Upstream-commit: 8e43db95f2299f9b63ab3d1728e73f2a5f6600b3
Component: engine
2013-10-23 14:08:16 -06:00
40ad755eae
Merge pull request #2327 from dotcloud/2325_fix_untag_rmi
...
fix wrong untag while docker rmi
Upstream-commit: 7a116220e79b7ef8116c4726dced2a25ecc0873c
Component: engine
2013-10-23 10:24:20 -07:00
6c2f704b07
Merge pull request #2349 from shykes/runtime-cleanup
...
Runtime: remove unused field kernelVersion
Upstream-commit: 894a68d2ee957d75d599bf8e704ffa717212cf0f
Component: engine
2013-10-23 09:54:00 -07:00
47b8397b61
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.
Upstream-commit: bc8a1081b047f6ee4ebf0adb22695fe3c98425c6
Component: engine
2013-10-24 03:21:10 +11:00
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
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
