f6876820fd
Merge pull request #11844 from jbarbier/cgroup-parent-42
...
Adding cgroup-parent option for docker build
Upstream-commit: e960e4bb129de15b3beb7da37421e32af8dccf2f
Component: engine
2015-05-05 14:46:47 -07:00
3f873c25b6
Rename int64Value to int64ValueOrZero.
...
Signed-off-by: Adria Casas <adriacasas88@gmail.com >
Upstream-commit: a2c76912e04b087233577b46f96f446c5d13e2de
Component: engine
2015-05-05 08:54:28 +02:00
da6438ab18
Merge pull request #10766 from cpuguy83/stats_pull_once
...
Allow pulling stats once and disconnecting.
Upstream-commit: 91fb4d672a8536d2f0437aeeb2dfc7b9e51aac16
Component: engine
2015-05-04 22:28:01 -07:00
9531505238
Allow pulling stats once and disconnecting.
...
Adds a `stream` query param to the stats API which allows API users to
only collect one stats entry and disconnect instead of keeping the
connection alive to stream more stats.
Also adds a `--no-stream` flag to `docker stats` which does the same
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
Upstream-commit: f3023a93d1a0a96a7312de441a550c758ac0c17d
Component: engine
2015-05-04 10:49:13 -04:00
d6d6bba166
Refactor server to use daemon as the service layer in controllers
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja >
Upstream-commit: c7cfdb65aa43a4561adb919d170bba5e86d69bee
Component: engine
2015-05-02 03:12:58 +02:00
016ac4bf61
Remove engine mechanism
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja >
Upstream-commit: 531f4122bdcd4de289f613a5ef010f4c1989f098
Component: engine
2015-04-30 01:35:16 +02:00
954f940156
Small if err cleaning
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja >
Upstream-commit: 844538142d95c1b7dda1bb2903179510105fe9b5
Component: engine
2015-04-27 21:50:33 +02:00
6a2c490ba2
Merge pull request #12333 from Mashimiao/clean-up-viz
...
Clean up viz code
Upstream-commit: 572ba9cb407f3c383367c67b1a6d3da612ece4a7
Component: engine
2015-04-27 14:13:03 -04:00
7a068916d5
Happy birthday Docker! cgroup-parent option for docker build. Thanks to Michael, Nathan and Jessie for their support! #42
...
Signed-off-by: Julien Barbier <write0@gmail.com >
Upstream-commit: bb411939989dabb56eb604b9a873d1dfbf0646ef
Component: engine
2015-04-25 15:25:51 -04:00
734115a06e
Add cpu cfs quota to build
...
Signed-off-by: Lei Jitang <leijitang@huawei.com >
Upstream-commit: 5f4fb8be006c0ffeff2671e5752111e543e07d9f
Component: engine
2015-04-24 08:54:08 +08:00
8910bbac66
clean up viz code
...
Signed-off-by: Ma Shimiao <mashimiao.fnst@cn.fujitsu.com >
Upstream-commit: 66acef865d7504605572b0d9566d9e250cf19bc2
Component: engine
2015-04-24 08:38:14 +08:00
41061500b4
Remove engine/job from graph
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja >
Upstream-commit: fa2c68a89e153cfc82c5af7cbb6d7f15b06e0a8c
Component: engine
2015-04-23 23:36:29 +02:00
683e3fbf65
Merge pull request #12702 from LK4D4/good_ol_flushed
...
Return weird behaviour of returning json errors
Upstream-commit: 1492a7d7fd91e52a52937cafe1137330a89a910e
Component: engine
2015-04-23 13:03:29 -07:00
fdbedc1a2a
Merge pull request #12636 from duglin/MoveConfig
...
Move CLI config processing out from under registry dir
Upstream-commit: 9ed5bfb083a8e848b43f5220ca89c82ea416a93b
Component: engine
2015-04-23 11:50:31 -07:00
7362927093
Merge pull request #12703 from LK4D4/carry_12596
...
remove job from image_export
Upstream-commit: 2c70288ca60cde8844220c90306da8bf7728026f
Component: engine
2015-04-23 14:27:59 -04:00
19c7093025
Merge pull request #12687 from WeiZhang555/NotFound
...
refactor httpError() and add 404 "not found" mapping
Upstream-commit: 2345389975258c0a586ff39de070749151733625
Component: engine
2015-04-23 11:21:09 -07:00
bda3c79940
remove job from image_export
...
Signed-off-by: He Simei <hesimei@zju.edu.cn >
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
Upstream-commit: 2a14b7dd35901167d83735a25ff626596391c4ed
Component: engine
2015-04-23 10:54:25 -07:00
0c04318339
Return weird behaviour of returning json errors
...
We need this, so client can get error from stream and not from status
code, which is already 200, because write to ResponseWriter was occured.
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
Upstream-commit: ec51ba01dbbeadb06cc7f3c14e94f8a2ee938a34
Component: engine
2015-04-23 10:27:37 -07:00
c8f1332dce
Move CLI config processing out from under registry dir
...
No logic changes should be in here, just moving things around.
Signed-off-by: Doug Davis <dug@us.ibm.com >
Upstream-commit: bb9da6ba9294a8eab8f4dfaf7cf07c57959fe608
Component: engine
2015-04-23 10:18:38 -07:00
898f52e474
Merge pull request #12505 from ZJU-SEL/remove_job_from_push
...
remove job from push
Upstream-commit: 2351b87551a0ee3ec97afc34b7cace7f716190d2
Component: engine
2015-04-23 09:57:17 -07:00
ad85dea266
Merge pull request #12681 from hqhq/hq_fix_test_in_apiserver
...
fix test case name
Upstream-commit: 71ac5b79038964c353645c78e354654cb5730434
Component: engine
2015-04-23 09:21:00 -07:00
6b55be9005
remove job from push
...
Signed-off-by: Simei He <hesimei@zju.edu.cn >
Signed-off-by: He Simei <hesimei@zju.edu.cn >
Upstream-commit: d456401fe1d038ddaf9866bb6ab4ac5744186e2d
Component: engine
2015-04-23 21:21:56 +08:00
84dc009f41
refactor httpError() and add 404 "not found" mapping
...
When docker pull a non-existent repo, daemon will report "image xxx not found"
with an error code 500, which should be 404.
This commit add 404 "not found" mapping and refactor httpError function.
Signed-off-by: Zhang Wei <zhangwei555@huawei.com >
Upstream-commit: ab42a3a23a1276ccad874a13cf8604cb59124e10
Component: engine
2015-04-23 19:37:47 +08:00
ece94d0722
remove job from load
...
Signed-off-by: Simei He <hesimei@zju.edu.cn >
Signed-off-by: He Simei <hesimei@zju.edu.cn >
Upstream-commit: 70bb0d8ed7847d7e7850a1a864ff258767f0ad7a
Component: engine
2015-04-23 19:13:12 +08:00
f4814df32c
fix test case name
...
Name like this will never run by go test. And this test case won't
get PAAS.
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com >
Upstream-commit: a8d2fbe7b4593f1e10800a19df14e1bbfb212d41
Component: engine
2015-04-23 18:41:30 +08:00
078d379cc0
Merge pull request #12406 from runcom/remove-job-container-inspect
...
Remove job from container_inspect
Upstream-commit: 387227217004d4ea54e2d2405aaef761752e3bdc
Component: engine
2015-04-22 21:05:15 -04:00
9b8b781646
Merge pull request #12649 from jlhawn/fix_pull_err_explosion
...
Correctly format API error on image pull
Upstream-commit: 5ea8dc376c94de6939e35a4152b1a9a5979911dd
Component: engine
2015-04-22 20:28:24 -04:00
fdf9a8d629
Remove job from container_inspect
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja >
Upstream-commit: 4b9fe9c298c8778855c1d14e978c791496dd7c42
Component: engine
2015-04-23 00:58:13 +02:00
cd9ba3cbe6
Correctly format API error on image pull
...
Docker-DCO-1.1-Signed-off-by: Josh Hawn <josh.hawn@docker.com > (github: jlhawn)
Upstream-commit: fd4f7c4e5c4460bad7baf0854f1edc1bbf93aeef
Component: engine
2015-04-22 14:11:25 -07:00
f089bf1e0a
remove execCreate & execStart from job
...
Also removed the function ExecConfigFromJob
Signed-off-by: Sun Jianbo <wonderflow@zju.edu.cn >
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
Upstream-commit: 24425021d26f29a475702064181e6c99fb6bd1c5
Component: engine
2015-04-22 13:51:57 -07:00
43e79cc411
Remove chain of engine passing from builder to loadManifest
...
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
Upstream-commit: a2f74aa4b449479dc3953b129c839ca90b089494
Component: engine
2015-04-21 14:55:23 -07:00
e46db750a1
Remove writeJSONEnv
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja >
Upstream-commit: 27811355bd15dd2d0f102dd3b02512c677d5da44
Component: engine
2015-04-21 18:14:39 +02:00
bf5cc9f8c8
Merge pull request #12457 from calavera/remove_engine_job_builder
...
Remove engine.Job from Builder.
Upstream-commit: 82f75df9e9faceabd9a2653ac57ad17aeab5e44b
Component: engine
2015-04-20 17:27:17 -07:00
27af7aa804
Merge pull request #12539 from WeiZhang555/httpError
...
change httpError logic
Upstream-commit: 4bb8924b52a4d8a25ccfcd39a43e7ba22b393424
Component: engine
2015-04-20 17:26:09 -07:00
1edadd0f1c
Add flusher check to utils.WriteFlusher.
...
That way we can know when the stream has been flushed.
Signed-off-by: David Calavera <david.calavera@gmail.com >
Upstream-commit: 3b05005a1262e53d042512e88c52a6dae0f2e93d
Component: engine
2015-04-20 14:25:45 -07:00
16569396d9
Remove engine.Job from builder.CmdBuildConfig.
...
Signed-off-by: David Calavera <david.calavera@gmail.com >
Upstream-commit: ae4063585e7936780154101f7fe416a080c6ff7c
Component: engine
2015-04-20 13:37:06 -07:00
a618f11507
Remove engine.Job references from builder.CmdBuild
...
Signed-off-by: David Calavera <david.calavera@gmail.com >
Upstream-commit: 9a2c00975123c17033ac7b50762af82051ec73db
Component: engine
2015-04-20 13:37:04 -07:00
47e2254d8e
Make all http handlers api.server.Server methods
...
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
Upstream-commit: da7bca449652396dd8a4a0ff2e303d3d3c7a58a2
Component: engine
2015-04-20 09:45:31 -07:00
73aebaff91
change httpError logic
...
Signed-off-by: Zhang Wei <zhangwei555@huawei.com >
Signed-off-by: Zhang Wei <zhangwei198900@gmail.com >
Upstream-commit: 66239ab5c914ce716c044b676ba1ad4757ce6f2b
Component: engine
2015-04-20 23:26:56 +08:00
2e27fa9e39
Make API server datastructure
...
Added daemon field to it, will use it later for acces to daemon from
handlers
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
Upstream-commit: d9ed3165228b60cb89c31d0d66b99e01ab83eb3e
Component: engine
2015-04-20 08:13:39 -07:00
3ad142821c
Merge pull request #12537 from hqhq/hq_remove_unused_function
...
remove unused function in server_unit_test.go
Upstream-commit: b5584ec24a6c711a842605dd9fbf5535e77ae878
Component: engine
2015-04-20 07:51:53 -07:00
899b777d56
Remove Job from Info API
...
Two main things
- Create a real struct Info for all of the data with the proper types
- Add test for REST API get info
Signed-off-by: Hu Keping <hukeping@huawei.com >
Upstream-commit: f4942ed864f00a31591ef0257a971ef41ddd4c70
Component: engine
2015-04-20 18:14:06 +08:00
5848586647
remove unused function in server_unit_test.go
...
After engine refactor, some functions are no longer used.
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com >
Upstream-commit: 641a7ec9ad61a42b255d203b7791198431761104
Component: engine
2015-04-20 16:27:47 +08:00
14bae8f05b
Merge pull request #12358 from ZJU-SEL/remove_job_from_tag
...
remove job from tag
Upstream-commit: b1d8ae3824d2902c86d63837b8d413952b546d62
Component: engine
2015-04-19 16:02:28 -04:00
dd5f4141fe
remove job from tag
...
Signed-off-by: Simei He <hesimei@zju.edu.cn >
Upstream-commit: 99f6309b97041bf82cc845340734dc8e47977c8a
Component: engine
2015-04-19 18:36:56 +08:00
41c63ff3d3
Merge pull request #12490 from LK4D4/carry_12396
...
remove job from pull and import
Upstream-commit: 055c6dbaefc61c597164aaedee4448bc32522b2e
Component: engine
2015-04-17 15:26:30 -04:00
0ff275f7b4
remove job from pull and import
...
Closes #12396
Signed-off-by: Simei He <hesimei@zju.edu.cn >
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
Upstream-commit: 6e38a53f96403b4cbd38e49e6b294128ed054a20
Component: engine
2015-04-17 09:55:02 -07:00
6488f10044
Remove builtins
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja >
Upstream-commit: a0bf80fe0372196812a9cb295f209c08f8037601
Component: engine
2015-04-17 14:27:38 +02:00
9ae8147d1a
Change log severity for non-tlsverify bind
...
closes #12459
Signed-off-by: Hu Keping <hukeping@huawei.com >
Upstream-commit: b052f7a87cb73aa2b0d4827f6cf23b9eb0fdfa2e
Component: engine
2015-04-17 21:27:58 +08:00
105ea026b0
Remove job from restart
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja >
Upstream-commit: e41192a3f8cbfbbfecde03f58a3b2be2b1afd836
Component: engine
2015-04-16 18:50:24 +02:00
