Victor Vieux
|
3528990c73
|
Merge pull request #1665 from dotcloud/ksid-contrib-maintainer
Make Kawsar Saiyeed @KSid the maintainer for contributed tools
|
2013-08-30 17:07:03 -07:00 |
|
Andy Rothfusz
|
8ee4473d92
|
Merge pull request #1704 from dhrp/ubuntu-install-finger-fingerprint
added apt-key finger tip and fingerprint in ubuntu installation page
|
2013-08-30 16:15:19 -07:00 |
|
Daniel Mizyrycki
|
212b582362
|
Merge pull request #1673 from xdissent/1659-upstart-order
Start docker after lxc-net to prevent ip forwarding race
|
2013-08-30 16:05:40 -07:00 |
|
Guillaume J. Charmes
|
969e48dd5a
|
Merge pull request #1752 from dotcloud/1750-build_error-fix
fix error in docker build when param is not a directory
|
2013-08-30 16:05:23 -07:00 |
|
Guillaume J. Charmes
|
d9b7ec6458
|
Merge pull request #1754 from griff/1705_changelog_fails_before_run
- Runtime: Made calling change log before run return empty list.
|
2013-08-30 16:02:46 -07:00 |
|
Brian Olsen
|
46c9c5c843
|
Made calling changelog before run return empty. Fixes #1705.
|
2013-08-30 22:46:07 +02:00 |
|
Michael Crosby
|
84431ec03c
|
Merge pull request #1613 from thijsterlouw/proper_resolvconf_parsing
Proper resolv.conf parsing
|
2013-08-30 12:10:45 -07:00 |
|
Victor Vieux
|
d605e82bad
|
fix error in docker build when param is not a directory
|
2013-08-30 18:08:29 +00:00 |
|
Andy Rothfusz
|
2ea19238ff
|
Merge pull request #1744 from dsissitka/patch-7
Updated "Use -> The Basics" to use ubuntu:12.10.
|
2013-08-30 10:44:54 -07:00 |
|
Andy Rothfusz
|
df36f9db05
|
Merge pull request #1749 from msiebuhr/doc-from-tags
Document FROM <image>:<tag> Dockerfile instruction.
|
2013-08-30 10:44:36 -07:00 |
|
Michael Crosby
|
74982bda32
|
Merge pull request #1738 from jonasi/error-to-stderr
Unable to find image error should print to stderr
|
2013-08-30 10:43:45 -07:00 |
|
Michael Crosby
|
6d769f4b9b
|
Merge pull request #1743 from dotcloud/fix_version
Hide version when not available
|
2013-08-30 10:39:48 -07:00 |
|
Morten Siebuhr
|
1a8a540209
|
Document FROM <image>:<tag> Dockerfile instruction.
|
2013-08-30 15:23:32 +02:00 |
|
Shih-Yuan Lee (FourDollars)
|
6c206f7d78
|
Install Ubuntu raring backported kernel from official archives directly.
|
2013-08-30 14:12:13 +08:00 |
|
Andy Rothfusz
|
110d3b7794
|
Merge pull request #1736 from ramonvanalteren/patch-1
Update python_web_app.rst
|
2013-08-29 18:36:53 -07:00 |
|
dsissitka
|
c0e95fa68a
|
Updated "Use -> The Basics" to use ubuntu:12.10.
ubuntu:latest doesn't have nc. ubuntu:12.10 does.
|
2013-08-29 21:05:18 -04:00 |
|
Victor Vieux
|
e3b58d3027
|
hide version when not available
|
2013-08-30 00:46:43 +00:00 |
|
Andy Rothfusz
|
9b029a0854
|
Merge pull request #1739 from dotcloud/add-docs-dockerfile
Added a Dockerfile which installs all deps and builds the Docs
|
2013-08-29 17:42:17 -07:00 |
|
Victor Vieux
|
49d35cc0ae
|
Merge pull request #1690 from jbbarth/code-formatting
go fmt
|
2013-08-29 17:13:37 -07:00 |
|
Nick Stinemates
|
c6702bebe1
|
added a Dockerfile which installs all deps and builds the docs.
|
2013-08-30 00:13:32 +00:00 |
|
Michael Crosby
|
690c3839fd
|
Merge pull request #1710 from thomasf/master
Fix bash completion.
|
2013-08-29 17:08:14 -07:00 |
|
Victor Vieux
|
050cf70136
|
Merge pull request #1721 from andrewmunsell/patch-2
Add privileged flag in documentation for container creation
|
2013-08-29 17:05:40 -07:00 |
|
Guillaume J. Charmes
|
df8f95ac74
|
Merge pull request #1591 from dotcloud/1557_fix_docker_run_useage
add TEST env var during tests and silenced parserun during tests
|
2013-08-29 16:51:34 -07:00 |
|
Andy Rothfusz
|
0f91418b26
|
Merge pull request #1729 from dsissitka/patch-6
Fixed a minor syntax error.
|
2013-08-29 16:27:22 -07:00 |
|
Isao Jonas
|
4ff649ce85
|
Unable to find image error should print to stderr
|
2013-08-29 18:25:11 -05:00 |
|
Andy Rothfusz
|
c4394decf8
|
Merge pull request #1717 from metalivedev/1685-updateinstallation
Fix #1685: Notes on production use. General installation cleanup.
|
2013-08-29 16:06:00 -07:00 |
|
Victor Vieux
|
f159f4710b
|
remove message during tests
|
2013-08-29 22:59:34 +00:00 |
|
Victor Vieux
|
740a97f1a8
|
use init function
|
2013-08-29 22:55:29 +00:00 |
|
Victor Vieux
|
eee6d3dae9
|
add TEST env var during tests and silenced parserun during tests
|
2013-08-29 22:55:29 +00:00 |
|
Ramon van Alteren
|
559724ac35
|
Update python_web_app.rst
Fixed typo in the WEB_PORT command, missing sudo in front of docker command
|
2013-08-30 00:37:47 +02:00 |
|
Greg Thornton
|
3f141e1fd3
|
Update remaining upstart scripts to wait for lxc-net
|
2013-08-29 14:06:24 -05:00 |
|
Andy Rothfusz
|
230dc07d37
|
fix logo path
|
2013-08-29 11:24:59 -07:00 |
|
Andy Rothfusz
|
c46d9933ec
|
Merge pull request #1727 from dsissitka/patch-5
Fixed a minor syntax error.
|
2013-08-29 11:05:22 -07:00 |
|
Andy Rothfusz
|
bcb081a269
|
Merge pull request #1708 from nexxy/patch-1
Update docker_remote_api_v1.4.rst
|
2013-08-29 10:22:05 -07:00 |
|
dsissitka
|
57892365ef
|
Fixed a minor syntax error.
|
2013-08-29 12:35:37 -04:00 |
|
dsissitka
|
075253238d
|
Fixed a minor syntax error.
|
2013-08-29 12:27:35 -04:00 |
|
Emily Rose
|
18d572abb4
|
Added Emily Rose to AUTHORS.
|
2013-08-28 22:28:31 -07:00 |
|
Andrew Munsell
|
37a236947e
|
Add privileged flag in documentation for container creation
|
2013-08-28 22:18:47 -07:00 |
|
Emily Rose
|
c1f6914e43
|
Correct number of asterisks.
|
2013-08-28 20:01:18 -07:00 |
|
Andy Rothfusz
|
b1eae313ad
|
Fix #1685: Notes on production use. General installation cleanup.
|
2013-08-28 17:26:10 -07:00 |
|
Andy Rothfusz
|
bf98fff925
|
Merge pull request #1674 from jbbarth/docs
Add mercurial to the list of packages needed in a dev environment
|
2013-08-28 11:10:45 -07:00 |
|
Michael Crosby
|
e6c3da42e7
|
Merge pull request #1696 from daniel-garcia/1448-add_newline_every_logmessage
Write newline after every log message
|
2013-08-28 10:00:38 -07:00 |
|
Victor Vieux
|
d5220bc081
|
Merge pull request #1711 from dotcloud/1709-start_doc-fix
fix start documentation
|
2013-08-28 09:51:20 -07:00 |
|
Victor Vieux
|
66ef6c0f6e
|
fix start doc
|
2013-08-28 16:40:00 +00:00 |
|
Thomas Frössman
|
20772f90ff
|
Fix bash completion, remove have
Should solve #1639.
|
2013-08-28 18:38:06 +02:00 |
|
Emily Rose
|
69a93b36d5
|
Update docker_remote_api_v1.4.rst
Fixed a (very serious) typo.
|
2013-08-28 04:12:37 -07:00 |
|
Thatcher Peskens
|
466a88b9a8
|
added apt-key finger tip and fingerprint in ubuntu installation page
|
2013-08-27 19:59:36 -07:00 |
|
Andy Rothfusz
|
f0620da74a
|
Merge pull request #1703 from metalivedev/621-usebaseimages
Fix #621: add new use/base images section. Include examples.
|
2013-08-27 18:53:40 -07:00 |
|
Andy Rothfusz
|
dffb72ca89
|
Fix #621: add new use/base images section. Include examples.
|
2013-08-27 18:49:43 -07:00 |
|
Andy Rothfusz
|
128893062b
|
Merge pull request #1698 from metalivedev/1684-Cleanup
Fix #1684: Cleanup introduction, working with repos, "use" index.
|
2013-08-27 18:15:06 -07:00 |
|