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
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
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
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
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
e74c0d800f
Fix #1684 : Old Welcome is now Introduction. Working with Repos now follows Builder.
...
Clean up some doc build errors. Removed old Manifesto. Tweaked layout javascript
to allow direct link from first and last index elements.
Upstream-commit: c627ff6e209ac1f660a49371d4f6bd710470aacb
Component: engine
2013-08-27 14:29:49 -07:00
53272d3dc7
write newline after every log message.
...
Upstream-commit: d593f579528d2555296b535aeae8383f5d2ee9b3
Component: engine
2013-08-27 14:09:26 -05:00
773b1c3da4
Merge pull request #1611 from pysqz/master
...
Make sure 'Ghost' container is available with allocated IP
Upstream-commit: c2b273df5d69f3f0a95aacb4944a55856d40fb35
Component: engine
2013-08-27 11:30:00 -07:00
9d0dc0b6f6
Also reuse forwarding ports
...
Upstream-commit: cc18a9c650305a377150c67e5ed10f1e2f19b685
Component: engine
2013-08-28 03:14:21 +08:00
b70dc614ff
Troubleshooting windows installation section
...
Upstream-commit: f861c493bf4d391f1721f536e86da4fa007fb7f0
Component: engine
2013-08-27 11:19:32 -07:00
a51df5a054
Merge pull request #1622 from TylerBrock/patch-2
...
Some fixes for MongoDB example
Upstream-commit: 5b84252c73ed0e6d3bf351099d73a4a69bacc60d
Component: engine
2013-08-26 17:28:38 -07:00
1a3985cf66
ENTRYPOINT fixups
...
Upstream-commit: f352ec945fbc34eafdde04dff7ced995c9e3a409
Component: engine
2013-08-26 19:17:26 -04:00
866edbc90f
Merge pull request #1656 from KSid/vagrantfile-0.6
...
Update Vagrantfile to use docker apt repository
Upstream-commit: 714e424d74a1c633e4b2b2930d8af3da359df19a
Component: engine
2013-08-26 14:59:40 -07:00
d94e17669e
Merge pull request #1671 from kim0/patch-3
...
Don't force a non-existent npm version, use latest from epel
Upstream-commit: f7fa6c2b0bdaa8ed236ae8bf78206e97aa938613
Component: engine
2013-08-26 14:33:07 -07:00
d0235d90e7
Merge pull request #1636 from unclejack/1594-return_non_zero_when_encountering_error
...
1594 - return non-zero exit code if at least one container has failed to start
Upstream-commit: b866254a195e9b33515b8a606185c26652f38a2a
Component: engine
2013-08-26 13:20:31 -07:00
db9b32e85a
Merge pull request #1678 from dotcloud/remove-incorrect-build-instructions
...
Remove incorrect build instructions
Upstream-commit: 108b6c644be55f8a34cdd02950541721efff9a41
Component: engine
2013-08-26 12:56:08 -07:00
02b17883ee
Merge pull request #1663 from KSid/1661-cp-parsing-error
...
- Runtime: Display error if docker cp resource not specified
Upstream-commit: 9ce7b1c009658e4ec490f657e94e6c9629aad159
Component: engine
2013-08-26 12:51:43 -07:00
d95d0df5fb
Remove incorrect build instructions
...
Upstream-commit: 076434ef10ebf940bb822c423056fcc4417b4a28
Component: engine
2013-08-26 12:06:56 -07:00
230dc9f2c1
Merge pull request #1670 from tobstarr/patch-1
...
Change fetching of gpg key from http to https
Upstream-commit: f2807042c24c942f99b3839fa13b2ca708314f6f
Component: engine
2013-08-26 12:00:54 -07:00
865dc3c8fd
Merge pull request #1646 from mohitsoni/master
...
- Runtime: Fix uname -r kernel version parsing
Upstream-commit: d4c734013182125f18bb831518f30bd0f2a87c4b
Component: engine
2013-08-26 11:49:00 -07:00
4c1fe91ef8
Add mercurial to the list of packages needed in a dev environment
...
The dev environment setup procedure fails if mercurial is not installed
on the machine, it cannot download stuff from
http://code.google.com/p/go.net for instance.
Upstream-commit: 1adbadde80a9ce657d29e1b2163509007c8c3554
Component: engine
2013-08-26 16:39:38 +02:00
242a1e6f55
Don't force a non-existent npm version, use latest from epel
...
Not the smartest thing to do
Upstream-commit: 843ef645d2c76275e484e3fd5262b947d5611d59
Component: engine
2013-08-26 12:54:15 +03:00
f620f56abe
Change fetching of gpg key from http to https
...
Or was there any reason to fetch using http?
Upstream-commit: 4440bde0ebffcb31025fd9f3db8e4275b77332b1
Component: engine
2013-08-26 11:45:15 +02:00
825653cef4
Display error if resource not specified
...
Display an error message if a container resource is not supplied to
'docker cp'.
Fixes error in #1661
Upstream-commit: d8a18ea3ae96ab415885fc1554db168d94d64265
Component: engine
2013-08-25 00:28:36 +01:00
0760b26a38
Merge pull request #1658 from jamescarr/patch-1
...
Update for new mailing list
Upstream-commit: c864647721d5b36d7784415b6fa32e97269dad11
Component: engine
2013-08-24 10:28:26 -07:00
2cffc404b5
Update for new mailing list
...
Upstream-commit: 465d5313c50007460306a17be16f38dfd657b0a4
Component: engine
2013-08-24 10:26:54 -07:00
c6434a3bd5
Add latest docker options to docker.bash
...
Adds bash completion options for the latest docker release (0.6.1)
Upstream-commit: 02d1d238cdde7b865879de1fc3f47acacfea0e82
Component: engine
2013-08-24 18:04:40 +01:00
9da6e68e41
Update Vagrantfile to use docker apt repository
...
Upstream-commit: 1f85ed6825c07a9c2a86f995b2db484953ee1e6e
Component: engine
2013-08-24 16:49:55 +01:00
acf7555618
Merge remote-tracking branch 'upstream/master'
...
Upstream-commit: ef82690144c89a409c4be407ceda32e0bbb9cd43
Component: engine
2013-08-24 00:33:01 -07:00
b48c0523d0
Refactored code and added unit tests
...
- Extracted ParseRelease method from GetKernelVersion to make code
more testable
- Added tests for ParseRelease method
Upstream-commit: f4432d50c388c242bba6b697f31b32f1fe21ff65
Component: engine
2013-08-24 00:24:40 -07:00
6c86af54b3
Merge pull request #1634 from songgao/patch-1
...
Added utils/utils.go : CopyEscapable escale sequence to tutorial.
Upstream-commit: 820a3b962aa469fa3f655c7fb252548f11979c77
Component: engine
2013-08-23 18:52:17 -07:00
908b40b7d7
Merge release 0.6.1 back to master
...
Conflicts:
VERSION
Upstream-commit: 99a83068987d6d0e23d7353eac8893c2594b6c14
Component: engine
2013-08-23 22:59:29 +00:00
