5e9efb8def
Don't export Graph.walkAll.
...
Upstream-commit: 113bb396cdef5e07a19306dea767870b2775214d
Component: engine
2013-08-31 20:44:49 -07:00
c7e2ec175d
Replace Graph.All with Graph.Map
...
Upstream-commit: 1fca99ad908c530fcd03158a56767b55500a8521
Component: engine
2013-08-31 20:44:42 -07:00
35ab6e6649
Merge pull request #1665 from dotcloud/ksid-contrib-maintainer
...
Make Kawsar Saiyeed @KSid the maintainer for contributed tools
Upstream-commit: 3528990c73e7457aad12093837c51a17fc99b82a
Component: engine
2013-08-30 17:07:03 -07:00
d95a8ab02c
Merge pull request #1704 from dhrp/ubuntu-install-finger-fingerprint
...
added apt-key finger tip and fingerprint in ubuntu installation page
Upstream-commit: 8ee4473d923eb5fc098e3ef27c8b83397c1ea492
Component: engine
2013-08-30 16:15:19 -07:00
40fb0d73cb
Merge pull request #1673 from xdissent/1659-upstart-order
...
Start docker after lxc-net to prevent ip forwarding race
Upstream-commit: 212b582362e66fc0d9403c0b8c46022f5d103224
Component: engine
2013-08-30 16:05:40 -07:00
69521a9731
Merge pull request #1752 from dotcloud/1750-build_error-fix
...
fix error in docker build when param is not a directory
Upstream-commit: 969e48dd5a7c6969c9169c654aef8557ea860bd5
Component: engine
2013-08-30 16:05:23 -07:00
77d05d40bc
Made calling changelog before run return empty. Fixes #1705 .
...
Upstream-commit: 46c9c5c84317907153f06284dc5110b53a0fbf3c
Component: engine
2013-08-30 22:46:07 +02:00
8468ddcf8f
Merge pull request #1613 from thijsterlouw/proper_resolvconf_parsing
...
Proper resolv.conf parsing
Upstream-commit: 84431ec03c08f0d8ce8f9385aa1b709a28fef1f3
Component: engine
2013-08-30 12:10:45 -07:00
01ba35b8f8
fix error in docker build when param is not a directory
...
Upstream-commit: d605e82badf64c3033f5f26199285aed414f63dd
Component: engine
2013-08-30 18:08:29 +00:00
70b7f9ce72
Merge pull request #1744 from dsissitka/patch-7
...
Updated "Use -> The Basics" to use ubuntu:12.10.
Upstream-commit: 2ea19238ff0565560a1a0aee62a26cd9e8d1fe72
Component: engine
2013-08-30 10:44:54 -07:00
3c526358a5
Merge pull request #1749 from msiebuhr/doc-from-tags
...
Document FROM <image>:<tag> Dockerfile instruction.
Upstream-commit: df36f9db058f684adef5f46c891661509cd770f3
Component: engine
2013-08-30 10:44:36 -07:00
f1d90b21c4
Merge pull request #1738 from jonasi/error-to-stderr
...
Unable to find image error should print to stderr
Upstream-commit: 74982bda32d99e02c0ce9a34371fe0cf6ef1d208
Component: engine
2013-08-30 10:43:45 -07:00
10eb2e6feb
Merge pull request #1743 from dotcloud/fix_version
...
Hide version when not available
Upstream-commit: 6d769f4b9b94804bd10a7774ae0dd61266096895
Component: engine
2013-08-30 10:39:48 -07:00
cc50e6bf4b
Document FROM <image>:<tag> Dockerfile instruction.
...
Upstream-commit: 1a8a540209c997f5e75a476b942365aad892ad35
Component: engine
2013-08-30 15:23:32 +02:00
0489287cce
Install Ubuntu raring backported kernel from official archives directly.
...
Upstream-commit: 6c206f7d7835310c39ef20d3375e949b1fbfd7b9
Component: engine
2013-08-30 14:12:13 +08:00
f5f5103119
Merge pull request #1736 from ramonvanalteren/patch-1
...
Update python_web_app.rst
Upstream-commit: 110d3b77949de024c5eb3263fd06f7d819a90682
Component: engine
2013-08-29 18:36:53 -07:00
02ce80c747
Updated "Use -> The Basics" to use ubuntu:12.10.
...
ubuntu:latest doesn't have nc. ubuntu:12.10 does.
Upstream-commit: c0e95fa68a37166ce551a33332bbede6b6531b68
Component: engine
2013-08-29 21:05:18 -04:00
b0c69b2fc0
hide version when not available
...
Upstream-commit: e3b58d302795fbbfa6c117774906a4c9efd536f4
Component: engine
2013-08-30 00:46:43 +00:00
952e5b8400
Merge pull request #1739 from dotcloud/add-docs-dockerfile
...
Added a Dockerfile which installs all deps and builds the Docs
Upstream-commit: 9b029a08549e2fef8f71115e5707c363368662e9
Component: engine
2013-08-29 17:42:17 -07:00
80e56036a6
Merge pull request #1690 from jbbarth/code-formatting
...
go fmt
Upstream-commit: 49d35cc0aed060288a1db8bbb6e23b3c6f7178fc
Component: engine
2013-08-29 17:13:37 -07:00
a659202877
added a Dockerfile which installs all deps and builds the docs.
...
Upstream-commit: c6702bebe116054a4c24487b5fb5d2c26e9fad4f
Component: engine
2013-08-30 00:13:32 +00:00
af73da6c24
Merge pull request #1710 from thomasf/master
...
Fix bash completion.
Upstream-commit: 690c3839fde3ea143dbaccacb1b618840e6a02f0
Component: engine
2013-08-29 17:08:14 -07:00
27d052d30a
Merge pull request #1721 from andrewmunsell/patch-2
...
Add privileged flag in documentation for container creation
Upstream-commit: 050cf701369feb8e90fda98b6f4b25a335c741d6
Component: engine
2013-08-29 17:05:40 -07:00
b0e3c64e68
Merge pull request #1591 from dotcloud/1557_fix_docker_run_useage
...
add TEST env var during tests and silenced parserun during tests
Upstream-commit: df8f95ac744d5c83031aabdc464447d9cf102e41
Component: engine
2013-08-29 16:51:34 -07:00
1257529085
Merge pull request #1729 from dsissitka/patch-6
...
Fixed a minor syntax error.
Upstream-commit: 0f91418b260375902430d7b057c6cfd8a07488db
Component: engine
2013-08-29 16:27:22 -07:00
cb31b917c6
Unable to find image error should print to stderr
...
Upstream-commit: 4ff649ce852175f209c27d03992f31b5f14cae65
Component: engine
2013-08-29 18:25:11 -05:00
6e525e067e
Merge pull request #1717 from metalivedev/1685-updateinstallation
...
Fix #1685 : Notes on production use. General installation cleanup.
Upstream-commit: c4394decf85ab1428edab61edeb73e6cf65b61ce
Component: engine
2013-08-29 16:06:00 -07:00
068b4e2c39
remove message during tests
...
Upstream-commit: f159f4710b0c5dac8b71246dddbaee667dd6a702
Component: engine
2013-08-29 22:59:34 +00:00
6b54138e54
use init function
...
Upstream-commit: 740a97f1a836be17ab39e8496b7372900782c20b
Component: engine
2013-08-29 22:55:29 +00:00
d89a877aeb
add TEST env var during tests and silenced parserun during tests
...
Upstream-commit: eee6d3dae96afbcb1456b4a84f05f1aac44e5598
Component: engine
2013-08-29 22:55:29 +00:00
a42573ca6a
Update python_web_app.rst
...
Fixed typo in the WEB_PORT command, missing sudo in front of docker command
Upstream-commit: 559724ac35134ac3cced1159cf776b7ab7bdacc6
Component: engine
2013-08-30 00:37:47 +02:00
6f14a61b9c
Update remaining upstart scripts to wait for lxc-net
...
Upstream-commit: 3f141e1fd3a11507b049359ea59253b49395d494
Component: engine
2013-08-29 14:06:24 -05:00
85c7a72a64
fix logo path
...
Upstream-commit: 230dc07d372cccb1aa1198ae300d06e418c73af6
Component: engine
2013-08-29 11:24:59 -07:00
6f1d2ff264
Merge pull request #1727 from dsissitka/patch-5
...
Fixed a minor syntax error.
Upstream-commit: c46d9933ecc90ee6560054a34afc9f8ee5920601
Component: engine
2013-08-29 11:05:22 -07:00
7e1465e3d2
Merge pull request #1708 from nexxy/patch-1
...
Update docker_remote_api_v1.4.rst
Upstream-commit: bcb081a269568b5cd047ce13b6a9c57fcdb63176
Component: engine
2013-08-29 10:22:05 -07:00
58ee8a4df1
Fixed a minor syntax error.
...
Upstream-commit: 57892365ef325d824ba6ce45a8e24e48cd117f0c
Component: engine
2013-08-29 12:35:37 -04:00
03c0f1a43e
Fixed a minor syntax error.
...
Upstream-commit: 075253238dff72bdf03179fcb1d2b90ca097e7f0
Component: engine
2013-08-29 12:27:35 -04:00
d067439363
Added Emily Rose to AUTHORS.
...
Upstream-commit: 18d572abb4b633d766c9a28119a118761103f5f8
Component: engine
2013-08-28 22:28:31 -07:00
02d16a65bf
Add privileged flag in documentation for container creation
...
Upstream-commit: 37a236947eaa611a441328a0dfc015091402292b
Component: engine
2013-08-28 22:18:47 -07:00
24a76563f6
Correct number of asterisks.
...
Upstream-commit: c1f6914e4374fcafa710c75eb23e8cffeeb45169
Component: engine
2013-08-28 20:01:18 -07:00
bc42da0604
Fix #1685 : Notes on production use. General installation cleanup.
...
Upstream-commit: b1eae313ad7d28142c7e0a8a60e3961bed0c84f0
Component: engine
2013-08-28 17:26:10 -07:00
4d8eebfc94
Merge pull request #1674 from jbbarth/docs
...
Add mercurial to the list of packages needed in a dev environment
Upstream-commit: bf98fff925952924635bc539b23919079d89e11f
Component: engine
2013-08-28 11:10:45 -07:00
e492b96b65
Merge pull request #1696 from daniel-garcia/1448-add_newline_every_logmessage
...
Write newline after every log message
Upstream-commit: e6c3da42e7d620cdd4e73f9392040c8a1a021c21
Component: engine
2013-08-28 10:00:38 -07:00
9b11388338
fix start doc
...
Upstream-commit: 66ef6c0f6ed887008ad73e317767e81551f76e72
Component: engine
2013-08-28 16:40:00 +00:00
409e2bc9cf
Fix bash completion, remove have
...
Should solve #1639 .
Upstream-commit: 20772f90fff54f95fc8cafe2b0c9be4c093cbf64
Component: engine
2013-08-28 18:38:06 +02:00
97250ab7c0
Update docker_remote_api_v1.4.rst
...
Fixed a (very serious) typo.
Upstream-commit: 69a93b36d5a43c22402af5beea01d60b1b3be91f
Component: engine
2013-08-28 04:12:37 -07:00
f47e456912
added apt-key finger tip and fingerprint in ubuntu installation page
...
Upstream-commit: 466a88b9a8331154730551c0009b67cded83ba58
Component: engine
2013-08-27 19:59:36 -07:00
e1dfe0469e
Fix #621 : add new use/base images section. Include examples.
...
Upstream-commit: dffb72ca898ce44e19f148112c3f9b43c96e01da
Component: engine
2013-08-27 18:49:43 -07:00
2d98a967b5
Merge pull request #1698 from metalivedev/1684-Cleanup
...
Fix #1684 : Cleanup introduction, working with repos, "use" index.
Upstream-commit: 128893062b5b479d64dbcc62e16b66584f24b16b
Component: engine
2013-08-27 18:15:06 -07:00
4e35bd72be
Merge pull request #1694 from dotcloud/troubleshoot_windows_installation
...
Troubleshooting windows installation section
Upstream-commit: 4a3b039c2ad101c884733d6313aa0a665a747e9a
Component: engine
2013-08-27 14:48:15 -07:00
