|
|
b6370d00a5
|
Hack: use vendored dependencies in-place, for less moving parts when developing
Upstream-commit: e37dcd726fe415193eaed18729251d293a018909
Component: engine
|
2013-09-09 15:05:25 -07:00 |
|
|
|
774dff2935
|
Hack: we no longer need to generate test binaries.
Upstream-commit: 4cd59b96ed93d8a4c35099a0a1171e17170071ab
Component: engine
|
2013-09-08 18:45:23 -07:00 |
|
|
|
3184ad242c
|
vendor.sh can cleanly update vendored dependencies
Upstream-commit: 055bbb79c10a829e054d6741d1937f0304dbb7fd
Component: engine
|
2013-09-07 17:48:52 -07:00 |
|
|
|
911d6019d5
|
gitignore: ignore bundles directory
Upstream-commit: 19dc3b0792272c2f0fbcfb654349fe5e86bc8046
Component: engine
|
2013-09-07 17:35:49 -07:00 |
|
|
|
9327ca0955
|
move deps installation to vendor.sh script
Upstream-commit: 20d24a450cbf22b6d5268bc1fe76022fa554d6be
Component: engine
|
2013-09-07 17:35:48 -07:00 |
|
|
|
970480b8f8
|
Document using the Dockerfile for interactive dev/test cycles
Upstream-commit: d757bd0904b71346b6c83622ae5685bc0c0d4349
Component: engine
|
2013-09-06 20:16:13 -07:00 |
|
|
|
742fb66041
|
Hack: improve the Dockerfile for an easier development workflow. Build dev container once, run a shell with source mount-binded, run tests as you edit. LIKE A BOSS.
Upstream-commit: 47838051be695a4e74c80690ceef811dcd3ef62c
Component: engine
|
2013-09-06 20:14:03 -07:00 |
|
|
|
4d40f8afe3
|
Add usage instructions to the Dockerfile. Build, test and release docker using docker.
Upstream-commit: fa806f26aff927eb0d98b41e79786ae98987da5b
Component: engine
|
2013-09-06 19:58:05 -07:00 |
|
|
|
c090718b10
|
Adapt Dockerfile to run docker tests inside docker
Upstream-commit: 34eab428330ce4a56c22b03f3067dd8eeee7ed41
Component: engine
|
2013-09-06 19:27:49 -07:00 |
|
|
|
ae4d5c759f
|
Adapt the original dind script and add a description
Upstream-commit: 3c80bd76cf6aa8f6918439f8082b0a8c34fd2c0e
Component: engine
|
2013-09-06 19:27:48 -07:00 |
|
|
|
c7b1568901
|
Copy dind wrapper script from github.com/jpetazzo/dind
Upstream-commit: c983023661deac0713eaa218c6bdfd20ec5eee45
Component: engine
|
2013-09-06 19:27:48 -07:00 |
|
|
|
14c14520dc
|
README: remove original shipping containers 'manifesto'. It's a little long to stay here.
Upstream-commit: eed00a4afd1e8e8e35f8ca640c94d9c9e9babaf7
Component: engine
|
2013-09-06 15:09:40 -07:00 |
|
|
|
6a1261fd84
|
README: replace 'install instructions' and 'usage examples' with references to the website and docs
Upstream-commit: 6679f3b053344e6e99d5e490720c9ccb924a7d4c
Component: engine
|
2013-09-06 15:09:04 -07:00 |
|
|
|
8e77b3527e
|
README: harmonize intro with website
Upstream-commit: 70ab25a5dbc8f54dbe15e9375687b4669ed919df
Component: engine
|
2013-09-06 15:08:01 -07:00 |
|
|
|
c1a63c6958
|
README: refer to the docs for install instructions to remove duplication.
Upstream-commit: bcb8d3fd86ac620dc4f35c805b4e0f8e8fcb7663
Component: engine
|
2013-09-06 14:52:14 -07:00 |
|
|
|
490341864a
|
Update roadmap
Upstream-commit: b9ca311008a14910877c6283b1dc7fb4a14bef4c
Component: engine
|
2013-09-06 14:48:06 -07:00 |
|
|
|
153463d6e1
|
Merge pull request #1818 from metalivedev/655-searchswiftype
Add Swiftype search to docs
Upstream-commit: 37186d9ef40b31730940409a7acb21e02688b707
Component: engine
|
2013-09-06 13:46:50 -07:00 |
|
|
|
796b8f393b
|
Add Swiftype search to docs
Upstream-commit: 03a28da5f78bd0f20eca3390a2dddca4ccb6ca81
Component: engine
|
2013-09-06 13:34:24 -07:00 |
|
|
|
df765d9499
|
Merge pull request #1777 from dotcloud/1620-index-test
testing, issue #1620: Add index functional test on docker-ci
Upstream-commit: f2bc7ebf1ed7d907a2354a760a1eeccd5b65a668
Component: engine
|
2013-09-06 09:21:05 -07:00 |
|
|
|
c9f3b3971f
|
Merge pull request #1780 from shin-/1218-push-dependencies
Respect dependency graph when pushing a repository
Upstream-commit: 8a2fd914b2680de0ce246950c3fc46b5359da907
Component: engine
|
2013-09-05 17:32:45 -07:00 |
|
|
|
7453a21af1
|
Merge pull request #1810 from dotcloud/1798-inspect-fix
Detect images/containers conflicts in docker inspect
Upstream-commit: f3d51bb3d574b73c3bea7538310f3c8052ea13cb
Component: engine
|
2013-09-05 17:17:09 -07:00 |
|
|
|
9d62bab207
|
Merge pull request #1811 from dotcloud/672-remove_getcache
Remove unused getCache endpoint
Upstream-commit: d06a0ba1a7ef3a018be1aef951733b85798c42b9
Component: engine
|
2013-09-05 17:07:49 -07:00 |
|
|
|
33af815c03
|
remove unused getCache endpoint
Upstream-commit: 0d7044955a4b63c4df2a611095b87ae417a3cf9b
Component: engine
|
2013-09-05 23:00:52 +00:00 |
|
|
|
e7babc83eb
|
fix indent in doc
Upstream-commit: 20a763e51934f3b52e48b5a6ba37d63852fd9a0b
Component: engine
|
2013-09-05 22:33:04 +00:00 |
|
|
|
e904047138
|
Detect images/containers conflicts in docker inspect
Upstream-commit: 5ec2fea6dd3360de326717ed01909b8fe9c39d0f
Component: engine
|
2013-09-05 22:31:17 +00:00 |
|
|
|
236805a6b0
|
Merge pull request #1803 from dotcloud/1802-skip-TestGetContainersTop
testing, issue #1802: Temporarily skip TestGetContainersTop
Upstream-commit: 908bb65dcf7f8a2d5e04de862e3908b46529d6a1
Component: engine
|
2013-09-05 14:44:47 -07:00 |
|
|
|
3306a42bfc
|
Merge pull request #1804 from Bouke/patch-1
Fix memory recommendations (Byte, not bit)
Upstream-commit: b57d7dca9de306d9372dfde6cd736aef1c4416e1
Component: engine
|
2013-09-05 11:52:00 -07:00 |
|
|
|
85199fa5e3
|
Merge pull request #1772 from dotcloud/update-tar-revision
Update tar pkg revision number
Upstream-commit: 8e411815915d706f69ea344ba142cb96c89650ff
Component: engine
|
2013-09-05 10:32:53 -07:00 |
|
|
|
caf639fe57
|
Fix memory recommendations (Byte, not bit)
Upstream-commit: fdf1fccd3eec7b534b8423fe3ea5b6e116b233fa
Component: engine
|
2013-09-05 10:40:11 +02:00 |
|
|
|
a096f499a1
|
testing, issue #1802: Temporarily skip TestGetContainersTop
Upstream-commit: bf6e241d977f36db57c66a5b8dd056b36c0d8695
Component: engine
|
2013-09-04 18:20:49 -07:00 |
|
|
|
b0525903e4
|
Merge pull request #1801 from vcoisne/master
Add step to docker installation using vagrant (Mac, Linux)
Upstream-commit: f0cdbaa6c8810954c1e41a07ba78e03305c1cfa2
Component: engine
|
2013-09-04 18:15:22 -07:00 |
|
|
|
c744f81e56
|
Merge pull request #1789 from tommyblue/patch-1
Adds instruction about UDP port redirection
Upstream-commit: e0d6bae1eb2cc2991fda1a11b939dbe4a6466680
Component: engine
|
2013-09-04 18:14:34 -07:00 |
|
|
|
5c10539e0f
|
Merge pull request #1797 from denibertovic/docs
fixed docs for installing binary
Upstream-commit: d6ff912917f350ee728a2df419167d3b64904979
Component: engine
|
2013-09-04 18:13:25 -07:00 |
|
|
|
9ce0173846
|
Add step to docker installation using vagrant (Mac, Linux)
Upstream-commit: ad04cacd28da1557324b8ad6fb53b7284e8bf866
Component: engine
|
2013-09-04 17:47:18 -07:00 |
|
|
|
99fc9c9d22
|
fixed docs for installing binary
Upstream-commit: 62823cfb97ec35e59833fd4723c392685d55827c
Component: engine
|
2013-09-05 00:06:41 +02:00 |
|
|
|
f646963f0f
|
deployment, issue #1578: Avoid pinning kernel headers. Add Vagrantfile assumptions
Upstream-commit: 8878943ac9ab3b3344d398b45e68ebb7cea879f0
Component: engine
|
2013-09-04 14:41:09 -07:00 |
|
|
|
8b061345d8
|
Merge pull request #1578 from jimmycuadra/vagrant-provider-detection
Better VirtualBox detection in Vagrantfile
Upstream-commit: 8e3844cd343c5939d85603505ff94ca7e48eed8f
Component: engine
|
2013-09-04 14:40:32 -07:00 |
|
|
|
230044d44e
|
Merge pull request #1795 from eliasp/patch-1
Typo
Upstream-commit: 1a32c4a1df0c16be16d40660bdad0fee67cfa7c6
Component: engine
|
2013-09-04 14:13:52 -07:00 |
|
|
|
7b3fcf5ca5
|
Typo
Upstream-commit: 396274fa6db88466fef0b1a5e314ba5b077cd3f2
Component: engine
|
2013-09-04 21:56:51 +02:00 |
|
|
|
1cee01680e
|
Don't install VirtualBox Guest Additions if VAGRANT_DEFAULT_PROVIDER is set.
Upstream-commit: 28e75b23b39aa0aee951378bf1039886c00f7783
Component: engine
|
2013-09-04 11:21:24 -07:00 |
|
|
|
a8f84352af
|
Adds instruction about UDP port redirection
Upstream-commit: ad5796de9febb5724bd2bf0639ae617c2ff34ba5
Component: engine
|
2013-09-04 19:17:10 +02:00 |
|
|
|
4dcb5ed317
|
Merge pull request #1788 from dotcloud/1787-deprecate-port-forwarding
deployment, issue #1787: Remove deprecated port forwarding from /Vagrantfile
Upstream-commit: 3a6868bc2fa1e1cd76ae8691c68cb96c857ff265
Component: engine
|
2013-09-04 10:11:12 -07:00 |
|
|
|
61c8f585f5
|
deployment, issue #1787: Remove deprecated port forwarding from /Vagrantfile
Upstream-commit: 34145f9840b62de85d385a65702f054962878cae
Component: engine
|
2013-09-04 10:05:54 -07:00 |
|
|
|
f7eb498730
|
Merge pull request #1784 from proger/patch-1
add new docker api client for erlang, erldocker
Upstream-commit: 58ea690b41b5a5fecd2cc5a44832c73ce83dd3a7
Component: engine
|
2013-09-04 10:01:29 -07:00 |
|
|
|
26753d6604
|
Merge pull request #1783 from briehanlombaard/typos
Fixed typos
Upstream-commit: 3b92ab34653513db3a682f96388823c8712f4ed3
Component: engine
|
2013-09-04 10:00:10 -07:00 |
|
|
|
8b97f99fc4
|
Merge pull request #1785 from thijsterlouw/update_commandline_cli
Fix documentation index for cli
Upstream-commit: 76f97a64faa8cbeab11334dc31d0b29a3b2d60c5
Component: engine
|
2013-09-04 09:59:30 -07:00 |
|
|
|
5e3e233f53
|
Merge pull request #1782 from tianon/gentoo-docs
Added Gentoo Documentation
Upstream-commit: 597479494215180cadbc62b2ffa04a6759292557
Component: engine
|
2013-09-04 09:58:36 -07:00 |
|
|
|
f4bdcf9337
|
Fix documentation index for cli
Upstream-commit: 368d0385e1d426a32da66135e7ff8d4f5a3c7a26
Component: engine
|
2013-09-04 13:21:44 +02:00 |
|
|
|
2844cc3031
|
add new docker api client for erlang, erldocker
Upstream-commit: 58ffd03bf16f41b9c954e61ef948768f44871c28
Component: engine
|
2013-09-04 12:53:38 +03:00 |
|
|
|
a2ac8a8fdc
|
Add Gentoo documentation
Upstream-commit: 9ce1d02ef6b0593861809248307d058656f56304
Component: engine
|
2013-09-04 02:59:18 -06:00 |
|
