Commit Graph

31631 Commits

Author SHA1 Message Date
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
a6614b5570 Merge pull request #444 from lopter/master
Fixe the race condition between docker run and docker logs from #428
Upstream-commit: 0eb425426f47199fb5b343dcd6c5410af87f0446
Component: engine
2013-04-19 18:09:58 -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
da599fd557 added: info, history, logs, ps, start, stop, restart, rm, rmi
Upstream-commit: b295239de20f15620ee4149fcc7c13ce461cdaac
Component: engine
2013-04-19 15:24:37 +02: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
b6710144e6 Add capabilities check to allow docker to run on kernel that does not have all options
Upstream-commit: 640efc2ed2244dc16e161cc954af59d20a5e6ed2
Component: engine
2013-04-18 20:55:41 -07:00
4408440fb3 Check kernel version and display warning if too low
Upstream-commit: 003622c8b6587814744a9903f3286dc1b07554c2
Component: engine
2013-04-18 20:47:24 -07:00
73ddc6a114 Added redirect from old location of documentation (/documentation), these was the location when we were on github.
Upstream-commit: 6de5ca1e64407582debe01f17377cdb7bb8d70c5
Component: engine
2013-04-18 16:00:18 -07:00
faf8875469 contrib/docker-build: don't remove the base image if the first build step fails
Upstream-commit: deb55e416e068a9b51c5973dfeeb2bb2ce6fd1be
Component: engine
2013-04-18 14:46:17 -07:00
68a1f0bf2e added kill and images(wip)
Upstream-commit: 79e910580604339a74c1577061d8b207ae8c2ee1
Component: engine
2013-04-18 18:56:22 +02:00
15ab010e20 Updating the arch linux installation docs
New AUR package name
Adding systemd service unit info
Upstream-commit: 7eda9c64b80ff43af5e90b37a3830615034fefee
Component: engine
2013-04-18 09:20:23 -05:00
921b5daf06 Adding archlinux packaging documentation
Upstream-commit: 84c13a3dcf8a0f884d3b95b8f3515e0040816691
Component: engine
2013-04-18 09:17:31 -05:00
847e9fb0f9 fixed test
Upstream-commit: 90602ab62a4dddadff6671d80815465556a267ee
Component: engine
2013-04-18 16:03:50 +02:00
e0e0c2c96e packaging-ubuntu, issue #30: Ensure docker package installs and passes tests on official vagrant Ubuntu 12.04 box
Upstream-commit: 8e6ba343bfb93ed7782d50a3ac1b581ae0e1fb00
Component: engine
2013-04-17 21:10:53 -07:00
a4e3c63817 packaging-ubuntu, issue #30: streamline building and uploading to PPA
Upstream-commit: 523cd8e29cb871271a8e2a55ab009aa980ae5572
Component: engine
2013-04-17 20:56:34 -07:00
7548a05b97 packaging-ubuntu: move original files in place for update
Upstream-commit: fd39af7f859b5bd1c202b4c0ddee53de9c82437d
Component: engine
2013-04-17 20:56:34 -07:00
3adf253fc3 Bumped version to 0.1.6 to mark image format change (author field)
Upstream-commit: ee82870ff78e6d9e0f0ce7674d6a065f9d02f67a
Component: engine
2013-04-17 20:18:35 -07:00
ea3911cd8c Record the author of an image with 'docker commit -author'
Upstream-commit: 227a8142a3c2ea2fd3b085214ef39989ebd57fe1
Component: engine
2013-04-17 20:13:11 -07:00
51cf529c26 Added 'author' field to the image format
Upstream-commit: 4ef2d5c1e6e65b1e214071388618fc9fa4345be9
Component: engine
2013-04-17 19:58:17 -07:00
2140febcd7 skeleton remote API, only version working (wip)
Upstream-commit: c0d5d5969bb9c0bfe79e7a11977697e50cc185ae
Component: engine
2013-04-18 03:13:43 +02:00
973c2340e9 Bumped version to 0.1.5
Upstream-commit: e34e44e8e6097e0a54bc0a96581f79909f7d9a42
Component: engine
2013-04-17 17:12:08 -07:00
2c9483cdd2 Fix the behavior of Graph.Register so that it can be interrupted without side effect
Upstream-commit: 13d9e26edd62228597cf8f060ed397f7ae00298a
Component: engine
2013-04-17 16:35:22 -07:00
e8dca89216 Merge pull request #406 from shawnsi/405-arch-docs
Issue #405: Documentation for Arch Linux Install
Upstream-commit: 0a3131554c7f7feeba08900ccbca1b27779dbc3a
Component: engine
2013-04-17 15:45:26 -07:00
9843493c35 Merge pull request #409 from lynaghk/master
Docker init created by contrib setup script should set proper UTF8 LANG
Upstream-commit: 521ce07859ad09032268793b71e1e5f007e203b5
Component: engine
2013-04-17 15:23:12 -07:00
04cbbf405f Merge remote-tracking branch 'origin/183-no_such_device-fix'
Upstream-commit: f02950965e8467758222e82e23aae932bc626489
Component: engine
2013-04-17 11:54:57 -07:00
9d5990a761 Merge remote-tracking branch 'origin/416-lxc_0_9_compatibliity-fix'
Upstream-commit: 16f6daa5beadbef141ce6704c810d2f7f755ce75
Component: engine
2013-04-17 11:35:12 -07:00
e35cce33e7 Keep a cache of the unit-tests image. So I can code in conferences with crappy wifi.
Upstream-commit: ca6cd5b557279facb4831e8380be4eb40ac38362
Component: engine
2013-04-17 11:32:13 -07:00
a539079ce1 Merge branch 'remote-api' of https://github.com/dotcloud/docker into remote-api
Upstream-commit: 92cd75607b1a223c084939067dc60b2773821b23
Component: engine
2013-04-17 12:21:56 +02:00
2638d9a6cc added -t in docker stop and restart to choose grace period
Upstream-commit: 1615bb08c7c3fc6c4b22db0a633edda516f97cf0
Component: engine
2013-04-17 11:56:30 +02:00
fd84a2d5c0 improve the crashTest script
Upstream-commit: c4cd224d901ece4d9a2f15d10a80998f2b970c07
Component: engine
2013-04-16 15:20:04 -07:00
a7d3c2e8bf Manually pass the env to docker-init instead of relying on lxc to pass it
Upstream-commit: 7b0e96f1f4639f869703ed32f885cec9b666b127
Component: engine
2013-04-16 14:32:50 -07:00
5c53eceb79 Remove unneeded dependencies from README
Upstream-commit: fc72a809c1c60569fb1d70a95f5296feaa5220f8
Component: engine
2013-04-16 12:10:16 -07:00