Commit Graph
1694 Commits
Author SHA1 Message Date
Guillaume J. Charmes 9e437c3fed Merge pull request #749 from dotcloud/unit_tests_use_available_port-fix
- Test: if `address already in use` in unit tests, try a different port
Upstream-commit: ca6409059d897e8f6a3436c3de5f9475197d6b22
Component: engine
2013-05-30 13:11:44 -07:00
Guillaume J. Charmes 92813fe809 Merge pull request #741 from dotcloud/split_stdout_stderr_run-feature
* API: Split stdout stderr in docker run if no -t
Upstream-commit: 459a2867ddfab52693b80d9e3426f5fbc531742d
Component: engine
2013-05-30 12:38:11 -07:00
Solomon Hykes d94ac95c85 Merge pull request #747 from riccieri/patch-1
+ * Documentation: add IP forwarding config to archlinux guide
Upstream-commit: 5324614410efc2e69d6f78a78763fde6bc3cba2d
Component: engine
2013-05-30 11:59:53 -07:00
Solomon Hykes 3224305e04 * Documentation: removed 'building blocks' for now.
Upstream-commit: 2ed1092dad9d2dec30945b06572befbba003ed1d
Component: engine
2013-05-30 11:26:47 -07:00
Guillaume J. Charmes 343961f0f4 Merge pull request #750 from dotcloud/ensure_order_help-fix
Always display help in the same order
Upstream-commit: 194fca8347f04bd9b2674d15bff1e3493ef32e3d
Component: engine
2013-05-30 07:40:59 -07:00
Victor Vieux 2ac9914ba8 always display help in the same order
Upstream-commit: 2c14d3949dcad3a98980929e0cb2d2326db7d8fe
Component: engine
2013-05-30 14:08:26 +00:00
Victor Vieux 654be8b3a8 if address already in use in unit tests, try a different port
Upstream-commit: 2a53717e8ff01df7c58485f89845bad31e50f497
Component: engine
2013-05-30 13:45:39 +00:00
Renato Riccieri Santos Zannon f05f5b2a20 Add IP forwarding config to archlinux guide
I had this small issue when following this guide on my Arch box, and I don't think it is specific to any configuration I have.
Upstream-commit: b2084a9c599d91fa1460116ef0c8d509d3353103
Component: engine
2013-05-30 01:56:08 -03:00
Solomon Hykes 207ed4b90a Merge branch 'master' of ssh://github.com/dotcloud/docker
Upstream-commit: 7ff2e6b797b5e12b5ae55f50731a174343b9f6a3
Component: engine
2013-05-29 12:31:11 -07:00
Guillaume J. Charmes f8799691fc Merge pull request #739 from dotcloud/push_issue-1
- Registry: Cereate a new registry object for each request (~session)
Upstream-commit: 08e5f1295487f2c06639bc8ac97be35f30359534
Component: engine
2013-05-29 09:22:12 -07:00
Victor Vieux 753326bb69 split stdout and stderr in run if not -t
Upstream-commit: e33ba9b36daa5e72e33d65b316059cddc756e0e9
Component: engine
2013-05-29 14:14:51 +00:00
Victor Vieux 18d8c1c783 Merge branch 'master' into split_stdout_stderr_run-feature
Upstream-commit: a5fe6f8af4ed2142ed546e402cbd003147966786
Component: engine
2013-05-29 13:56:27 +00:00
Victor Vieux 079652157f Merge pull request #740 from dotcloud/ps_output-fix
fix ps output
Upstream-commit: 8f829eb5e4e67779083da08e928aee1f0b2ad008
Component: engine
2013-05-29 06:43:03 -07:00
Victor Vieux beb8296edb fix ps output
Upstream-commit: 044bdc1b5fc748e98e7baaa7e95ce216cc667323
Component: engine
2013-05-29 13:42:20 +00:00
Victor Vieux 581102927d improve attach
Upstream-commit: c00d1a6ebe8dd607b1876e505e1761c2a548aa53
Component: engine
2013-05-29 11:40:54 +00:00
Solomon Hykes dd753f6580 Removed debug output in 'docker version'
Upstream-commit: 11550c60639af2af1e8cb2e76e27510722421863
Component: engine
2013-05-28 21:38:35 -07:00
Solomon Hykes 17eaf8b8af Improved wording of a maintainer's responsibilities
Upstream-commit: dc1fa0745f779d8c9a513dea71021d263b89ca5f
Component: engine
2013-05-28 22:33:48 -06:00
Solomon Hykes 4ba126a045 Fixed formatting of CONTRIBUTING.md
Upstream-commit: 3bac27f2405c746c068dbe31f8f205472d0f1b03
Component: engine
2013-05-28 22:26:42 -06:00
Solomon Hykes 370f799bb0 allmaintainers.sh: print a flat list of all maintainers of a directory (including sub-directories)
Upstream-commit: 286ce266b4415ae27d5d9cc177ad12db44845a84
Component: engine
2013-05-28 20:55:07 -07:00
Solomon Hykes 7f74079461 Added Victor and Daniel as maintainers for api.go and Vagrantfile, respectively
Upstream-commit: aa42c6f2a284c1095ba65866aa8c28f3e5c31fcd
Component: engine
2013-05-28 20:45:12 -07:00
Solomon Hykes 8f971843c3 getmaintainer.sh: parse MAINTAINERS file to determine who should review changes to a particular file or directory
Upstream-commit: 7181edf4b2fe17791cc4f843271d9c7fce0f14f3
Component: engine
2013-05-28 20:44:41 -07:00
Solomon Hykes a7da07b831 + Runtime: stable implementation of 'docker build'
Upstream-commit: c7985808aea860d220ad8827cd21b042adef7934
Component: engine
2013-05-28 19:40:38 -07:00
Solomon Hykes d4ee5e174d Merge branch 'master' of ssh://github.com/dotcloud/docker
Upstream-commit: 83db1f36e30ff2188ee3cf5908b65534e693654e
Component: engine
2013-05-28 19:39:20 -07:00
Solomon Hykes 52887551f6 Documented who decides what and how.
Upstream-commit: 24ddfe3f25f99db5a23f62d411c949b2236288a1
Component: engine
2013-05-28 19:39:09 -07:00
Guillaume J. Charmes f9738020b7 Update tests with new cookies for registry
Upstream-commit: b76d6120ac66a853d177f7e53318ab1ee75dca92
Component: engine
2013-05-28 17:35:10 -07:00
Guillaume J. Charmes cbc5080648 Cereate a new registry object for each request (~session)
Upstream-commit: cd0de83917e775fcdcd3ce4e592b627b7eeeac64
Component: engine
2013-05-28 17:12:24 -07:00
Guillaume J. Charmes 25882e4dd2 Merge pull request #730 from dotcloud/invert_status_created-fix
- Runtime: invert status created in docker ps
Upstream-commit: e84306ca6187da7ed3a15f585845eef19e9bd5eb
Component: engine
2013-05-28 15:45:52 -07:00
Guillaume J. Charmes 1e4dfca884 Merge pull request #731 from dotcloud/change_containersPs_containersJson_api-feature
* API: rename containers/ps to containers/json
Upstream-commit: f65327555e00dcfb2691e8a2df1c57cb011a0898
Component: engine
2013-05-28 15:44:20 -07:00
Guillaume J. Charmes 811f5115c3 Merge pull request #732 from dotcloud/718-return_no_such_container_as_404-fix
- API: return 404 on no such containers in /attach
Upstream-commit: 7aa0d11171db90603313c887d260d13224501a93
Component: engine
2013-05-28 15:43:07 -07:00
Guillaume J. Charmes 9b55c462fd Make sure the last line of docker build is the image id
Upstream-commit: 54af0536232ca71d37f7c6440f1bb17b3ed112db
Component: engine
2013-05-28 15:40:22 -07:00
Guillaume J. Charmes 2c506017f0 Readd build tests
Upstream-commit: 5b33b2463a27aa3356a4b6200cf4b81dd83c26a0
Component: engine
2013-05-28 15:31:06 -07:00
Guillaume J. Charmes 78cacea353 Fill the multipart writer directly instead of using reader
Upstream-commit: 2127f8d6ad091d699d3462715305a0f64340eca1
Component: engine
2013-05-28 15:22:34 -07:00
Guillaume J. Charmes 4fefd78435 Add directory contents instead of while directory for docker build
Upstream-commit: 2897cb04760d7e4e7e52ccc20e94c94e3743667e
Component: engine
2013-05-28 15:22:01 -07:00
Guillaume J. Charmes 57ef7f3ad5 Send error without headers when using chunks
Upstream-commit: fe0c0c208c0e816419b668a6fd6567520698c2d2
Component: engine
2013-05-28 15:21:06 -07:00
Solomon Hykes f9120d99fa Merge branch 'master' of ssh://github.com/dotcloud/docker
Upstream-commit: 522f399d689ebd7ae76ffce07507549ee5887238
Component: engine
2013-05-28 14:57:50 -07:00
Solomon Hykes f4d5babfe8 De-duplicated contribution instructions. The authoritative instructions are in CONTRIBUTING.md at the root of the repo.
Upstream-commit: 326faec6642896954ffbd407eeda7d19da193856
Component: engine
2013-05-28 14:57:36 -07:00
Thatcher 49e1d5125f Merge pull request #702 from kim0/patch-2
Properly install ppa, avoid GPG key warning. Also closes #715
Upstream-commit: 28a30eda880ceac876c6ce3791672bf1e6b2ebe5
Component: engine
2013-05-28 14:17:59 -07:00
Solomon Hykes 430cc6b531 Removed deprecated SPECS directory
Upstream-commit: 387eb5295a9ea75a099dd36adcae18229541f613
Component: engine
2013-05-28 14:13:20 -07:00
Thatcher da7e3d29eb Merge pull request #733 from meejah/master
Documentation: Use add-apt-repository instead of editing sources.list
Upstream-commit: f3cc1d985e91e19012c65c0c14c4ddc664438631
Component: engine
2013-05-28 13:55:11 -07:00
Guillaume J. Charmes a6fa39e648 Small fix
Upstream-commit: cfb8cbe5214c58690ca99cd44b25bd202c4dbcf7
Component: engine
2013-05-28 13:51:21 -07:00
Guillaume J. Charmes 288bdc86e5 Make docker build flush output each line
Upstream-commit: 582a9e0a67598672db35ef26a18027dd6fb222ca
Component: engine
2013-05-28 13:47:04 -07:00
Guillaume J. Charmes 20562fdb8c Fix merge issue
Upstream-commit: a48799016a43e6badae72e855f9a90592b6cdd98
Component: engine
2013-05-28 13:46:52 -07:00
Guillaume J. Charmes d21f15c6b9 Merge master
Upstream-commit: dce82bc85615ca09c999bc2186c2c9caf348dc33
Component: engine
2013-05-28 13:42:50 -07:00
Guillaume J. Charmes 584cc8079a Update the UI for docker build
Upstream-commit: 90ffcda05547332020ec6f2b98179380f7d0e56f
Component: engine
2013-05-28 13:38:40 -07:00
Guillaume J. Charmes dda3557a3e Implement the CmdAdd instruction
Upstream-commit: 6ae3800151025ff73a97c40af578ee714164003b
Component: engine
2013-05-28 13:38:26 -07:00
Guillaume J. Charmes ef0eab1820 Add Extension() method to Compresison type
Upstream-commit: 54db18625aa7154c9dd230907444676fa3079b99
Component: engine
2013-05-28 13:37:49 -07:00
Andy Rothfusz 85e46e1ff2 Merge pull request #709 from dhrp/links-to-kernel-doc
Added links to @jpetazzo 's kernel article, cleaned puppet doc layout
Upstream-commit: 235ae9cd43bbdaba9ea75ecbff8cf2f902e70cb9
Component: engine
2013-05-28 12:07:46 -07:00
meejah ca4176193b Add sudo to commands.
Upstream-commit: 444f7020cbc639fd781744be207c843aaf663077
Component: engine
2013-05-28 10:56:26 -06:00
meejah d4815bdeb7 Use Ubuntu's built-in method to add a PPA repository, which correctly handles keys for you.
Upstream-commit: 525080100d2e2a7899c9a51a1ca57e28e32e8488
Component: engine
2013-05-28 10:54:32 -06:00
Victor Vieux b292d69f2b return 404 on no such containers in /attach
Upstream-commit: e5fa4a4956393afc473539710e2a4b7297eb6ebf
Component: engine
2013-05-28 16:19:12 +00:00