e45cc3d0d4
Merge pull request #442 from dotcloud/fix_deleted_file_diff
...
Use aufs to handle parents whiteouts instead of doing it manually
Upstream-commit: 03e4704ae58cdd03eef23e873b5e0b964470001c
Component: engine
2013-04-22 18:23:46 -07:00
5b94f91912
Merge pull request #456 from dotcloud/453-generic_kernel_detection-fix
...
453 generic kernel detection fix
Upstream-commit: 7a8ac76299ffa2e9f9ae2a1f800a7e2234500012
Component: engine
2013-04-22 18:20:17 -07:00
56cb20082e
Make kernel detection work without suffix
...
Upstream-commit: c05c91ca3bb69d2c9faa0a2b15bc23b7c2a7bd8a
Component: engine
2013-04-22 18:15:33 -07:00
9868eec5a4
Add unit test for file deletion
...
Upstream-commit: 97535e5a6466dcad6ed9767960e869eadf68204f
Component: engine
2013-04-22 17:51:09 -07:00
494b53d7fc
Merge pull request #457 from shamrin/patch-1
...
README.md: `docker port` instead of just `port`
Upstream-commit: 90d144b6120a7279b86382a74b6d2a9350a6b865
Component: engine
2013-04-22 15:40:03 -07:00
3c0fcda559
Fix typo (ghot -> ghost)
...
Upstream-commit: ffe16e32243da4f02d325dae1bf08f71181ed439
Component: engine
2013-04-22 18:37:06 -04:00
7793ea0a7b
README.md: docker port instead of just port
...
Upstream-commit: 038e1d174bed0d73bcf4ba197f60651907aa1116
Component: engine
2013-04-23 00:27:23 +04:00
6b46021e64
Move the kernel detection to arch specific files
...
Upstream-commit: 16aeb77d5155cf33d1637073b9ca56728d472b49
Component: engine
2013-04-22 12:08:59 -07:00
59824ca670
Make the kernel version detection more generic
...
Upstream-commit: 4ac3b803b9b7d0db1840a12f3332034938eb9550
Component: engine
2013-04-22 11:39:56 -07:00
14226bf464
Do not prevent docker from running when kernel detection fails
...
Upstream-commit: 3514e47edc2d3cdaae2d92a78cc5c618d9549f13
Component: engine
2013-04-22 11:26:34 -07:00
e2e7fde654
Fix race within TestRunDisconnectTty
...
Upstream-commit: acb546cd1bf45a248f4bb51637c795ef63feb6cb
Component: engine
2013-04-22 11:16:32 -07:00
7f4ff6f610
Merge pull request #454 from tianon/master
...
Update utils.go to not enforce extra constraints on the kernel "flavor" (such as being integral or even comparable one to another)
Upstream-commit: 2ced94b41461a399bc848006901af5ab15d665c3
Component: engine
2013-04-22 08:02:42 -07:00
1e9641c3d7
Do not stop execution if cgroup mountpoint is not found
...
Upstream-commit: 71b580661451c35f01ee3824506f572c52d86ac8
Component: engine
2013-04-22 00:44:57 -04:00
547af82c3d
Update utils.go to not enforce extra constraints on the kernel "flavor" (such as being integral or even comparable one to another)
...
This is especially to fix the current docker on kernels such as gentoo-sources, where the "flavor" is the string "gentoo", and that obviously fails to be converted to an integer.
Upstream-commit: 1f65c6bf4c9dcfc513eeb9da34a7cac60c6bc4ff
Component: engine
2013-04-21 19:19:38 -06:00
262fafb31f
'docker push' shows an additional progress bar while it buffers the archive to disk. Fixes #451 .
...
Upstream-commit: 965e8a02d24a35aa7a7f64f2baf2b652a04f5983
Component: engine
2013-04-21 15:29:26 -07:00
41f179ebb1
'docker push' buffers filesystem archives on disk instead of memory.
...
Upstream-commit: baacae8345febd688579ac29832c200c41602ed2
Component: engine
2013-04-21 14:23:55 -07:00
53559b1043
Better title in ubuntu install doc
...
Upstream-commit: 52cedb8a05182c7d6f5e5918453cf356b1efafc8
Component: engine
2013-04-20 18:26:15 -07:00
81120bfb3a
Merge branch 'master' of ssh://github.com/dotcloud/docker
...
Upstream-commit: 15c7e72e2a518cb24b1f5bf9bb75fbfcdaccafc4
Component: engine
2013-04-20 18:19:04 -07:00
dad1da85a7
Merge remote-tracking branch 'origin/check_kernel_capabilities'
...
Upstream-commit: 76b40ad6c994d8eb4c969802a172d8a808b1ac35
Component: engine
2013-04-20 17:40:25 -07:00
28df0b2e7a
Merge pull request #422 from shawnsi/arch-docs
...
Arch docs
Upstream-commit: 6909f3911fce031adfcc71842ca71b5043e3e43b
Component: engine
2013-04-20 17:35:43 -07:00
4295918675
Bumped version to 0.1.7
...
Upstream-commit: 3b6c540fe8313035de0f0b00de52d7197f8bc665
Component: engine
2013-04-20 17:35:00 -07:00
3440da2676
Moved 'under the hood' below install instructions and examples in README
...
Upstream-commit: d49a273071eaa579f59799b679a9f7b316e28fb8
Component: engine
2013-04-20 17:33:02 -07:00
4b4475fccb
Fix Ubuntu install doc
...
Upstream-commit: 1201c418cd6f02ca8c206cfdd4659b8ec2d2f856
Component: engine
2013-04-20 17:31:49 -07:00
3aa701de71
Formatting fix in ubuntu install doc
...
Upstream-commit: 4a9c3a92e1552fab5702eeddc0307f7f87f96496
Component: engine
2013-04-20 17:30:33 -07:00
1f72ca9771
Link to public images list in the README
...
Upstream-commit: 28831a412fa51094124f17d242908f308a2a973a
Component: engine
2013-04-20 17:29:41 -07:00
eec939c8e4
Removed duplicate ubuntu binary install instructions from README
...
Upstream-commit: 70cf467fdf8c4809429089ceae0f3ac1b3a6f729
Component: engine
2013-04-20 17:29:12 -07:00
a5e52704ac
Cleaned up install instructions in the README
...
* Addded quick install on ubuntu as the 1st install option
* Grouped other binary installs under "binary installs"
* Removed duplicate binary ubuntu installs (linked to the docs)
* Improved "build from source" instructions
Upstream-commit: c40f01319f741ef895090334ffa637f099c529b3
Component: engine
2013-04-20 17:26:50 -07:00
5fe93d40b1
Add a test for allocating tcp ports and reaching them on localhost
...
Upstream-commit: 911925b54a42fffa0fed8bac2a3eeba14bf3ec4b
Component: engine
2013-04-19 20:46:07 -07:00
2d0d73c6f3
Shutdown loopback-to-loopback proxy when unmapping a port
...
Upstream-commit: 7f1a32b9ff31bd931e9495acc1d5ccdef4bd51b6
Component: engine
2013-04-19 20:44:25 -07:00
1cb0701d9b
Emulate DNAT in userland for loopback-to-loopback connections. This makes container ports available from localhost.
...
Upstream-commit: 930e9a7e430a3d78e09a95bb32d9fb6052e7dae1
Component: engine
2013-04-19 19:35:44 -07:00
66366b4f1d
Exclude loopback-to-loopback connections from DNAT rules, to allow userland proxying
...
Upstream-commit: 61259ab4b4bfe3404e75dd811a2da7c88e7c7133
Component: engine
2013-04-19 19:32:32 -07:00
82eedaa832
'docker ps' shows port mappings
...
Upstream-commit: 931ca464a7db038fa78ee51a3f5c4cbe85db1e21
Component: engine
2013-04-19 19:29:13 -07:00
00b1b1ebe5
update TestRunDisconnectTty to reflect the correct behavior of CmdRun
...
Upstream-commit: cc5a044a8c140e32868bb0f312f3780161515f0b
Component: engine
2013-04-19 17:51:41 -07:00
d01b620bcb
Wait for the container terminate at the end of CmdRun
...
Fixes the race condition between docker run and docker logs from #428 .
Upstream-commit: 3bfb70db243d35b969eba9781dec619b7c52be98
Component: engine
2013-04-19 18:06:13 -07:00
2c563ad6e8
Use aufs to handle parents whitouts instead of doing it manually
...
Upstream-commit: e49af5b6def4e69ae234549fbcd2dd2987949cab
Component: engine
2013-04-19 16:33:25 -07:00
6dd897a921
contrib/vagrant-docker: a placeholder to centralize collaboration on an official docker provider for vagrant
...
Upstream-commit: d8416539b3b068a6a1a17f6dba441913b648a774
Component: engine
2013-04-19 15:55:34 -07:00
5c80f89bee
Merge branch 'master' of ssh://github.com/dotcloud/docker
...
Upstream-commit: a76c3a9c9580135d349e68a4b2494a0b26ebe01b
Component: engine
2013-04-19 12:55:32 -07:00
f7536bf802
Fixed 'hack' rule in Makefile
...
Upstream-commit: e81ddb2dc76ab2e502ad35363a436dd823289598
Component: engine
2013-04-19 12:55:17 -07:00
aa4998ba2b
Merge remote-tracking branch 'origin/buildbot'
...
Upstream-commit: 4d728821e37a54629f47d7379a50ad27d5055af6
Component: engine
2013-04-19 12:47:22 -07:00
d2c7306555
Merge pull request #415 from dotcloud/261-choose_grace_period-feature
...
added -t in docker stop and restart to choose grace period
Upstream-commit: e92c4b1f39eae970ca5f61abb7537ecc09b42431
Component: engine
2013-04-19 12:42:34 -07:00
11280be410
Fix ubuntu packaging to build from a clean checkout of the correct git tag
...
Upstream-commit: 152a9f77b4475bcec95ac58229c5db0e24b42557
Component: engine
2013-04-19 12:39:40 -07:00
5e10bddbe2
Merge remote-tracking branch 'origin/30-packaging-ubuntu'
...
Upstream-commit: bfb84b564c452e2b5cdb950c8c1b0c53b17f50c1
Component: engine
2013-04-19 11:31:53 -07:00
338f50deb7
Cleanup examples on README
...
Upstream-commit: e8a67f632ea2e83c24f32c243b72fd7653e94d4b
Component: engine
2013-04-18 22:37:45 -07:00
a5929adc35
Small wording fix in README
...
Upstream-commit: 3d2fd8a65024a503456fc8cd64d4d2565c73e304
Component: engine
2013-04-18 22:24:52 -07:00
a59816d9a8
Add examples to the README
...
Upstream-commit: 79a78d37e7102f0aadfa49d89b84b095e86824d1
Component: engine
2013-04-18 22:24:29 -07:00
b79707c599
Fix examples in README to no longer rely on standalone mode
...
Upstream-commit: 3ae5c45d9a75befdd144d689a70c32180b0a16c6
Component: engine
2013-04-18 22:22:00 -07:00
b4f4a13791
Use mount to determine the cgroup mountpoint
...
Upstream-commit: f3e89fae287778cb8b7056e228170e0073c9a046
Component: engine
2013-04-18 21:57:58 -07:00
be5c830b2c
Add unit tests for CompareKernelVersion
...
Upstream-commit: c42a4179fc6954a2363b181969978641553955c4
Component: engine
2013-04-18 21:34:34 -07:00
4bb07b273a
Improve the docker version output
...
Upstream-commit: 2d32ac8cffe08b9c5d562e6ea30c796ae32b8fe1
Component: engine
2013-04-18 21:08:33 -07:00
630116b2c0
Remove the NO_MEMORY_LIMIT constant
...
Upstream-commit: f68d107a1368b3d4f3342456a2b0675659688354
Component: engine
2013-04-18 21:08:20 -07:00
