Commit Graph

252 Commits

Author SHA1 Message Date
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
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
884bdce09a Merge pull request #12253 from calavera/remove_job_from_start_and_create
Remove engine.Job from Start and Create
Upstream-commit: de923f59b3860eba2c87e8a533b385ac5752243b
Component: engine
2015-04-15 21:49:25 -04:00
234898b4e7 Decode container configurations into typed structures.
Signed-off-by: David Calavera <david.calavera@gmail.com>
Upstream-commit: 767df67e3149b83255db0809f6543b449a4f652e
Component: engine
2015-04-15 10:22:07 -07:00
9f222f171d Add cpuset-mems support for docker build
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
Upstream-commit: f8dc7e8754355c504562021da244c52055ab9204
Component: engine
2015-04-15 09:34:12 +08:00
fa70da1003 Remove engine.Job from Create action.
Signed-off-by: David Calavera <david.calavera@gmail.com>
Upstream-commit: 98996a432e079d1434182ea1cf84e70c927da4c2
Component: engine
2015-04-14 15:33:12 -07:00
c44394bb9b Remove engine.Job from Start action.
Signed-off-by: David Calavera <david.calavera@gmail.com>
Upstream-commit: 610c436e07388f4898020432b25939cc7104b894
Component: engine
2015-04-14 15:33:12 -07:00
0d57506a8e Merge pull request #12269 from kostickm/12251-remove-not-empty-check
Remove container name not empty check
Upstream-commit: 5395cdcae58d867070cb78873fd5f51b72a5cfef
Component: engine
2015-04-14 17:55:13 -04:00
78eb19684c Remove container name not empty check
Signed-off-by: Megan Kostick <mkostick@us.ibm.com>
Upstream-commit: 98f857772f3be0985ab87c4bc6bd91e80e122c53
Component: engine
2015-04-14 11:27:06 -07:00
325400d97c Use local variable err instead of a outer one
Signed-off-by: Hu Keping <hukeping@huawei.com>
Upstream-commit: a0804e8e118510dc49e7e74273a323e99c097a3d
Component: engine
2015-04-15 00:29:53 +08:00
97f1b60257 Merge pull request #12301 from ewindisch/https_links
Use HTTPS links for URLs in READMEs / comments / docs
Upstream-commit: 3509132a6e28caa18003298521c58746f490b57b
Component: engine
2015-04-13 14:30:53 -04:00
05674d127e Merge pull request #12320 from runcom/fix-api-resize-exec-resize
fix api server resize&execResize
Upstream-commit: 6f928be7ef7d8610875e860e72433dc2477b1c5d
Component: engine
2015-04-13 09:59:11 -07:00
ccda6c3ec6 Merge pull request #12279 from runcom/remove-job-commit
Remove job from commit
Upstream-commit: 33e83d05813207247ffcd0be0ccf6a6a7ad25b64
Component: engine
2015-04-13 09:57:54 -07:00
b802ea45ca Merge pull request #12312 from runcom/remove-job-container-stats
Remove job from container stats
Upstream-commit: 12eff0c26f9d7fb5f0b1f1cbb975b8892c2dc306
Component: engine
2015-04-13 11:58:31 -04:00
0118377dec Merge pull request #12313 from runcom/remove-job-export
Remove job from export
Upstream-commit: a4f98d32258b8e209ab2702f0d0a092a7ffe15a2
Component: engine
2015-04-13 11:57:55 -04:00
416e9ff40b Merge pull request #12304 from runcom/remove-job-logs
Remove job from logs
Upstream-commit: bfb487dc50e3b88b520678a9118bfb95891140cb
Component: engine
2015-04-13 08:38:46 -07:00
ebe83bc94c Remove job from export
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
Upstream-commit: 6b737752e342e30dd20417b18c92c9b4e1c4f8da
Component: engine
2015-04-13 15:27:45 +02:00
83596c55e6 fix api server resize&execResize
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
Upstream-commit: 3341f3a3554524f0f5e6114dfa0ed988713803ef
Component: engine
2015-04-13 08:42:12 +02:00
b2c60bfa72 Remove jobs from stats
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
Upstream-commit: 65a056345cec1b85bd41ed70ee814894709ee6c0
Component: engine
2015-04-13 08:33:53 +02:00
b3c5a7d38d Remove job from logs
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
Upstream-commit: 91bfed604959c591a076c2e330cb3ded7443f504
Component: engine
2015-04-13 08:25:31 +02:00
6b4495dbae Merge pull request #12305 from runcom/remove-job-exec-inspect
Remove job from execInspect
Upstream-commit: a54fd325e6bd0c5a1c298deef48399fe6e59aa33
Component: engine
2015-04-12 08:30:38 -04:00
d05177503f Remove job from stop
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
Upstream-commit: 04cc6c6aa4f8ea656d23268b7bff0136e4fc6c8d
Component: engine
2015-04-12 00:41:16 +02:00
62d48e6c18 Remove job from execInspect
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
Upstream-commit: 621ee1f6a4cbc8ee8758ce77a0cf6215c88f12f7
Component: engine
2015-04-12 00:15:34 +02:00
0551904b7c Link to HTTPS URLs in engine comments
Updates most of the instances of HTTP urls in the engine's
comments. Does not account for any use in the code itself,
documentation, contrib, or project files.

Signed-off-by: Eric Windisch <eric@windisch.us>
Upstream-commit: ca37301d54e1525d4522dea266180072d4fd892b
Component: engine
2015-04-11 13:31:34 -04:00
e41d53c507 Remove job from commit
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
Upstream-commit: c8529fde5f6f2e4b62f9c1b3382fd814c11a7639
Component: engine
2015-04-11 00:20:45 +02:00
928371a2db Remove job from wait
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
Upstream-commit: db0ffba3b92aeda667501aaa10926943a7738f82
Component: engine
2015-04-10 20:17:02 +02:00
1f992e6c96 Merge pull request #12259 from duglin/RemoveJobTop
Remove Job from `docker top`
Upstream-commit: bae3273ef4e61fd04c0dd4ddb1527aa7c4f9bfb6
Component: engine
2015-04-10 10:56:01 -07:00
ff94291067 Merge pull request #12248 from duglin/RemoveJobKill
Remove Job from `docker kill`
Upstream-commit: 267bd51adbf9e344a5d18bb0c7df4e09bcb60668
Component: engine
2015-04-10 10:52:18 -07:00
fbe401b655 Remove Job from History API
a part of issue #12151

Signed-off-by: Hu Keping <hukeping@huawei.com>
Upstream-commit: 5c7c3fea6caf43d51344faaf190b869db1b44f46
Component: engine
2015-04-10 21:37:56 +08:00
681bfa410b Remove Job from docker top
Signed-off-by: Doug Davis <dug@us.ibm.com>
Upstream-commit: 3e096cb9c9e9d708df7982be5694daaa62bb4849
Component: engine
2015-04-09 18:17:50 -07:00
4ef2fa0ccf Remove Job from docker kill
Signed-off-by: Doug Davis <dug@us.ibm.com>
Upstream-commit: 3cb751906a8a0397dcf57d8fca97c0e9c0c418e8
Component: engine
2015-04-09 16:06:54 -07:00