Commit Graph

3132 Commits

Author SHA1 Message Date
acea376687 Update tar dependency to newest version
Upstream-commit: cfbe76e5595b66e43447d6e1f3de40946af066f4
Component: engine
2013-09-23 09:59:04 -07:00
775cc7de8b Merge pull request #1948 from dotcloud/fix_attach
Fix attach issue
Upstream-commit: 2fafe1efce32c7560151e036c43e0dddb7faaa14
Component: engine
2013-09-23 02:15:51 -07:00
2a3202f318 Merge pull request #1820 from dotcloud/1647-api-group
packaging, issue #1647: Add docker groupname on the package release
Upstream-commit: 8240e37b87b5af209053b5c95489378b9b78e4f6
Component: engine
2013-09-22 14:21:26 -07:00
f4fdcdb53f Merge pull request #1934 from dotcloud/host-permissions
Only copy files and change permissions with non bindmount
Upstream-commit: 23cf3c7a3318b893ea1dd50cc9f05d4705bcc6df
Component: engine
2013-09-22 09:40:52 -07:00
94c2057eff Improve detach unit tests
Upstream-commit: e97364ecd73fac7abfbd82cc7e3ebaa6cda3c935
Component: engine
2013-09-20 13:36:19 -07:00
bcb4cc4982 Fix attach issue
Upstream-commit: 2bd089dadb9a66829aa1835ad674d652244c5c97
Component: engine
2013-09-20 11:31:00 -07:00
99d2e0befc Only copy files and change permissions with non bindmount
Upstream-commit: b45e280ee8161b38127b90e718945130bc1e935a
Component: engine
2013-09-19 20:35:05 -07:00
b28da4e1a8 Modify repository name regex to match index
Upstream-commit: 5867f9e7614e5761fdee1f5b6a607ef4f8311d7f
Component: engine
2013-09-19 20:25:00 -07:00
590fe6f79d Merge pull request #1889 from dsissitka/fixhttpimport
Fixed HTTP imports.
Upstream-commit: a81393787f0c74426e48c358a8d295d7b87582c8
Component: engine
2013-09-20 03:06:04 -07:00
7c4db68542 Merge pull request #1901 from jalateras/update-contributring-docs
Fix #1664
Upstream-commit: 6132f378e007c0af1932b24ce3c63e35461d13a4
Component: engine
2013-09-19 18:00:23 -07:00
f1871e0df3 Updated the section about extracting the binary
Upstream-commit: 3cf4b2c7c1729635170dd92f83461c9662d126e4
Component: engine
2013-09-20 10:00:30 +10:00
eb6c475efd Updated the section about extracting the binary
Upstream-commit: d70cbbf1fc33f2291a686537ba5b57913809e586
Component: engine
2013-09-20 09:58:12 +10:00
35bc3934c6 Updated the section about extracting the binary
Upstream-commit: b7e7104e9293c0fd35bdb03d7f0cd00e7a90d615
Component: engine
2013-09-20 09:49:20 +10:00
fa2129e045 Merge pull request #1932 from jcassee/patch-1
Download Ubuntu 13.04 repository key over HTTPS
Upstream-commit: 7e60a6b1ea946e942b6c592d0c4930fd01ae5bf4
Component: engine
2013-09-19 13:41:51 -07:00
787663083d Merge pull request #1929 from tianon/gentoo-docs
Simplified Gentoo install instructions now that our overlay is in the official layman repositories.xml list
Upstream-commit: 45979a7ef7b83ea55f0591bb7f81191026773c40
Component: engine
2013-09-19 13:41:29 -07:00
e372fe8afc Download Ubuntu 13.04 repository key over HTTPS
Upstream-commit: 5c9213258a7537e9baf4eb343bdd03fe29e085f4
Component: engine
2013-09-19 21:14:39 +02:00
3eaff637a9 Merge pull request #1886 from dotcloud/multi-volumes-from
* Runtime: Allow multiple volumes-from
Upstream-commit: 68074fce68ebd3f0e6e7c648ddf72dcc96960096
Component: engine
2013-09-19 12:01:12 -07:00
66d947d16e Simplify install instructions now that our overlay is in the official repositories.xml list, and add note about hacky #1422 workaround
Upstream-commit: 341addeccd2100611af27797b38421c5a0ab066f
Component: engine
2013-09-19 11:49:43 -06:00
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
cf28050cad Updated the dev environment document
Upstream-commit: 4054f31471dbb97e3786120baaa863e3a05e7c1a
Component: engine
2013-09-18 14:18:05 +10:00
83b27f0110 Further updates to the dev environment document
Upstream-commit: 76a07371c5ceda160f1491a4f6e060dda2f45242
Component: engine
2013-09-18 14:18:05 +10:00
1482328d42 Further updates to the dev environment document
Upstream-commit: 5d364fda3cc4f947487d6782e585d1391782817b
Component: engine
2013-09-18 14:18:05 +10:00
e537c86df2 Update the devenvironment document
Upstream-commit: 28311f61be35bf92557542ae6ffb4aab11539720
Component: engine
2013-09-18 14:18:05 +10:00
db02ee1460 Updated the dev environment document
Upstream-commit: 70b731735c810d9e179837eb8761a44fbe98f391
Component: engine
2013-09-18 12:41:12 +10:00
9c3ea618a8 Fix #1654 Improve the introduction to repositories flow.
Upstream-commit: 67453d6b481200ad487b87d5620ce93602939341
Component: engine
2013-09-17 19:01:11 -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
42f39a5ca8 Further updates to the dev environment document
Upstream-commit: 5797e7e34e3366c9fe65e9d4743014a25910b197
Component: engine
2013-09-17 21:05:55 +10:00
df7599c3c7 Further updates to the dev environment document
Upstream-commit: 089a60c2cfcd17287dc79c5c632eb4775003c3e4
Component: engine
2013-09-17 21:02:57 +10:00
16f525621b Update the devenvironment document
Upstream-commit: a99a8386fdf71c5cc0f7757a5b4ef2747f0d1ea8
Component: engine
2013-09-17 19:29:13 +10:00
588e45b7bc packaging, issue #1647: Add docker groupname on the package release
Upstream-commit: dfd0deefbb5325901608c85319dd357146d5370a
Component: engine
2013-09-16 23:00:54 -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
cea03fdf23 Fixed HTTP imports.
Upstream-commit: c6b40761255c881b8851ac096d5cc59b0c6be729
Component: engine
2013-09-15 18:40:29 -07:00
2e27a64777 Allow multiple volumes-from
Upstream-commit: b79bd4e864d53e927a9480374646d5e94d12141c
Component: engine
2013-09-14 20:09:15 +00:00