Commit Graph
3202 Commits
Author SHA1 Message Date
Victor Vieux 918be128f6 Merge pull request #1982 from modcloth-labs/spelling-fix-for-the-word-protocol
Minor spelling correction of protocoll -> protocol
Upstream-commit: 7447867edd3d778fe8963e91cd42e82cf38a96b2
Component: engine
2013-09-24 07:40:21 -07:00
Alexander Larsson 58c06a4f26 Container: Always create a new session for the container
We never want the container to be in the same process group as the
daemon, as then the container will receive signals sent to the
process group of the container.
Upstream-commit: c1c74cb0b1e83c4836b51828888daff181f52742
Component: engine
2013-09-24 14:57:29 +02:00
blissdev 6fd51a9a7d use su instead of sudo
Upstream-commit: 17b7194d91ba91e044155edf7ae0a485c2dd9c0b
Component: engine
2013-09-24 02:25:16 -05:00
Jordan Arentsen 69887d2da0 various command fixes
Indicating the repository and tag should be separated by a space and not a '/'. Also fixed a quote typo.
Upstream-commit: 15ad2915b95bd13067691ed3c7dcab67f529d37f
Component: engine
2013-09-24 02:12:24 -05:00
Tianon Gravi 57f2e4e14d Add a few tweaks and fixes to contrib/mkimage-debian.sh
Add simple workaround for #1755 to contrib/mkimage-debian.sh

Add simple echo patch in contrib/mkimage-debian.sh to prevent init scripts from running during apt-get installs/updates

Add `apt-get clean` to mkimage-debian.sh for slightly smaller images

