Commit Graph
5133 Commits
Author SHA1 Message Date
Victor Vieux af25bb8dd1 fix docker images -tree <invalid_image> and docker images -viz <image_name>
Upstream-commit: ac1093b83aee38243b0d6df3dd8aabc52062b9d2
Component: engine
2013-12-09 16:58:17 -08:00
James Turnbull 5584948c34 Some minor cleanup of the Links use document
Upstream-commit: c9cedb4c0484c3e1879495ab5c02088ae738763e
Component: engine
2013-12-09 16:47:19 -08:00
Victor Vieux 2ddcfd0b85 Merge pull request #2843 from shykes/engine-job-wait
New engine job:wait
Upstream-commit: a74be95b2397a17d2bf9683e011cb9f8f953fb4b
Component: engine
2013-12-09 16:36:23 -08:00
Victor Vieux 47be100499 refactor and fix tests
Upstream-commit: 8291f00a0e656cf3bb52fb1dcdff7c266305f4d5
Component: engine
2013-12-09 16:25:19 -08:00
Andy Rothfusz 86975238fd Merge pull request #3109 from artagnon/arch-install
Update Arch installation doc
Upstream-commit: b7bc80cba90ecfe75cd621f3d437e63e3ec3fd5d
Component: engine
2013-12-09 15:52:54 -08:00
Andy Rothfusz 6865b89ad2 Merge pull request #3104 from jamtur01/uses
Added section on Trusted Builds
Upstream-commit: 864729b96fbf3fa912d2686df79ec9baf15af856
Component: engine
2013-12-09 15:51:52 -08:00
Andy Rothfusz 009a1fe4fc Merge pull request #3143 from idupree/patch-1
Make it extra clear that the `docker` group is root-equivalent.
Upstream-commit: a67571668e7b95fc21c0a5dea1eccc83af3db7f6
Component: engine
2013-12-09 15:48:05 -08:00
Danny Yates dbd21cfe22 Prevent deletion of image if ANY container is depending on it; not just running containers
Upstream-commit: 776bb43c9e97824a2cb05353c68ef5645f3cc112
Component: engine
2013-12-09 20:46:21 +00:00
Michael Crosby c1707e6dae Merge pull request #3114 from shykes/hack-stats
Hack: stats.sh prints useful project stats for maintainers
Upstream-commit: 75bd5bea70b6a834657454db7b1001561c81bec9
Component: engine
2013-12-09 10:36:17 -08:00
Isaac Dupree 86c7a0eff5 Make it extra clear that the docker group is root-equivalent.
Upstream-commit: e2ee5c71fc665170db6a3a487aebb4d7f42eed0b
Component: engine
2013-12-09 12:25:20 -05:00
Tianon Gravi bc39a675a4 Add separate "test-integration" bundlescript (and corresponding dyntest-integration bundlescript)
Upstream-commit: f0879a1e145f31569e9e4e61f429de858bb636ab
Component: engine
2013-12-08 18:43:24 -07:00
Tianon Gravi 8157bab592 Unify dyntest/test and dynbinary/binary hack bundlescripts further by cross-invocation and keeping all the logic in one place, taking advantage of LDFLAGS_STATIC that is the only bit that gets replaced for dyntest/dynbinary
Upstream-commit: ca405786f468a18859684dc13d43a293d47b89bd
Component: engine
2013-12-08 18:40:05 -07:00
Michael Crosby 232e185f7c Merge pull request #3126 from unclejack/remove_vendored_tar
Remove vendored dotcloud/tar
Upstream-commit: cdc07f7d5c00106d77d633c0df247c3b13f8b8d7
Component: engine
2013-12-08 16:51:52 -08:00
Tianon Gravi c4cf791397 Unify hack/make/*test further by invoking hack/make/test directly from dyntest
Upstream-commit: 45cea94a827bfcb77ef53e2e5046df51dc7c113c
Component: engine
2013-12-08 15:34:08 -07:00
unclejack 1e448fb4ac remove vendored dotcloud/tar
The tar dependency has been removed. It's
time to remove the vendored tar as well.
Upstream-commit: 8ec96c9605b1e97fb36f3c2a2d85632f62fb047b
Component: engine
2013-12-09 00:02:13 +02:00
James Turnbull dd4af9a43c Added section on Trusted Builds
Upstream-commit: c094807a1b8159bf237091ecc85fcbd6e2092a3e
Component: engine
2013-12-08 15:54:12 -05:00
Tianon Gravi a3942a6d82 Add much better pruning of non-tested directories, including pruning the integration tests directory (doing more with "find" and nothing with "grep")
Upstream-commit: bac3a8e6f5eca31108787b98d5659523eefa6a30
Component: engine
2013-12-08 13:50:48 -07:00
Tianon Gravi 1f4109a158 Clean output and simplify hack/make/*test by adding go_test_dir function in make.sh
Upstream-commit: dcfc4ada4dcc8b1f878370976f29ca0485e690f8
Component: engine
2013-12-08 13:49:57 -07:00
Tianon Gravi 9726885de6 Simplify and resync hack/make/test and hack/make/dyntest output handling
Upstream-commit: 416b16e1e200420644072b354b9595ffa9474682
Component: engine
2013-12-08 12:57:11 -07:00
Ramkumar Ramachandra 23da3f2ced archlinux installation doc: correct some details
1. The AUR package is called docker-git, not lxc-docker-git.

2. According to the official community package, docker depends on
   sqlite.

3. 02ef8ec (Update archlinux.rst as packages have changed, 2013-12-06)
   updated the installation instructions, but left behind residual
   wording about the AUR package not being officially supported; the
   community repository is officially supported.

Signed-off-by: Ramkumar Ramachandra <artagnon@gmail.com>
Upstream-commit: f832b76bdfafe3108af61d00171567da02482222
Component: engine
2013-12-08 15:36:02 +05:30
Solomon Hykes 00e377167a Merge pull request #3118 from shykes/engine-structured-output
Engine: jobs can send structured output as json on stdout
Upstream-commit: d502f0cfac781f52ff64535d1b5e06949fa8ef1a
Component: engine
2013-12-07 23:46:50 -08:00
Solomon Hykes f57ed48f6d Merge pull request #3117 from shykes/engine-refactor-env
Engine: break out Env utilities into their own type - Env
Upstream-commit: 16fad96007e853df6f7bd83c839f357625de5a14
Component: engine
2013-12-07 23:45:00 -08:00
Solomon Hykes 707fb0bfad Port 'docker version' to the engine API
Upstream-commit: de35b346d17ef86ef091e1736575c60c41fc3771
Component: engine
2013-12-08 07:41:53 +00:00
Solomon Hykes d8d9197f34 Cleanup version introspection
* Unify version checking code into version.go
* Make 'version' available as a job in the engine
* Use simplified version checking code when setting user agent for registry client.
Upstream-commit: 869a11bc93c4b5dc9dbd74d65e69045f367bdb36
Component: engine
2013-12-08 07:35:24 +00:00
Solomon Hykes 012c10845d Engine: convenience http transport for simple remote job execution
Upstream-commit: f80681815422865fbe0e9b637f38553fa965004a
Component: engine
2013-12-08 07:33:23 +00:00
Solomon Hykes 64bd8b9483 Engine: Output.AddEnv decodes structured data from the standard output of a job
Upstream-commit: a7a171b6c2916b7be3fa51c9465516acb68c3e32
Component: engine
2013-12-08 06:16:10 +00:00
Solomon Hykes bb99db485b Engine: break out Env utilities into their own type - Env
Upstream-commit: a80c059baeff0b7d563499e963059a183c7e1bd9
Component: engine
2013-12-08 06:06:05 +00:00
Solomon Hykes 528954d272 Hack: stats.sh prints useful project stats for maintainers
Upstream-commit: edace08327675967700a5ff8093ee3104a91772f
Component: engine
2013-12-08 01:47:03 +00:00
Solomon Hykes 34b1795f6e Engine: 'export' returns a raw archive of a container's filesystem
Upstream-commit: 9656cdf0c248fda629fe9f13cf4ce4d3fabd35a4
Component: engine
2013-12-08 01:33:37 +00:00
Solomon Hykes 6e1bef0570 Engine: don't log job stdout to engine stdout (it might be non-text output, for example tar data for 'export'
Upstream-commit: 50f3a696bdfde5aed8f020fbac24af4c6c653ca9
Component: engine
2013-12-08 01:33:05 +00:00
Solomon Hykes 8eb7425cfe Merge pull request #3101 from creack/merge_release
Merge release
Upstream-commit: f4676f0ffa76576e5147994cead82ce19804158f
Component: engine
2013-12-06 18:09:38 -08:00
Guillaume J. Charmes f39a822707 Update version
Upstream-commit: 3c1f3be032be4cd4a8c9235ed35e3a269e5f524e
Component: engine
2013-12-06 17:31:09 -08:00
Guillaume J. Charmes aa55ca5f8a Merge remote-tracking branch 'origin/release' into merge_release
Upstream-commit: aeba4e64824b5530c0c5e2aa3d840ca5501028bf
Component: engine
2013-12-06 17:30:52 -08:00
Solomon Hykes d007e15eed New engine command: 'wait'
Upstream-commit: 3569d080afc721a1eb04ad4a65f1309b53da1238
Component: engine
2013-12-06 23:05:21 +00:00
Solomon Hykes 17c91d08c7 Engine: port 'kill' to the new integer status.
Upstream-commit: 427bdb60e73ad059e813babd981168ea2464ea1f
Component: engine
2013-12-06 23:02:27 +00:00
Solomon Hykes 4c9354ea8f gofmt
Upstream-commit: 9b1930c5a07fe3f696ec54f5d429b8020cc9086f
Component: engine
2013-12-06 23:02:27 +00:00
Solomon Hykes 1b6ebfe317 Hack: use new 'kill' command in integration tests
Upstream-commit: 2546a2c645c59d094bc2c09dc9eb0d8eb5c36786
Component: engine
2013-12-06 23:02:27 +00:00
Solomon Hykes 18f68039b6 Engine: new command 'kill' sends a signal to a running container
Upstream-commit: fdb3de7b11e4b85ec86f76aad51290730c037668
Component: engine
2013-12-06 23:02:27 +00:00
Guillaume J. Charmes 92cd51b7ef Merge pull request #3098 from creack/bump_v0.7.1
Bump v0.7.1
Upstream-commit: 88df052197fc16f578ed0551ad654dd67bb3a39a
Component: engine
2013-12-06 14:42:14 -08:00
Guillaume J. Charmes f627dc9f6a Merge pull request #3077 from jlhawn/3076-handle-inactive-user-login
Adjusted handling of inactive user login
Upstream-commit: 04ffa53ba803b4ce605ae5c048edbd1de4cc4129
Component: engine
2013-12-06 14:40:35 -08:00
Andy Rothfusz a30df829ac Merge pull request #3030 from jamtur01/versions
Fixed #2136 - Added styles
Upstream-commit: 07f7643bbc98dd43dd073a128c33495d55b099d4
Component: engine
2013-12-06 14:27:53 -08:00
Victor Vieux e34a28d653 added authConfig to docker build
Upstream-commit: 228091c79ed043d1896afb04cd0573ee972c2607
Component: engine
2013-12-06 14:27:10 -08:00
Andy Rothfusz 6ca0e7d37f Merge pull request #3094 from tang0th/patch-1
Update archlinux.rst as packages have changed
Upstream-commit: 6fa1463614b810d725763a20aec1fb4b8c4d1c22
Component: engine
2013-12-06 14:18:31 -08:00
Victor Vieux 9bc490e068 disable progressbar in non-terminal
Upstream-commit: f28445254f42fd112aba5f2b67ae6169fae29c2b
Component: engine
2013-12-06 14:15:40 -08:00
Victor Vieux 03972ad6f7 update doc
Upstream-commit: 0969be5ddb34ee8a6c09e882d13b1d655e028b23
Component: engine
2013-12-06 14:15:40 -08:00
Victor Vieux 0e3983757b fix jsonmessage in build
Upstream-commit: 95c0ade04bb8fe95029fed521126e3268a1eda7f
Component: engine
2013-12-06 14:15:40 -08:00
Tianon Gravi bc477123cb Revert "Add cgroup-bin dependency to our Ubuntu package"
This reverts commit c81bb20f5b2b5d86059c6004e60ba23b03d30fe0.

After re-reading the documentation: "The Recommends field should list packages that would be found together with this one in all but unusual installations."

Thus, "Recommends" is an acceptable place for this dep, and anyone disabling that gets to keep the pieces.

The main crux of why this needs to be reverted is because it breaks Debian completely because "lxc" and "cgroup-bin" can't be installed concurrently.
Upstream-commit: e01732f85769ac434e2614652aa25cd0ace7a4df
Component: engine
2013-12-06 14:15:40 -08:00
Guillaume J. Charmes a63c2448f6 Merge pull request #3096 from dotcloud/fix_fix_jsonmessage
fix jsonmessage in build
Upstream-commit: 9b644ff2463fe3ffb4fdc186ffc6c272078e3d56
Component: engine
2013-12-06 14:10:24 -08:00
Victor Vieux e5b8f32fec disable progressbar in non-terminal
Upstream-commit: 2c646b2d466b1401fccbfd453a68f0023dd5e300
Component: engine
2013-12-06 14:09:27 -08:00
Victor Vieux c3791e2e87 update doc
Upstream-commit: becb13dc26e8b40be4eec2da933705b2a378db35
Component: engine
2013-12-06 14:09:27 -08:00