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
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
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
2fa6be8fa6
Merge pull request #1657 from KSid/bash-completion-0.6
...
Add latest docker options to docker.bash
Upstream-commit: 2891e828bd5fc671f7b003192eb7d7dfc4e78c2a
Component: engine
2013-08-24 10:27:25 -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
d0fbe858d3
Merge pull request #1648 from dotcloud/bump_0.6.1
...
Bump to 0.6.1
Upstream-commit: bd16107e97859b796a2426f0f0448ca906589104
Component: engine
2013-08-23 15:49:28 -07:00
16a0725560
Bump to v0.6.1
...
Upstream-commit: 5105263dacc9372771d9bf478dcac6fceedb9a30
Component: engine
2013-08-23 22:23:30 +00:00
a971d6c1e9
Use correct upstart script with new build tool
...
Upstream-commit: 7b5c579b7744877af02777a82aa8c7b28cfc1172
Component: engine
2013-08-23 22:20:36 +00:00
3cdbeb696a
Merge pull request #1642 from dotcloud/upstart-exec
...
Use correct upstart script with new build tool
Upstream-commit: dcfb993ac74caef60d30bc80cef80dbdd5478ebc
Component: engine
2013-08-23 15:18:58 -07:00
3bf995dd21
Merge pull request #1633 from abhirajbutala/patch-1
...
Update docker_remote_api.rst
Upstream-commit: dd9ee039a62484292b85a16159ecf729d21377ee
Component: engine
2013-08-23 15:17:21 -07:00
db0382f68b
Removed duplicate mercurial install command
...
Upstream-commit: 15d658d36bcc8bc9226be87a01a3ab7cc7e4ac6f
Component: engine
2013-08-23 22:16:49 +00:00
e55679fa4f
use libffi-dev, don't build it from sources
...
Upstream-commit: 59281d6f805a7f569af6bdb509fe3257fef05156
Component: engine
2013-08-23 22:16:23 +00:00
cb892ac7f3
Fixed: ImagePull in runtime test
...
Upstream-commit: 29be20f987a7a7bb8aeb89bd15ae31840b0b5df5
Component: engine
2013-08-23 22:16:11 +00:00
2a139cc504
Use additional decorator in RequestFactory to pass meta headers to registry
...
Upstream-commit: 5a8c32dc8e3f7a8980b2b7feeed0a2ba5ec027c2
Component: engine
2013-08-23 22:16:03 +00:00
439fa2cb13
Use correct upstart script with new build tool
...
Upstream-commit: 3d9b4379a5b84e52a04b31129f87fd0eef3cf54d
Component: engine
2013-08-23 22:10:18 +00:00
c0c4da0db6
Fixes #1643
...
Changed the split statement, from SplitN to Split. Doing so takes
care of cases, when a minor version is followed by a suffix, that
starts with '.'.
Upstream-commit: ab882da03b57037885c4222f474fa8bd37a01956
Component: engine
2013-08-23 14:37:37 -07:00
f10523fade
Merge pull request #1641 from dotcloud/docs-0.6-gpg-key
...
Docs 0.6 gpg key
Upstream-commit: e2594d162e8c2c60dc4741a0519ce09148a9e87c
Component: engine
2013-08-23 13:14:21 -07:00
60812a84c0
Added adding the gpg key
...
Upstream-commit: ebb9b5e85be296fd73f4d64e61dfc87fe0c3ae72
Component: engine
2013-08-23 12:56:03 -07:00
2e40678fa5
Merge pull request #1562 from AnSavvides/contributing-link
...
Adding direct reference to contribution guidelines
Upstream-commit: 98f9d3e81c9b9da6cfc68799775b892b216fa8a7
Component: engine
2013-08-23 12:18:24 -07:00
82a09e242f
Added line on top of ubuntulinux announcing change in 0.6
...
Added lines on top of vagrant installs
Upstream-commit: 091fb892948abee1ad5451ee6c9d7dd540d88780
Component: engine
2013-08-23 11:45:52 -07:00
413e5c5d7a
Merge pull request #1635 from unclejack/fix_main_dockerfile
...
Fix libffi build failure for the main Dockerfile
Upstream-commit: db91cac44f18b6fa773fd37cc5a996d10bd62110
Component: engine
2013-08-23 11:31:19 -07:00
4faecb5fe5
Merge pull request #1563 from dotcloud/1073_add_loading_message
...
* Runtime: Add loading containers message in no debug
Upstream-commit: 8dd3607bd1fd41b4844e3415b832780a6c878e33
Component: engine
2013-08-23 11:20:22 -07:00
d544e9592e
Merge pull request #1637 from dhrp/change-docs-ubuntu-sources
...
Updated the docs to reflect we no longer use Launchpad and host our own
Upstream-commit: 3ebda17f0f050c6aa1dbb7eec5774ad9e603b022
Component: engine
2013-08-23 11:05:59 -07:00
528d6537a9
Merge pull request #1627 from shin-/registry_metaheaders
...
Pass "meta" headers in API calls to the registry
Upstream-commit: 9149c45745845e267400a819c31dd94a613796fd
Component: engine
2013-08-23 11:05:41 -07:00
4195e14d62
Merged 0.6.0 release back to master
...
Upstream-commit: 969ab9c4508b020fd273ce5289097efaf74917ff
Component: engine
2013-08-23 17:50:24 +00:00
6664f627dc
Merge pull request #1628 from dotcloud/bump_0.6.0
...
Bump to 0.6.0
Upstream-commit: 588f8e1ceceb100f6b58ed6c676897ec2a72d3fe
Component: engine
2013-08-23 10:45:14 -07:00
8aac574cd3
Updated the docs to reflect we no longer use Launchpad and host our own repository.
...
Upstream-commit: f753dfe6b3d3a8e4d770ae73e947e2fe339df536
Component: engine
2013-08-23 10:41:53 -07:00
a66e92affc
return error if at least one container fails to start
...
This makes docker start exit with exit code 1 if at least one container
didn't start. This also prints an error at the end.
Upstream-commit: d1ad0e278d67baad46168f6d04a56550a287d4a7
Component: engine
2013-08-23 20:14:06 +03:00
61822e5ae3
use libffi-dev, don't build it from sources
...
Upstream-commit: 72cfa3de3584d8cade530360e0e5997a06981e7a
Component: engine
2013-08-23 19:13:30 +03:00