Add more small apt tweaks to mkimage-debian.sh thanks to @jpetazzo and @spahl
Upstream-commit: 10362870dbdd5063e62dde919f4bab764145d3e2
Component: engine
2013-09-23 22:39:57 -06:00
Dan Buch 0f5b1c7220 Minor spelling correction of protocoll -> protocol
Upstream-commit: a7db1254807307b0ac4d9bb0dc784d12caa54237
Component: engine
2013-09-23 23:14:42 -04:00
Solomon Hykes 45a3edf527 Hack: correct typo in release checklist
Upstream-commit: f6c64827c899b1fd737df0fcd018cc33dd9a91b9
Component: engine
2013-09-23 18:43:08 -07:00
Andy Rothfusz 7ae1ed533a Merge pull request #1973 from metalivedev/1969-formatfix
Fix #1969 formatting, add information about multiline json
Upstream-commit: 30b759ffa979b9424a9b3db81f683db6b9a253c7
Component: engine
2013-09-23 13:17:55 -07:00
Tianon Gravi 8e947a6f47 Add @tianon to hack/MAINTAINERS
Upstream-commit: a4067b1b441fac478d2c745981c464390f73a357
Component: engine
2013-09-23 12:39:14 -06:00
Michael Crosby 423f17f388 Bump to version v0.6.3
Upstream-commit: b0a49a30c78e8cafecac455aa0a306ac1792a644
Component: engine
2013-09-23 11:29:11 -07:00
Andy Rothfusz a34a99a3e4 Fix #1969 formatting, add information about multiline json
Upstream-commit: 6097644e4b79fec180173d7278da884ac0484b8a
Component: engine
2013-09-23 11:29:08 -07:00
Solomon Hykes 7057328389 Hack: update README
Upstream-commit: fa3837abf1fd796cf8142a62eaece8decfa2ec6b
Component: engine
2013-09-23 11:26:05 -07:00
Solomon Hykes ca189d7192 Update maintainer's manual: every change should be done in a pull request.
Upstream-commit: baff72bc82281b7fa545e0782722b9804240cf6e
Component: engine
2013-09-23 11:26:05 -07:00
Solomon Hykes 4a859df333 Hack: update release checklist and reference it in REAMDE
Upstream-commit: 99377de7d2c48e25cb13928605c90ea40eab5b35
Component: engine
2013-09-23 11:26:04 -07:00
Solomon Hykes d9a3a46bf0 hack/MAINTAINERS.md: a maintainer's manual.
Upstream-commit: 0ef5bcb17d77e575c808003856c7a6ed134b04f2
Component: engine
2013-09-23 11:26:04 -07:00
Solomon Hykes 02fca5dc5a Hack: remove deprecated files
Upstream-commit: fd1c43f0e05133249ef441444a740b81db3b90ce
Component: engine
2013-09-23 11:26:03 -07:00
Michael Crosby acea376687 Update tar dependency to newest version
Upstream-commit: cfbe76e5595b66e43447d6e1f3de40946af066f4
Component: engine
2013-09-23 09:59:04 -07:00
Victor Vieux 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
Daniel Mizyrycki 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
Michael Crosby 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
Guillaume J. Charmes 94c2057eff Improve detach unit tests
Upstream-commit: e97364ecd73fac7abfbd82cc7e3ebaa6cda3c935
Component: engine
2013-09-20 13:36:19 -07:00
Guillaume J. Charmes bcb4cc4982 Fix attach issue
Upstream-commit: 2bd089dadb9a66829aa1835ad674d652244c5c97
Component: engine
2013-09-20 11:31:00 -07:00
Michael Crosby 99d2e0befc Only copy files and change permissions with non bindmount
Upstream-commit: b45e280ee8161b38127b90e718945130bc1e935a
Component: engine
2013-09-19 20:35:05 -07:00
Michael Crosby b28da4e1a8 Modify repository name regex to match index
Upstream-commit: 5867f9e7614e5761fdee1f5b6a607ef4f8311d7f
Component: engine
2013-09-19 20:25:00 -07:00
Victor Vieux 590fe6f79d Merge pull request #1889 from dsissitka/fixhttpimport
Fixed HTTP imports.
Upstream-commit: a81393787f0c74426e48c358a8d295d7b87582c8
Component: engine
2013-09-20 03:06:04 -07:00
Andy Rothfusz 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
Jim Alateras f1871e0df3 Updated the section about extracting the binary
Upstream-commit: 3cf4b2c7c1729635170dd92f83461c9662d126e4
Component: engine
2013-09-20 10:00:30 +10:00
Jim Alateras eb6c475efd Updated the section about extracting the binary
Upstream-commit: d70cbbf1fc33f2291a686537ba5b57913809e586
Component: engine
2013-09-20 09:58:12 +10:00
Jim Alateras 35bc3934c6 Updated the section about extracting the binary
Upstream-commit: b7e7104e9293c0fd35bdb03d7f0cd00e7a90d615
Component: engine
2013-09-20 09:49:20 +10:00
Andy Rothfusz 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
Andy Rothfusz 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
Joost Cassee e372fe8afc Download Ubuntu 13.04 repository key over HTTPS
Upstream-commit: 5c9213258a7537e9baf4eb343bdd03fe29e085f4
Component: engine
2013-09-19 21:14:39 +02:00
Guillaume J. Charmes 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
Tianon Gravi 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
Tianon Gravi 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
Solomon Hykes 0118da35aa Docs: remove reference to deprecated 'base' image
Upstream-commit: a18c26392ff7f4a756f499bd5c3032f2256cd04e
Component: engine
2013-09-19 10:25:30 -06:00
Andy Rothfusz 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
Guillaume J. Charmes ed00bbf084 Update VERSION
Upstream-commit: fee61895f2a2abc307839d7764d042604bd1e2d8
Component: engine
2013-09-18 12:06:29 -07:00
Guillaume J. Charmes 4def626e15 Merge remote-tracking branch 'origin/release'
Upstream-commit: f6a78f89ba489f062ef9425cb75dba29d2ce59fc
Component: engine
2013-09-18 12:06:10 -07:00
Jim Alateras cf28050cad Updated the dev environment document
Upstream-commit: 4054f31471dbb97e3786120baaa863e3a05e7c1a
Component: engine
2013-09-18 14:18:05 +10:00
Jim Alateras 83b27f0110 Further updates to the dev environment document
Upstream-commit: 76a07371c5ceda160f1491a4f6e060dda2f45242
Component: engine
2013-09-18 14:18:05 +10:00
Jim Alateras 1482328d42 Further updates to the dev environment document
Upstream-commit: 5d364fda3cc4f947487d6782e585d1391782817b
Component: engine
2013-09-18 14:18:05 +10:00
Jim Alateras e537c86df2 Update the devenvironment document
Upstream-commit: 28311f61be35bf92557542ae6ffb4aab11539720
Component: engine
2013-09-18 14:18:05 +10:00
Jim Alateras db02ee1460 Updated the dev environment document
Upstream-commit: 70b731735c810d9e179837eb8761a44fbe98f391
Component: engine
2013-09-18 12:41:12 +10:00
Andy Rothfusz 9c3ea618a8 Fix #1654 Improve the introduction to repositories flow.
Upstream-commit: 67453d6b481200ad487b87d5620ce93602939341
Component: engine
2013-09-17 19:01:11 -07:00
Nick Stinemates 7549ba84c7 Fix minor typo
Changed  to
Upstream-commit: 593566438d16f3d666507218086d6c0aba78bb3e
Component: engine
2013-09-17 18:49:47 +00:00
Guillaume J. Charmes ebc85df1e6 Bump version to 0.6.2
Upstream-commit: ca5913ff3ec0648d6ad9887abc6cf986fddee1a2
Component: engine
2013-09-17 11:11:39 -07:00
Solomon Hykes 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
Michael Crosby 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
Michael Crosby 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