Commit Graph
3869 Commits
Author SHA1 Message Date
Guillaume J. Charmes f9de2ea5c3 Merge pull request #1842 from dotcloud/split_stdout_stderr
* Runtime: Split stdout stderr
Upstream-commit: f435970695e896ae8532cd0850700ae56d0b0516
Component: engine
2013-09-26 18:05:24 -07:00
Guillaume J. Charmes c6a1c7cdae Update docs + fix endian issue
Upstream-commit: cb18a6e1b934b7f5c63f8931ee8fe51e2789c597
Component: engine
2013-09-26 17:36:21 -07:00
Kyle Conroy 6cfd549810 Fix copypasta errors
Upstream-commit: ce05083d4bd78a8c8272742095cf662fa86739ef
Component: engine
2013-09-26 14:57:02 -07:00
Michael Crosby 5ead415a2c Move run -rm to the cli only
Upstream-commit: 723de8768145cb47fdb6af399043f9313ad29cdb
Component: engine
2013-09-26 14:52:37 -07:00
David Sissitka 6693d06bc7 Used tabs for alignment when I should've used spaces. Fixed.
Upstream-commit: c22e377a6d36816210803e34e4d73cf45a4aa828
Component: engine
2013-09-26 13:56:59 -07:00
Colin Dunklau 82ab106f91 Hint for Remote API doc details in header links
Upstream-commit: 3f0d0075f8db4ca909db266611ce99023285c061
Component: engine
2013-09-26 15:30:26 -05:00
David Sissitka f400840b85 Configured FPM to make /etc/init/docker.conf a config file.
Upstream-commit: f8c9f11f067ef94a35cbc35b8d15f67d57ce1aec
Component: engine
2013-09-26 12:52:43 -07:00
Alexander Larsson 49b5b0c54d lxc: Allow set_file_cap capability in container
This means you're able to set the bits for capabilities on files
inside the container. This is needed for e.g. many fedora packages
as they use finegrained capabilities rather than setuid binaries.

This is safe as we're not adding capabilities really, since the
container is already allowed to create setuid binaries. Setuid
binaries are strictly more powerful that any capabilities (as root implies
all capabilities).

This doesn't mean the container can *gain* capabilities that it
doesn't already have though. The actual set of caps are strictly
decreasing.
Upstream-commit: 80319add5542153146fdaecd46be5549b4397beb
Component: engine
2013-09-26 21:41:45 +02:00
Kyle Conroy 949b66aca3 Fix Authorization headers
Upstream-commit: 818ec10da3813dfd582450093739cc4619e99b6d
Component: engine
2013-09-26 01:19:49 -07:00
Kyle Conroy 1b6f3bc2c9 Remove smart quotes. Add the X-Docker-Token header
Also fix the /layer endpoint, which had incorrect information
Upstream-commit: 34e28ccc880d8b7919d029c0028d51cfd2f5f01a
Component: engine
2013-09-26 01:15:36 -07:00
Kyle Conroy c88a78e485 Add the X-Docker-Registry header and /v1/_ping endpoint
Upstream-commit: 792403f2dc38cf880ae79d44093914f9b54eb031
Component: engine
2013-09-26 00:16:15 -07:00
Jonathan Mueller f59e96fe69 Enable SSH Agent forwarding in Vagrant VM, so one is able to clone repos from private git repos etc.
Upstream-commit: 8f5c33dc1f923bb8478524be4f10581685e5d359
Component: engine
2013-09-25 22:57:04 +02:00
Andy Rothfusz 07130a5623 Merge pull request #2000 from tianon/deprecated-docker-latest-tgz
Replace deprecated upgrading reference to docker-latest.tgz, which hasn't been updated since 0.5.3
Upstream-commit: 06c1f000e8791b9cc62eeb2e5edbeeb326a03de6
Component: engine
2013-09-25 13:47:48 -07:00
Andy Rothfusz 0599141435 Merge pull request #2001 from tianon/gentoo-tree
Update Gentoo installation documentation now that we're in the portage tree proper
Upstream-commit: 00b3acb8ab5ad97aded2e3e7c6d554e47a28467d
Component: engine
2013-09-25 13:45:51 -07:00
Victor Vieux 23aacffbbb Merge pull request #2004 from kencochrane/master
fix the error message so it is the same as the regex issue #1999
Upstream-commit: 420ba9c85a2cc53449f1050d638392e4420bf3e9
Component: engine
2013-09-25 09:46:15 -07:00
Ken Cochrane d2ca23a4cb fix the error message so it is the same as the regex issue #1999
Upstream-commit: 0f829bf5cf6fd05c89a8f2aac47e5eec9143b150
Component: engine
2013-09-25 11:33:09 -04:00
Victor Vieux 544a69ed4d Merge pull request #1989 from alexlarsson/setsid
Container: Always create a new session for the container
Upstream-commit: 1363de0934ce65bda21f831a6b55f28b3e0d13e7
Component: engine
2013-09-25 07:40:51 -07:00
Tianon Gravi ba85aaa194 Update Gentoo installation documentation now that we're in the portage tree proper
We're officially a first-class Gentoo citizen now, which is very exciting.  Many thanks to @gregkh for helping us get here.

