Commit Graph
1010 Commits
Author SHA1 Message Date
Guillaume J. Charmes 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
Solomon Hykes 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
Solomon Hykes 5c80f89bee Merge branch 'master' of ssh://github.com/dotcloud/docker
Upstream-commit: a76c3a9c9580135d349e68a4b2494a0b26ebe01b
Component: engine
2013-04-19 12:55:32 -07:00
Solomon Hykes f7536bf802 Fixed 'hack' rule in Makefile
Upstream-commit: e81ddb2dc76ab2e502ad35363a436dd823289598
Component: engine
2013-04-19 12:55:17 -07:00
Solomon Hykes aa4998ba2b Merge remote-tracking branch 'origin/buildbot'
Upstream-commit: 4d728821e37a54629f47d7379a50ad27d5055af6
Component: engine
2013-04-19 12:47:22 -07:00
Guillaume J. Charmes 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
Solomon Hykes 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
Solomon Hykes 5e10bddbe2 Merge remote-tracking branch 'origin/30-packaging-ubuntu'
Upstream-commit: bfb84b564c452e2b5cdb950c8c1b0c53b17f50c1
Component: engine
2013-04-19 11:31:53 -07:00
Solomon Hykes 338f50deb7 Cleanup examples on README
Upstream-commit: e8a67f632ea2e83c24f32c243b72fd7653e94d4b
Component: engine
2013-04-18 22:37:45 -07:00
Solomon Hykes a5929adc35 Small wording fix in README
Upstream-commit: 3d2fd8a65024a503456fc8cd64d4d2565c73e304
Component: engine
2013-04-18 22:24:52 -07:00
Solomon Hykes a59816d9a8 Add examples to the README
Upstream-commit: 79a78d37e7102f0aadfa49d89b84b095e86824d1
Component: engine
2013-04-18 22:24:29 -07:00
Solomon Hykes 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
Solomon Hykes 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
Victor Vieux 847e9fb0f9 fixed test
Upstream-commit: 90602ab62a4dddadff6671d80815465556a267ee
Component: engine
2013-04-18 16:03:50 +02:00
Daniel Mizyrycki 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
Daniel Mizyrycki a4e3c63817 packaging-ubuntu, issue #30: streamline building and uploading to PPA
Upstream-commit: 523cd8e29cb871271a8e2a55ab009aa980ae5572
Component: engine
2013-04-17 20:56:34 -07:00
Daniel Mizyrycki 7548a05b97 packaging-ubuntu: move original files in place for update
Upstream-commit: fd39af7f859b5bd1c202b4c0ddee53de9c82437d
Component: engine
2013-04-17 20:56:34 -07:00
Solomon Hykes 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
Solomon Hykes ea3911cd8c Record the author of an image with 'docker commit -author'
Upstream-commit: 227a8142a3c2ea2fd3b085214ef39989ebd57fe1
Component: engine
2013-04-17 20:13:11 -07:00
Solomon Hykes 51cf529c26 Added 'author' field to the image format
Upstream-commit: 4ef2d5c1e6e65b1e214071388618fc9fa4345be9
Component: engine
2013-04-17 19:58:17 -07:00
Solomon Hykes 973c2340e9 Bumped version to 0.1.5
Upstream-commit: e34e44e8e6097e0a54bc0a96581f79909f7d9a42
Component: engine
2013-04-17 17:12:08 -07:00
Solomon Hykes 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
Solomon Hykes 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
Solomon Hykes 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
Solomon Hykes 04cbbf405f Merge remote-tracking branch 'origin/183-no_such_device-fix'
Upstream-commit: f02950965e8467758222e82e23aae932bc626489
Component: engine
2013-04-17 11:54:57 -07:00
Solomon Hykes 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
Solomon Hykes 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
Victor Vieux 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
Guillaume J. Charmes fd84a2d5c0 improve the crashTest script
Upstream-commit: c4cd224d901ece4d9a2f15d10a80998f2b970c07
Component: engine
2013-04-16 15:20:04 -07:00
Guillaume J. Charmes 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
Solomon Hykes 5c53eceb79 Remove unneeded dependencies from README
Upstream-commit: fc72a809c1c60569fb1d70a95f5296feaa5220f8
Component: engine
2013-04-16 12:10:16 -07:00
Solomon Hykes b71d622550 Disabled standalone mode (fixes #364)
Upstream-commit: 2a47df020246cc08a0b72cf355c9d803404245b3
Component: engine
2013-04-15 11:44:11 -07:00
Kevin J. Lynagh 34287914c5 install.sh script's dockerd.conf should set docker daemon environment's LANG to en_US.UTF-8. See #355.
Upstream-commit: 468fb901172f2534972cc44cd4459f14b3745a98
Component: engine
2013-04-15 08:49:48 -07:00
Victor Vieux fd2c37bc5e try to load aufs module, disply error on failure
Upstream-commit: ac49a797b469bda89384dc1cd31d349761340693
Component: engine
2013-04-15 12:05:46 +02:00
Guillaume J. Charmes a2aceab579 Add a script to help reproduce #407
Upstream-commit: 1ec6c223c9e3a22e9cf182d1d4d69f16a9d083f4
Component: engine
2013-04-14 15:13:32 -07:00
Solomon Hykes a3d0ea8e4e Merge remote-tracking branch 'origin/packaging'
Upstream-commit: db08705e3c61eb44afe34d28409573b7cb70ea98
Component: engine
2013-04-13 21:40:53 -07:00
Solomon Hykes 9a0f29aec1 Merge remote-tracking branch 'origin/396-disabling_memory_limit-feature'
Upstream-commit: fdf3308260ebe5f01920c92e7127860d067f95a1
Component: engine
2013-04-13 21:25:53 -07:00
Guillaume J. Charmes 1f46dfdd51 Add \r to error message in run raw mode
Upstream-commit: c2c72bcfd796a43b9be33705ec695455c9823489
Component: engine
2013-04-13 15:03:24 -07:00
Solomon Hykes 80ab61361c Merge remote-tracking branch 'origin/96-dns_issue-fix'
Upstream-commit: cdf90bb04b046058f6b1233846a1d5eb4fcf3810
Component: engine
2013-04-12 17:50:59 -07:00
Shawn Siefkas 0a3b5be4e0 Issue #405: Documentation for Arch Linux Install
Upstream-commit: 45809e9a055defd073bde794026aa611333b7023
Component: engine
2013-04-12 13:25:33 -05:00
Guillaume J. Charmes 3fcc60d0f7 Allow to disable memory limit at compilation time
Upstream-commit: 1967c8342aef1a81eb33a41d673bb8e702daa5df
Component: engine
2013-04-12 10:48:20 -07:00
Guillaume J. Charmes 1875a00c38 Allow use to set his own dns via -dns
Upstream-commit: 7673afc8438a9e46a1d11aff0f8c0f7eca169809
Component: engine
2013-04-12 10:43:13 -07:00
Solomon Hykes c74dd47b04 Fixed wording of ghost-related messages
Upstream-commit: b1fbebb4a3611d340176ad637a22d2250085a077
Component: engine
2013-04-12 10:39:08 -07:00
Solomon Hykes 9c360e79b0 Merge remote-tracking branch 'origin/ghost_handling-fix'
Upstream-commit: 3527291b477510b1b9f904988599b6499211c3f3
Component: engine
2013-04-12 10:33:36 -07:00
Solomon Hykes 5137cc3f51 Merge remote-tracking branch 'origin/kill_behaviour_fix'
Upstream-commit: 57d31c9777a5f79ffe56dd813e61ad1eace6d59d
Component: engine
2013-04-12 10:20:26 -07:00
Guillaume J. Charmes f071f50ea4 Merge pull request #403 from titanous/update-authors
Update AUTHORS
Upstream-commit: a2f5a5614395a761f8871eaa4f6a1c0506c9953d
Component: engine
2013-04-12 07:56:19 -07:00
Jonathan Rudenberg 9b95a8b869 Update AUTHORS
Upstream-commit: 343ed6b53f225e35bb5464efb556f555a31056a1
Component: engine
2013-04-12 10:44:50 -04:00
Guillaume J. Charmes ebb6835d20 Go fmt
Upstream-commit: 22893429ed29dbb7a01eed7a90a4d1fbecfd5d90
Component: engine
2013-04-12 07:37:24 -07:00
Guillaume J. Charmes b4724f4f76 Merge branch 'create_pidfile' of https://github.com/flavio/docker into flavio-create_pidfile
Upstream-commit: c1703c2b68da74680310ae58f5368d6c677a68ef
Component: engine
2013-04-12 07:28:36 -07:00
Guillaume J. Charmes 1568d28853 Merge pull request #381 from dotcloud/371-add-l-ps
Add options to docker ps
Upstream-commit: a8c15477d95c6a3b1bc81fdb1662c8196a1b6007
Component: engine
2013-04-12 07:16:00 -07:00