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
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
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
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
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
Victor Vieux
d92518e8b2
fix jsonmessage in build
...
Upstream-commit: 05f416d869777aa613a5a197ad287c18b77366d3
Component: engine
2013-12-06 14:09:27 -08:00
Sven Dowideit
46d11941b1
change the policy wrt $ sudo docker to simplify auto-testing
...
Upstream-commit: 13da09d22bcae553cb11b5f906d3c260db571b7d
Component: engine
2013-12-07 07:23:53 +10:00
Josh Hawn
db8076813b
Adjusted handling of inactive user login
...
The return status for inactive users was being checked
too early in the process, so I moved it from just after
the handling of POST /v1/users/ to after getting the
response from GET /v1/users/
Upstream-commit: 6720bfb24312a558a27453ce104beeb04c53ec68
Component: engine
2013-12-06 11:57:05 -08:00
Andy Rothfusz
f1753d066b
Merge pull request #3071 from lsm5/fedora-docs-update
...
use mattdm/fedora in fedora doc and other cosmetic changes
Upstream-commit: d75fc6e529a4a7279829f4229c474adf29514b8b
Component: engine
2013-12-06 11:25:10 -08:00
Andy Rothfusz
f296451534
Merge pull request #3052 from shawnl/patch-1
...
nftables dependancies in kernel
Upstream-commit: 4a148919c3c988f3ade8c4564c65de7f9816c15b
Component: engine
2013-12-06 11:02:49 -08:00
Guillaume J. Charmes
2399b9ff21
Merge pull request #3079 from crosbymichael/give-engine-noop-tests
...
Enable engine to take Stderr and Stdout for mocking in tests
Upstream-commit: c7d75588f412edca2f71960bb99cf20437b7f39a
Component: engine
2013-12-06 10:43:39 -08:00
Guillaume J. Charmes
98995e52ad
Merge pull request #3095 from jpoimboe/missing-defines
...
devmapper: add missing defines
Upstream-commit: dfade9e2d81d13b35b0242bb72bf88303ac7fe9a
Component: engine
2013-12-06 10:31:42 -08:00
Guillaume J. Charmes
ca965db924
Merge pull request #3085 from tianon/fix-cgroup-dep
...
Revert "Add cgroup-bin dependency to our Ubuntu package"
Upstream-commit: b655406faa11a0d42db80008074393d7e68447cd
Component: engine
2013-12-06 09:15:41 -08:00
Josh Poimboeuf
07db46c5e4
devmapper: add missing defines
...
Add some missing defines which are needed for compiling on older systems
like RHEL 6.
Upstream-commit: a015f38f4a886518828fe3807ee7dc9ff8ab9585
Component: engine
2013-12-06 10:13:47 -06:00
tang0th
8dbc8f134f
Update archlinux.rst as packages have changed
...
The docker package has been added into the Arch Linux community repo, this means that the package names and installation instructions have slightly changed.
Upstream-commit: 02ef8ec3ca1a9b16b905b671ade74cf24d11bb3a
Component: engine
2013-12-06 15:47:24 +00:00
Michael Crosby
8c54ea502c
Enable engine to take Stderr and Stdout for mocking in tests
...
Upstream-commit: 25d3db048e761ee2c61a2cc8d58196786616988b
Component: engine
2013-12-06 01:18:18 -08:00
Shawn Landden
7e3fb2e06b
specific kernel config
...
Upstream-commit: a69bb25820df8951151c8c6cb5952ba5496463db
Component: engine
2013-12-05 23:54:23 -08:00
Andy Rothfusz
6671f362c6
Add debian mirrors. Fixes #3045 .
...
Upstream-commit: 58b75f8f29b5fff388ec3d8d84249e122462c137
Component: engine
2013-12-05 18:08:56 -08:00
Tianon Gravi
f35e7a7cde
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: aea7418d8ac73f072a47affcaab04831c2f43bc2
Component: engine
2013-12-05 19:03:47 -07:00
Andy Rothfusz
900b5e498f
Merge pull request #3069 from proppy/patch-1
...
docs/installation/google: add enabling Google Compute Engine step
Upstream-commit: f9147effac69e9746b6aae5af9d37bf437aa6c2d
Component: engine
2013-12-05 17:40:42 -08:00
Andy Rothfusz
1a871cfdd1
Merge pull request #3001 from dotcloud/api_json
...
add docs for the new json format
Upstream-commit: 0e2b0f284c1acfbb152ccca77417b4e132a4355b
Component: engine
2013-12-05 17:35:51 -08:00
Andy Rothfusz
5115cf8685
Merge pull request #3051 from pariviere/2490-docs-network
...
Network documentation page
Upstream-commit: 80dfa23da8359618a2453cb1cb3cb5fa69bb71f8
Component: engine
2013-12-05 17:29:54 -08:00
Andy Rothfusz
fec117a06e
Clean up quoting, wraps, and build error on code-block.
...
Upstream-commit: 4bea68dfa6a9c68232ff7a5c36c85fc827dae938
Component: engine
2013-12-05 17:16:31 -08:00
Andy Rothfusz
41a5e644a5
Merge branch 'docker-run-prose-2149' of github.com:SvenDowideit/docker into 3036-test
...
Upstream-commit: ea0ed9a9159de98c444c6a83649ae2eb51da1c84
Component: engine
2013-12-05 17:03:26 -08:00
Guillaume J. Charmes
b525e44e89
Bump to 0.7.1
...
Upstream-commit: e39d35dedad1db952c30958303902b4c96e1f406
Component: engine
2013-12-05 16:49:39 -08:00
Guillaume J. Charmes
522f629592
Merge pull request #3078 from crosbymichael/remove-name-if-not-exist
...
If container does not exist try to remove the name and continue
Upstream-commit: 4acd5792260fb688e13242b55edea938382e2ba3
Component: engine
2013-12-05 16:41:43 -08:00
Victor Vieux
bd4e7f6cb9
Merge pull request #3006 from tianon/ubuntu-cgroup-bin
...
Add cgroup-bin dependency to our Ubuntu package
Upstream-commit: c764fb0c294a37b6cf9aad68822be9b349449e6e
Component: engine
2013-12-05 16:41:01 -08:00
Victor Vieux
f3927b33a8
Merge pull request #2955 from crosbymichael/search-name-first
...
Search for repo first before image id
Upstream-commit: 7a870235879462bc929f147e96927d2a5caeb407
Component: engine
2013-12-05 16:16:55 -08:00