I started just adapting sections of language in this document, and realized several bits needed to just be rewritten entirely to be more clear.
Upstream-commit: d06116d2e8a70477b3d8b02cd9e57f7465edc0ce
Component: engine
2013-09-24 23:26:36 -06:00
Tianon Gravi c149784acb Replace deprecated upgrading reference to docker-latest.tgz, which hasn't been updated since 0.5.3
Upstream-commit: 595210a3706ecad29c03b3c6753794440b18f992
Component: engine
2013-09-24 21:25:45 -06:00
Michael Crosby fe99936b97 Update VERSION to 0.6.3-dev
Upstream-commit: c9b916b2938654d4663b0b2bed1ac439129981bd
Component: engine
2013-09-24 19:54:13 -07:00
Michael Crosby b5810facb7 Merge branch 'release'
Upstream-commit: 1e6370fd4b4547e278a352bfd37e8758f3375a1e
Component: engine
2013-09-24 19:54:06 -07:00
Solomon Hykes 14d5f1616b Merge pull request #1968 from tianon/hack-build-instructions
* Hack: Add several of the small make.sh fixes from #1920, and make the output more consistent and contributor-friendly
Upstream-commit: a59a66528baef4eb7593827515016814fdf1ef3e
Component: engine
2013-09-24 17:38:39 -07:00
Andy Rothfusz e431d024f4 Merge pull request #1983 from blissdev/patch-1
various command fixes in postgres example
Upstream-commit: b048e9dffcbab35ed684f031f7ca874ea5a9325e
Component: engine
2013-09-24 14:03:48 -07:00
blissdev fb1ac0f2c2 revert removal of slash betwixt user/repo
Upstream-commit: c000e6a7fce11aaddae916853cc551d4801c1f8e
Component: engine
2013-09-24 15:51:21 -05:00
Tianon Gravi 23abc9f334 Add several of the small make.sh fixes from #1920, and make the output more consistent and contributor-friendly, since release instructions already exist in release.sh
Upstream-commit: aa3de0b8499f8f42e0414099b2397179df35358b
Component: engine
2013-09-24 14:36:20 -06:00
Michael Crosby beff202e28 Merge pull request #1972 from dotcloud/bump_0.6.3
Bump to version v0.6.3
Upstream-commit: 648d759517b62ca751dc3506f7abce5e9fefc62d
Component: engine
2013-09-24 11:20:27 -07:00
Andy Rothfusz 1f207e2d0a Fix #1993: add explanation for export restrictions
Upstream-commit: 5c190fa9264dba20b34fda4b68ece6c0a84d88be
Component: engine
2013-09-24 11:04:08 -07:00
Solomon Hykes fa7d59102d Merge pull request #1970 from dotcloud/cleanup-hack
Cleanup and reorganize docs and tooling for contributors and maintainers
Upstream-commit: 03fe5632d0bba0ce1c7436fe9d94b595069efc6e
Component: engine
2013-09-24 10:38:21 -07:00
Dan Buch 64137c780a Adding more tests around auth.ResolveAuthConfig
mostly because I've been failing at getting docker `0.6.2` working with
docker-registry `0.6.0` with regard to login and push.  I suspect there
may be some mismatched expectations between `auth.ResolveAuthConfig` and
`registry.ResolveRepositoryName`, but I haven't done enough research or
experimentation to think it's anything more than user error.  More tests
are good, no?
Upstream-commit: edde4f55e08c879e5a5fdb74abd6e5cc751e4dbb
Component: engine
2013-09-24 12:36:50 -04:00
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 94f91b70ab Merge pull request #1883 from tianon/mkimage-debian
Several small tweaks/fixes for contrib/mkimage-debian.sh
Upstream-commit: d6887b769cff4140915ea7f97a076aecec7a05f3
Component: engine
2013-09-23 22:44:16 -07: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
Michael Crosby 8dca6b9f4e Merge pull request #1975 from tianon/patch-1
Add @tianon to hack/MAINTAINERS
Upstream-commit: 35ca35ffb613947a9b0f8215aedbe9e001c49720
Component: engine
2013-09-23 12:21:36 -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 f1898819e5 Merge pull request #1967 from dotcloud/vendor-update-tar
Update tar dependency to newest version
Upstream-commit: dc06496dc8449604e71b43cb2cd3b83daa2205d7
Component: engine
2013-09-23 10:44:42 -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