cdb2ec7f94
Remove many remaining docs references to the deprecated base repository and several other minor doc cleanups
...
Upstream-commit: 47904290a563801b15eb204516f32c9517c11a47
Component: engine
2013-09-19 10:27:08 -06:00
0118da35aa
Docs: remove reference to deprecated 'base' image
...
Upstream-commit: a18c26392ff7f4a756f499bd5c3032f2256cd04e
Component: engine
2013-09-19 10:25:30 -06:00
4165a8a92d
Merge pull request #1913 from metalivedev/1654-registryexamples
...
Fix #1654 Improve the introduction to repositories flow.
Upstream-commit: 77ad95d3724cf4b2ae2371d34b7197af08c9ba8c
Component: engine
2013-09-18 17:53:13 -07:00
ed00bbf084
Update VERSION
...
Upstream-commit: fee61895f2a2abc307839d7764d042604bd1e2d8
Component: engine
2013-09-18 12:06:29 -07:00
4def626e15
Merge remote-tracking branch 'origin/release'
...
Upstream-commit: f6a78f89ba489f062ef9425cb75dba29d2ce59fc
Component: engine
2013-09-18 12:06:10 -07:00
94980938ac
Merge pull request #1908 from dotcloud/bump_v0.6.2
...
Bump v0.6.2
Upstream-commit: 081543c49a2326015334ac7bda200345a8f48e3f
Component: engine
2013-09-18 11:21:51 -07:00
9c3ea618a8
Fix #1654 Improve the introduction to repositories flow.
...
Upstream-commit: 67453d6b481200ad487b87d5620ce93602939341
Component: engine
2013-09-17 19:01:11 -07:00
38112bcad2
Merge pull request #1909 from dotcloud/fix-typo-docs
...
Fix minor typo
Upstream-commit: c14450ae5ce936b9e6516001ffe90d03614692e6
Component: engine
2013-09-17 18:25:59 -07:00
7549ba84c7
Fix minor typo
...
Changed to
Upstream-commit: 593566438d16f3d666507218086d6c0aba78bb3e
Component: engine
2013-09-17 18:49:47 +00:00
ebc85df1e6
Bump version to 0.6.2
...
Upstream-commit: ca5913ff3ec0648d6ad9887abc6cf986fddee1a2
Component: engine
2013-09-17 11:11:39 -07:00
bac45adcda
Merge pull request #1893 from dotcloud/add-tianon-maintainer
...
Add Tianon to contrib/ maintainers
Upstream-commit: 85f3ec88a62e4fd4e486402abc23bfad4ccd3c17
Component: engine
2013-09-17 11:00:48 -07:00
c56f8710d6
Merge pull request #1898 from dotcloud/smallfix_registry
...
Prevent panic upon error pulling registry
Upstream-commit: b2707dccc1e9dfe8cd8c27d962f9fb280f4f4705
Component: engine
2013-09-17 10:27:19 -07:00
57d4184f69
Merge pull request #1897 from dotcloud/update_doc
...
Update the commit documentation with better example
Upstream-commit: b8263513372d279750f65bc3c48ef0f326cab9fd
Component: engine
2013-09-17 10:21:45 -07:00
c55e3c6610
Information about data persistence
...
Upstream-commit: 2183644578c886e054a81c32b40720eafc2ce2b9
Component: engine
2013-09-16 16:44:54 -07:00
e26a79ce37
Prevent panic upon error pulling registry
...
Upstream-commit: e836b0064bc18300ca9213c749f464e52ca9d001
Component: engine
2013-09-16 16:18:25 -07:00
8218ba9d63
Merge pull request #1892 from dotcloud/fix-maintainers-files
...
Add MAINTAINERS
Upstream-commit: 986906cd7ba9dc1a66fff14287dca305d0a865a8
Component: engine
2013-09-16 14:41:36 -07:00
ea104a3973
Merge pull request #1894 from dotcloud/1891-remove_useless_warnings
...
Don't show network related warnings when networking is disabled
Upstream-commit: 8d481193407e8aa4b91c68a525839bb3556b06d0
Component: engine
2013-09-16 13:48:17 -07:00
f0c74e9f0a
Merge pull request #1896 from dotcloud/1885-missing-hostfile
...
Only mount hostname files if config exists
Upstream-commit: cdce873ea0093152b1b854b38e17491b72b8e615
Component: engine
2013-09-16 11:29:52 -07:00
ef0295b560
Only mount hostname files if config exists
...
Upstream-commit: 5a01f7485c6df95f747e08d2cad3d4c934b811bc
Component: engine
2013-09-16 17:53:24 +00:00
6deb994c66
Merge pull request #1849 from dotcloud/better_handle_hostConfig
...
Improved hostConfig reload
Upstream-commit: 45b50730e39ed5badad0a320e2163924117bdd71
Component: engine
2013-09-16 10:48:53 -07:00
613224b496
Don't show network related warnings when networking is disabled
...
Upstream-commit: 40eaa82fc617a474b1325ac22bd1299d3c0e3d48
Component: engine
2013-09-16 15:58:44 +00:00
da2cdf809a
Add Tianon to contrib/ maintainers
...
He's awesome and always contributing to this area.
Upstream-commit: 9946981c61c5eeafc1a15930e064bce8b7032a71
Component: engine
2013-09-16 04:50:53 +00:00
c157c0dfdc
Add MAINTAINERS
...
Making sure we're consistent across our project.
Upstream-commit: d6cf41cbe62ffaf2ed5bedf107d8bc4f804d3658
Component: engine
2013-09-16 04:45:01 +00:00
c55f0d3dec
Merge pull request #1884 from dotcloud/update-vendored-deps
...
* Hack: Update vendored dependendies
Upstream-commit: 2f24b9e05c88941d4bcb41c67a7f4ca3ab02a839
Component: engine
2013-09-13 20:55:06 -07:00
000c3ebd00
Merge pull request #1847 from dotcloud/test-docker-in-docker
...
* Hack: make the build tool more dev-friendly and packager-friendly
Upstream-commit: a63cfe7153fb5084604f8b52a33cc09d93878d4f
Component: engine
2013-09-13 20:19:37 -07:00
80d0a74f8b
clarify "use"
...
Upstream-commit: cd289cc10ccefea72206a6f262e978c346c6679a
Component: engine
2013-09-13 17:22:53 -07:00
32f8da3a7e
Merge pull request #1880 from getvictor/patch-api
...
Fixed LxcConf example in Remote API v1.4 and v1.5
Upstream-commit: 894eff64b499b2df5d7eadca55f2ea2feee7c380
Component: engine
2013-09-13 13:28:26 -07:00
9fc7b61184
Merge pull request #1881 from dotcloud/ubuntu-install-instructions
...
Change apt source to http
Upstream-commit: 71e15d1c3cf2e0d80158709ece4601893db05fe6
Component: engine
2013-09-13 13:27:58 -07:00
4b16804ae0
Change apt source to http
...
Upstream-commit: 74daeccec580c27c33c982cd246afc537f2804be
Component: engine
2013-09-13 19:21:43 +00:00
262f4e57a2
Fixing LxcConf example in docker_remote_api_v1.4.rst
...
Upstream-commit: 102522bcd1e87730394665c5a78f8e8bbcc50b7e
Component: engine
2013-09-13 14:10:05 -05:00
40a7f3c469
Fixed LxcConf example for docker_remote_api_v1.5.rst
...
Based on how command line docker sends the request.
Upstream-commit: b3cbf424ec7dbce8a42f75b23f48083f3f62abaf
Component: engine
2013-09-13 14:09:05 -05:00
4de754b9f6
Merge pull request #1848 from dotcloud/build-clean
...
Add rm option to docker build to remove intermediate containers
Upstream-commit: 33972627b7feb7bddce87e92d3789de6eb4611ef
Component: engine
2013-09-13 10:58:59 -07:00
dea87b774e
Merge pull request #1716 from eliasp/fixme
...
Added FIXME for iproute → netlink as advised in issue #925 .
Upstream-commit: 4234fc699f9ab30677131fc9b43a4ffd78cb7aa3
Component: engine
2013-09-13 10:58:28 -07:00
ff91aa71a1
Add go.net to vendored dependencies
...
Upstream-commit: 4a707a8800f95c2d7c8ba269da7dcdfaba6acbc6
Component: engine
2013-09-13 10:24:38 -07:00
a0167b5a29
Merge pull request #1846 from dotcloud/fix_return_error
...
Fix wrong return error
Upstream-commit: b986fd00e074432c2f0d05655b4cf22c8d51b36f
Component: engine
2013-09-13 09:44:38 -07:00
c2de80738c
Merge pull request #1862 from dotcloud/dockerfile-multiline-space
...
Replace multiline with empty string not space
Upstream-commit: f368fd9f9f3fcd9904f766f2fd00b875847cc676
Component: engine
2013-09-13 08:52:57 -07:00
5b4ca38251
Updated vendored dependencies
...
Upstream-commit: 6c1c404501d72c5c0ba488689b331ee0e01d5753
Component: engine
2013-09-12 20:42:26 -07:00
b5842137f7
Update the commit documentation with better example
...
Upstream-commit: 796d7a49f04de73c349d2a09f57922bc30961283
Component: engine
2013-09-12 13:26:31 -07:00
b9d752c34e
Merge pull request #1741 from griff/1737_fix_volume_uid_gid
...
Transfer uid and gid from image to volume
Upstream-commit: ffc850244f4450990eb1c2e13dc1f35c2d4772b4
Component: engine
2013-09-12 10:38:37 -07:00
dec68f5c30
Merge pull request #1593 from kyleconroy/master
...
Enable mobile view for website.
Upstream-commit: 83623675ceba17a5dcc283010f8e7f53f0910a4a
Component: engine
2013-09-12 10:30:16 -07:00
909728c3a8
Merge pull request #1865 from lgp171188/patch-1
...
Fixed a minor typo
Upstream-commit: 46f644c074ac2f0b30cba608db32995ee2f02551
Component: engine
2013-09-12 10:11:18 -07:00
bd04c634f0
Merge pull request #1859 from Bachmann1234/patch-1
...
Fix typo in hello_world.rst
Upstream-commit: 1bc2ab05ec244935a5219fdc827f62e911dee37a
Component: engine
2013-09-12 10:10:49 -07:00
bb7df4f70e
Update docker.bash script for build -rm
...
Upstream-commit: 1d935c630745248d5851440eb0907cd363cd88d0
Component: engine
2013-09-12 16:57:10 +00:00
efc88e6663
Add rm option to docker build to remove intermediate containers
...
Upstream-commit: b7a3fc687ec55b68ee0cadf78d7f1eff3e531fbd
Component: engine
2013-09-12 16:55:36 +00:00
424f44ba41
Fixed a minor typo
...
Changed "You need to enable namespaces and cgroups, to the extend of what is needed to run LXC containers" to "You need to enable namespaces and cgroups, to the extent of what is needed to run LXC containers"
Upstream-commit: 718b1f9fe74f3a26881e462b3e9e91a93232568b
Component: engine
2013-09-12 13:25:05 +05:30
04ac9582d3
hack/vendor.sh: overwrite existing dependencies and remove .git so they can be checked in
...
Upstream-commit: 45cedefadb444e8d7305defd246c63537fca04df
Component: engine
2013-09-11 18:38:09 -07:00
ec20b18bca
Replace multiline with empty string not space
...
Upstream-commit: 1e723bc95a61fb6c46af82557c128d1e95a33a99
Component: engine
2013-09-11 23:43:55 +00:00
de832f166e
Merge branch 'master' of https://github.com/dotcloud/docker
...
Upstream-commit: 9dd98df1a3c4115da897b93809d0b004b8fccc1a
Component: engine
2013-09-11 15:38:52 -07:00
2f028893cb
Merge pull request #1851 from metalivedev/1601-ec2install
...
Fix #1601 and #1845
Upstream-commit: 557e3ec88e319e8547efda73ffe54773a7ed918d
Component: engine
2013-09-11 14:41:43 -07:00
f3b949b816
Update hello_world.rst
...
Small typo
Upstream-commit: dfe45e1ad5fe741c379c5549c9ea56ec440d2579
Component: engine
2013-09-11 15:35:05 -04:00
