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
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
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
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
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
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
61822e5ae3
use libffi-dev, don't build it from sources
...
Upstream-commit: 72cfa3de3584d8cade530360e0e5997a06981e7a
Component: engine
2013-08-23 19:13:30 +03:00
a7d762c81f
Update docker_remote_api.rst
...
Upstream-commit: 3396a183c61b66dd60458f67049a50b393e760f8
Component: engine
2013-08-23 01:28:58 -07:00
b2a84c3f0c
Fixed: ImagePull in runtime test
...
Upstream-commit: 1c6af604e824d8fa2896c4906f05a0a3729c8e52
Component: engine
2013-08-23 04:32:09 +02:00
81b8022046
Merge pull request #1630 from KSid/docker-build-dockerfile
...
Removed duplicate mercurial install command from Dockerfile
Upstream-commit: ccc2276469956fccfd65fd4d3b0d0d3d15af1d6d
Component: engine
2013-08-22 17:31:35 -07:00
1354f3a6b5
Merge pull request #1587 from dotcloud/1559_improve_version
...
Improve version
Upstream-commit: 78a71b1273dbefbe1ce1bb239b739870dbb0fc71
Component: engine
2013-08-22 17:28:18 -07:00
33dccc4da2
Removed duplicate mercurial install command
...
Upstream-commit: 2191419f4cb5c452b02102a37d154fee6ca536e3
Component: engine
2013-08-22 23:12:28 +01:00
71f6a06696
Bump to 0.6.0
...
Upstream-commit: f4a4f1ca875a1f68d5950e67b34b57542f504ecd
Component: engine
2013-08-22 21:09:50 +00:00
c7a4c41750
Merge pull request #1525 from griff/1503-fix
...
Don't read from stdout when only attached to stdin
Upstream-commit: f925edd12de4f56bf088175257b26e6234cd0c80
Component: engine
2013-08-22 13:43:05 -07:00
0d89f3a693
Merge pull request #1609 from jpetazzo/release-docker-with-docker
...
Release docker with docker
Upstream-commit: 12715c8ddc216fa7aeba6d900e43905299e8bf25
Component: engine
2013-08-22 13:13:06 -07:00
5443b4f352
Use additional decorator in RequestFactory to pass meta headers to registry
...
Upstream-commit: 093b85b72f7a0fcda292816716e795543b3a72eb
Component: engine
2013-08-22 21:15:31 +02:00
db924199de
Merge pull request #1565 from dotcloud/only_load_authconfig_when_needed
...
Load authConfig only when needed and fix useless WARNING
Upstream-commit: 326dadd22441f2bd99e584a9e442c386432525fa
Component: engine
2013-08-22 11:10:16 -07:00
65288ff0c5
Merge pull request #1560 from dotcloud/439-allow-lxc-args
...
Add lxc-conf flag to allow custom lxc options
Upstream-commit: a3510c99f1ada9cd35412e27684e4bfc8459b6f8
Component: engine
2013-08-22 09:34:27 -07:00
dfb6c3c80f
Add lxc-conf flag to allow custom lxc options
...
Upstream-commit: 551092f9c0da2244c60b75d893ef847f915ca604
Component: engine
2013-08-22 16:05:21 +00:00
7e4d72163b
Fix race conditions in parallel pull
...
During parallel pull of a repostiory it can happen that the same layer
is pulled more than once.
To fix this I have extended the locking code to
- avoid multiple pulls of the same image
- avoid multiple pulls of the same layer
If an error occurs the other layers are awaited before returning as leaving
the scope before the go routines leave causes crashes of the server sometimes
if the download status is updated while the http stream is already closed
Beside this I have extended status display.
Upstream-commit: 3f802f4a13cc9d35118420f7c769a8b3531476c8
Component: engine
2013-08-22 13:23:43 +02:00
6f9dbd0830
Merge pull request #1596 from metalivedev/1149-easyfixes
...
Fix #1330 and #1149 . Improve CMD, ENTRYPOINT, and attach docs.
Upstream-commit: 0b9c8e286050bd7bc21e15085b34ed9779080ce6
Component: engine
2013-08-21 14:06:41 -07:00
7c2919c17f
Merge pull request #1614 from denibertovic/docs
...
Small fix to docs regarding adding docker groups
Upstream-commit: 42fe550c9eb570adc2aedfcc8c5ceb62388f14e4
Component: engine
2013-08-21 12:26:56 -07:00
934a8f1946
Add mongodb example
...
Upstream-commit: f5bd13721666366879e3a9681df8442181448ffc
Component: engine
2013-08-21 12:09:40 -07:00
0398c9c138
Merge pull request #1607 from TylerBrock/mongodb
...
Add MongoDB image example
Upstream-commit: 348696f3fe88fbae1a1c15d34fe09398e73f6897
Component: engine
2013-08-21 12:07:50 -07:00
29acb4a3dc
Merge pull request #1513 from dotcloud/add_user_dockerfile
...
Add USER instruction do Dockerfile
Upstream-commit: 6da071985f5500d10122d5ce59a2764377652c2f
Component: engine
2013-08-21 09:19:31 -07:00
8a0c775435
Merge pull request #1588 from dotcloud/1561_fix_warning_in_tests
...
assume ip_forwarding = 1 by default
Upstream-commit: 56e02dd0c7f1eac50d05d272d8f597a79a370ab7
Component: engine
2013-08-21 09:15:23 -07:00
9e0921e842
Merge pull request #1576 from MatthewMueller/patch-1
...
updated default -H docs
Upstream-commit: e0a7013836e9302a5181f1e78ed6b9310b5eeac6
Component: engine
2013-08-21 09:09:43 -07:00
c79c5213b2
small fix to docs regarding adding docker groups
...
Upstream-commit: 467dbb75f10ae97e785a127a7547a5015cbb2a99
Component: engine
2013-08-21 17:28:13 +02:00
7440fa2394
update help
...
Upstream-commit: 215094903a9574953af915f5b93c89858d626473
Component: engine
2013-08-21 02:08:32 -07:00
e0db16a652
Remove -x flag — we do not want to be *that* verbose.
...
Upstream-commit: 8a7c0495e0251c9b74db2c74d09397fb158ed512
Component: engine
2013-08-20 20:50:42 -07:00
cae3da65a2
Bump up VERSION file to 0.5.3-dev
...
Upstream-commit: 885afebe07c79f54df9c1c4a8c71fcb323f3c944
Component: engine
2013-08-20 19:36:42 -07:00
