docker
/
docs
mirror of https://github.com/docker/docs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
18,578 Commits 21 Branches 28 Tags 813 MiB
Commit Graph

435 Commits

Author SHA1 Message Date
David Calavera d78755d159 Merge pull request #12822 from brahmaroutu/container_stop_api 
restapi stop fails if ?t=int not present
 2015-05-07 09:38:59 -07:00
Srini Brahmaroutu 68e9c07850 Restapi for stop fails if ?t=int not present 
Signed-off-by: Srini Brahmaroutu <srbrahma@us.ibm.com>
 2015-05-07 15:43:50 +00:00
Antonio Murdaca 74121a4211 Do not check and return strconv.Atoi error in api container restart, regression 
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
 2015-05-07 01:49:16 +02:00
Arnaud Porterie e960e4bb12 Merge pull request #11844 from jbarbier/cgroup-parent-42 
Adding cgroup-parent option for docker build
 2015-05-05 14:46:47 -07:00
Adria Casas a2c76912e0 Rename int64Value to int64ValueOrZero. 
Signed-off-by: Adria Casas <adriacasas88@gmail.com>
 2015-05-05 08:54:28 +02:00
Tibor Vass 91fb4d672a Merge pull request #10766 from cpuguy83/stats_pull_once 
Allow pulling stats once and disconnecting.
 2015-05-04 22:28:01 -07:00
Brian Goff f3023a93d1 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>
 2015-05-04 10:49:13 -04:00
Antonio Murdaca c7cfdb65aa Refactor server to use daemon as the service layer in controllers 
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
 2015-05-02 03:12:58 +02:00
Antonio Murdaca 531f4122bd Remove engine mechanism 
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
 2015-04-30 01:35:16 +02:00
Antonio Murdaca 844538142d Small if err cleaning 
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
 2015-04-27 21:50:33 +02:00
Tibor Vass 572ba9cb40 Merge pull request #12333 from Mashimiao/clean-up-viz 
Clean up viz code
 2015-04-27 14:13:03 -04:00
Julien Barbier bb41193998 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>
 2015-04-25 15:25:51 -04:00
He Simei daad696e09 Fix error prompt for pull & import handler postImagesCreate. 
Signed-off-by: He Simei <hesimei@zju.edu.cn>
 2015-04-25 09:10:32 +08:00
Lei Jitang 5f4fb8be00 Add cpu cfs quota to build 
Signed-off-by: Lei Jitang <leijitang@huawei.com>
 2015-04-24 08:54:08 +08:00
Ma Shimiao 66acef865d clean up viz code 
Signed-off-by: Ma Shimiao <mashimiao.fnst@cn.fujitsu.com>
 2015-04-24 08:38:14 +08:00
Antonio Murdaca fa2c68a89e Remove engine/job from graph 
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
 2015-04-23 23:36:29 +02:00
Jessie Frazelle 1492a7d7fd Merge pull request #12702 from LK4D4/good_ol_flushed 
Return weird behaviour of returning json errors
 2015-04-23 13:03:29 -07:00
Alexander Morozov 9ed5bfb083 Merge pull request #12636 from duglin/MoveConfig 
Move CLI config processing out from under registry dir
 2015-04-23 11:50:31 -07:00
Brian Goff 2c70288ca6 Merge pull request #12703 from LK4D4/carry_12596 
remove job from image_export
 2015-04-23 14:27:59 -04:00
Jessie Frazelle 2345389975 Merge pull request #12687 from WeiZhang555/NotFound 
refactor httpError() and add 404 "not found" mapping
 2015-04-23 11:21:09 -07:00
Simei He 2a14b7dd35 remove job from image_export 
Signed-off-by: He Simei <hesimei@zju.edu.cn>
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
 2015-04-23 10:54:25 -07:00
Alexander Morozov ec51ba01db 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>
 2015-04-23 10:27:37 -07:00
Doug Davis bb9da6ba92 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>
 2015-04-23 10:18:38 -07:00
Alexander Morozov 2351b87551 Merge pull request #12505 from ZJU-SEL/remove_job_from_push 
remove job from push
 2015-04-23 09:57:17 -07:00
Alexander Morozov 71ac5b7903 Merge pull request #12681 from hqhq/hq_fix_test_in_apiserver 
fix test case name
 2015-04-23 09:21:00 -07:00
Simei He d456401fe1 remove job from push 
Signed-off-by: Simei He <hesimei@zju.edu.cn>

Signed-off-by: He Simei <hesimei@zju.edu.cn>
 2015-04-23 21:21:56 +08:00
Zhang Wei ab42a3a23a 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>
 2015-04-23 19:37:47 +08:00
Simei He 70bb0d8ed7 remove job from load 
Signed-off-by: Simei He <hesimei@zju.edu.cn>

Signed-off-by: He Simei <hesimei@zju.edu.cn>
 2015-04-23 19:13:12 +08:00
Qiang Huang a8d2fbe7b4 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>
 2015-04-23 18:41:30 +08:00
Brian Goff 3872272170 Merge pull request #12406 from runcom/remove-job-container-inspect 
Remove job from container_inspect
 2015-04-22 21:05:15 -04:00
Doug Davis 5ea8dc376c Merge pull request #12649 from jlhawn/fix_pull_err_explosion 
Correctly format API error on image pull
 2015-04-22 20:28:24 -04:00
Antonio Murdaca 4b9fe9c298 Remove job from container_inspect 
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
 2015-04-23 00:58:13 +02:00
Josh Hawn fd4f7c4e5c Correctly format API error on image pull 
Docker-DCO-1.1-Signed-off-by: Josh Hawn <josh.hawn@docker.com> (github: jlhawn)
 2015-04-22 14:11:25 -07:00
jianbosun 24425021d2 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>
 2015-04-22 13:51:57 -07:00
Alexander Morozov a2f74aa4b4 Remove chain of engine passing from builder to loadManifest 
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
 2015-04-21 14:55:23 -07:00
Antonio Murdaca 27811355bd Remove writeJSONEnv 
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
 2015-04-21 18:14:39 +02:00
Jessie Frazelle 82f75df9e9 Merge pull request #12457 from calavera/remove_engine_job_builder 
Remove engine.Job from Builder.
 2015-04-20 17:27:17 -07:00
Jessie Frazelle 4bb8924b52 Merge pull request #12539 from WeiZhang555/httpError 
change httpError logic
 2015-04-20 17:26:09 -07:00
David Calavera 3b05005a12 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>
 2015-04-20 14:25:45 -07:00
David Calavera ae4063585e Remove engine.Job from builder.CmdBuildConfig. 
Signed-off-by: David Calavera <david.calavera@gmail.com>
 2015-04-20 13:37:06 -07:00
David Calavera 9a2c009751 Remove engine.Job references from builder.CmdBuild 
Signed-off-by: David Calavera <david.calavera@gmail.com>
 2015-04-20 13:37:04 -07:00
Alexander Morozov da7bca4496 Make all http handlers api.server.Server methods 
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
 2015-04-20 09:45:31 -07:00
Zhang Wei 66239ab5c9 change httpError logic 
Signed-off-by: Zhang Wei <zhangwei555@huawei.com>
Signed-off-by: Zhang Wei <zhangwei198900@gmail.com>
 2015-04-20 23:26:56 +08:00
Alexander Morozov d9ed316522 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>
 2015-04-20 08:13:39 -07:00
Alexander Morozov b5584ec24a Merge pull request #12537 from hqhq/hq_remove_unused_function 
remove unused function in server_unit_test.go
 2015-04-20 07:51:53 -07:00
Hu Keping f4942ed864 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>
 2015-04-20 18:14:06 +08:00
Qiang Huang 641a7ec9ad 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>
 2015-04-20 16:27:47 +08:00
Doug Davis b1d8ae3824 Merge pull request #12358 from ZJU-SEL/remove_job_from_tag 
remove job from tag
 2015-04-19 16:02:28 -04:00
Simei He 99f6309b97 remove job from tag 
Signed-off-by: Simei He <hesimei@zju.edu.cn>
 2015-04-19 18:36:56 +08:00
Brian Goff 055c6dbaef Merge pull request #12490 from LK4D4/carry_12396 
remove job from pull and import
 2015-04-17 15:26:30 -04:00
Simei He 6e38a53f96 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>
 2015-04-17 09:55:02 -07:00
Antonio Murdaca a0bf80fe03 Remove builtins 
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
 2015-04-17 14:27:38 +02:00
Hu Keping b052f7a87c Change log severity for non-tlsverify bind 
closes #12459

Signed-off-by: Hu Keping <hukeping@huawei.com>
 2015-04-17 21:27:58 +08:00
Antonio Murdaca e41192a3f8 Remove job from restart 
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
 2015-04-16 18:50:24 +02:00
Brian Goff de923f59b3 Merge pull request #12253 from calavera/remove_job_from_start_and_create 
Remove engine.Job from Start and Create
 2015-04-15 21:49:25 -04:00
David Calavera 767df67e31 Decode container configurations into typed structures. 
Signed-off-by: David Calavera <david.calavera@gmail.com>
 2015-04-15 10:22:07 -07:00
Qiang Huang f8dc7e8754 Add cpuset-mems support for docker build 
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
 2015-04-15 09:34:12 +08:00
David Calavera 98996a432e Remove engine.Job from Create action. 
Signed-off-by: David Calavera <david.calavera@gmail.com>
 2015-04-14 15:33:12 -07:00
David Calavera 610c436e07 Remove engine.Job from Start action. 
Signed-off-by: David Calavera <david.calavera@gmail.com>
 2015-04-14 15:33:12 -07:00
Phil Estes 5395cdcae5 Merge pull request #12269 from kostickm/12251-remove-not-empty-check 
Remove container name not empty check
 2015-04-14 17:55:13 -04:00
Megan Kostick 98f857772f Remove container name not empty check 
Signed-off-by: Megan Kostick <mkostick@us.ibm.com>
 2015-04-14 11:27:06 -07:00
Hu Keping a0804e8e11 Use local variable err instead of a outer one 
Signed-off-by: Hu Keping <hukeping@huawei.com>
 2015-04-15 00:29:53 +08:00
Evan Hazlett 3509132a6e Merge pull request #12301 from ewindisch/https_links 
Use HTTPS links for URLs in READMEs / comments / docs
 2015-04-13 14:30:53 -04:00
Michael Crosby 6f928be7ef Merge pull request #12320 from runcom/fix-api-resize-exec-resize 
fix api server resize&execResize
 2015-04-13 09:59:11 -07:00
Michael Crosby 33e83d0581 Merge pull request #12279 from runcom/remove-job-commit 
Remove job from commit
 2015-04-13 09:57:54 -07:00
Brian Goff 12eff0c26f Merge pull request #12312 from runcom/remove-job-container-stats 
Remove job from container stats
 2015-04-13 11:58:31 -04:00
Brian Goff a4f98d3225 Merge pull request #12313 from runcom/remove-job-export 
Remove job from export
 2015-04-13 11:57:55 -04:00
Alexander Morozov bfb487dc50 Merge pull request #12304 from runcom/remove-job-logs 
Remove job from logs
 2015-04-13 08:38:46 -07:00
Antonio Murdaca 6b737752e3 Remove job from export 
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
 2015-04-13 15:27:45 +02:00
Antonio Murdaca 3341f3a355 fix api server resize&execResize 
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
 2015-04-13 08:42:12 +02:00
Antonio Murdaca 65a056345c Remove jobs from stats 
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
 2015-04-13 08:33:53 +02:00
Antonio Murdaca 91bfed6049 Remove job from logs 
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
 2015-04-13 08:25:31 +02:00
Doug Davis a54fd325e6 Merge pull request #12305 from runcom/remove-job-exec-inspect 
Remove job from execInspect
 2015-04-12 08:30:38 -04:00
Antonio Murdaca 04cc6c6aa4 Remove job from stop 
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
 2015-04-12 00:41:16 +02:00
Antonio Murdaca 621ee1f6a4 Remove job from execInspect 
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
 2015-04-12 00:15:34 +02:00
Eric Windisch ca37301d54 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>
 2015-04-11 13:31:34 -04:00
Antonio Murdaca c8529fde5f Remove job from commit 
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
 2015-04-11 00:20:45 +02:00
Antonio Murdaca db0ffba3b9 Remove job from wait 
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
 2015-04-10 20:17:02 +02:00
Michael Crosby bae3273ef4 Merge pull request #12259 from duglin/RemoveJobTop 
Remove Job from `docker top`
 2015-04-10 10:56:01 -07:00
Michael Crosby 267bd51adb Merge pull request #12248 from duglin/RemoveJobKill 
Remove Job from `docker kill`
 2015-04-10 10:52:18 -07:00
Hu Keping 5c7c3fea6c Remove Job from History API 
a part of issue #12151

Signed-off-by: Hu Keping <hukeping@huawei.com>
 2015-04-10 21:37:56 +08:00
Doug Davis 3e096cb9c9 Remove Job from `docker top` 
Signed-off-by: Doug Davis <dug@us.ibm.com>
 2015-04-09 18:17:50 -07:00
Doug Davis 3cb751906a Remove Job from `docker kill` 
Signed-off-by: Doug Davis <dug@us.ibm.com>
 2015-04-09 16:06:54 -07:00
Antonio Murdaca e290a22dc9 Remove job from resize&execResize 
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
 2015-04-10 00:56:43 +02:00
Michael Crosby eebfcde0ea Merge pull request #12249 from runcom/remove-job-pause-unpause 
Remove job from pause/unpause
 2015-04-09 15:09:48 -07:00
Antonio Murdaca 5ccb1c764b Remove job from pause/unpause 
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
 2015-04-09 22:50:48 +02:00
Alexander Morozov ccdef895de Removed engine from /copy 
* Client and server use types.CopyConfig
* API calls container.Copy directly

Signed-off-by: Alexander Morozov <lk4d4@docker.com>
 2015-04-09 13:05:31 -07:00
Alexander Morozov 92a775bd7a Merge pull request #12234 from runcom/remove-job-rmi 
Remove job from rmi
 2015-04-09 11:24:20 -07:00
Alexander Morozov 3218f3936d Merge pull request #12197 from runcom/remove-job-rm 
Remove job from rm
 2015-04-09 11:21:52 -07:00
Antonio Murdaca e4afc379dc Remove job from rmi 
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
 2015-04-09 19:39:14 +02:00
Alexander Morozov 0fec3e19db Fix regressions in attach 
* Wrong bool parsing
* Attach always all streams

Were introduced in #12120

Signed-off-by: Alexander Morozov <lk4d4@docker.com>
 2015-04-09 09:58:44 -07:00
Antonio Murdaca db13cb7f98 Remove job from rm 
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
 2015-04-09 18:46:24 +02:00
Alexander Morozov 6ba7bf440e Merge pull request #12184 from duglin/RemoveJobImages 
Remove Job from `docker images`
 2015-04-09 09:19:09 -07:00
Doug Davis 8295bed3df Merge pull request #12207 from WiseTrem/getBoolParam 
Removing unused getBoolParam func from api/server/server.go
 2015-04-09 08:28:48 -07:00
Hu Keping 49c4de4aeb Remove Job from rename 
A part of ISSUE#12151-Remove engine.Job mechanism

Signed-off-by: Hu Keping <hukeping@huawei.com>
 2015-04-10 01:52:55 +08:00
WiseTrem 0fc75a3136 Removing unused getBoolParam func from api/server/server.go 
Fix #12199

Signed-off-by: Gleb Shepelev <shepelyov.g@gmail.com>
 2015-04-09 09:13:16 +03:00
Doug Davis d045b9776b Remove Job from `docker images` 
Also removes engine.Table

Signed-off-by: Doug Davis <dug@us.ibm.com>
 2015-04-08 19:33:01 -07:00
Arnaud Porterie 7233bd223d Merge pull request #12163 from duglin/RemoveJobPS 
Remove Job from PS API
 2015-04-08 13:43:47 -07:00
Doug Davis 1bfa80bdd9 Remove Job from PS API 
Signed-off-by: Doug Davis <dug@us.ibm.com>
 2015-04-08 10:30:17 -07:00
Alexander Morozov 3ebfc99d10 Merge pull request #12066 from LK4D4/split_events 
Remove engine usage from events
 2015-04-08 08:29:24 -07:00
Antonio Murdaca e379e2668c Remove engine.Job from diff 
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
 2015-04-08 15:52:10 +02:00
Tibor Vass dccda72a41 Merge pull request #12120 from LK4D4/split_attach 
Remove engine usage from attach
 2015-04-07 18:13:35 -04:00
Alexander Morozov c44f513248 Remove engine usage from attach 
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
 2015-04-07 14:23:09 -07:00
Alexander Morozov c9eb37f975 Remove engine usage for events 
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
 2015-04-07 08:43:18 -07:00
Doug Davis 650bc2ffe5 Remove engine.Table from more daemon side stuff 
Signed-off-by: Doug Davis <dug@us.ibm.com>
 2015-04-06 15:06:02 -07:00
Shishir Mahajan 7d0053d554 Applying: Fix for Issue 11285: warning message displayed when updating an existing image 
Signed-off-by: Shishir Mahajan <shishir.mahajan@redhat.com>
 2015-04-06 09:05:03 -04:00
Michael Crosby e64f6baf11 Merge pull request #12010 from ibuildthecloud/small 
Small changes from #11967 for review comments
 2015-04-03 11:27:06 -07:00
unclejack 3bea892d54 api/server: fix profiler HTTP serving 
Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com>
 2015-04-02 09:53:40 +03:00
Darren Shepherd 7433c9c92a Make server_windows.go consistent with server_linux.go 
Signed-off-by: Darren Shepherd <darren@rancher.com>
 2015-04-01 17:31:15 -07:00
Darren Shepherd 34f44c642f Infer type 
Signed-off-by: Darren Shepherd <darren@rancher.com>
 2015-04-01 17:31:09 -07:00
Tibor Vass 4467b6a2cb Merge pull request #11974 from crosbymichael/registry-jobs 
Remove jobs from registry.Service
 2015-04-01 16:32:41 -04:00
Michael Crosby 03d3d79b2b Remove jobs from registry.Service 
This makes `registry.Service` a first class type and does not use jobs
to interact with this type.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2015-03-31 16:38:04 -07:00
Jessie Frazelle 596ddef7d7 Merge pull request #11967 from LK4D4/fix_panic 
Avoid ServeApi race condition
 2015-03-31 16:37:32 -07:00
Alexander Morozov c717475714 Fix panic in integration tests 
Closing activationLock only if it's not closed already. This is needed
only because integration tests using docker code directly and doesn't
care about global state.

Signed-off-by: Alexander Morozov <lk4d4@docker.com>
 2015-03-31 15:12:15 -07:00
Michael Crosby 62806cc85e Refactor API socket handling 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2015-03-31 13:37:49 -07:00
Michael Crosby 7609d52797 Move Profiler into specific http.Handler 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2015-03-31 11:38:17 -07:00
Michael Crosby d8c628cf08 Ensure that bridge driver does not use global mappers 
This has a few hacks in it but it ensures that the bridge driver does
not use global state in the mappers, atleast as much as possible at this
point without further refactoring.  Some of the exported fields are
hacks to handle the daemon port mapping but this results in a much
cleaner approach and completely remove the global state from the mapper
and allocator.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2015-03-30 18:28:24 -07:00
Darren Shepherd 8f6a14452d Avoid ServeApi race condition 
If job "acceptconnections" is called before "serveapi" the API Accept()
method will hang forever waiting for activation.  This is due to the fact
that when "acceptconnections" ran the activation channel was nil.

Signed-off-by: Darren Shepherd <darren@rancher.com>
 2015-03-30 17:39:43 -07:00
Michael Crosby fe9f3227b1 Merge pull request #11859 from HuKeping/eof 
Add nice error message
 2015-03-30 13:53:09 -07:00
Jamie Hannaford 8b795a05a8 Use ContainerCommitResponse struct for Commit cmd 
Signed-off-by: Jamie Hannaford <jamie.hannaford@rackspace.com>
 2015-03-28 17:55:45 +01:00
Hu Keping cee62a95a2 Add nice error message 
Generally, when using Remote API to push images there needs a http Header
X-Registry-Auth.
For compatibility if there was no authConfig header, everything will be
okay if a proper JSON-http-body was applied.

But when both X-Registry-Auth Header and the Body are missing, due to
the function of decode JSON, it will return an EOF error which was not
very clear to user.

So I think we can make the respone error be more nice.

Signed-off-by: Hu Keping <hukeping@huawei.com>
 2015-03-28 16:27:30 +08:00
Michael Crosby c088486093 Merge pull request #11845 from lobatt/master 
Issue #11836
 2015-03-27 14:55:04 -07:00
Brian Goff da5c863d20 Merge pull request #11788 from reikani/pchoi 
Changed snake case naming to camelCase.
 2015-03-26 23:55:50 -07:00
chli f581f74209 Issue #11836 
Signed-off-by: chli <chli@freewheel.tv>
 2015-03-26 19:18:23 -04:00
Antonio Murdaca 6f4d847046 Replace aliased imports of logrus, fixes #11762 
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
 2015-03-26 23:22:04 +01:00
Peter Choi ae907e7af1 Changed snake case naming to camelCase 
Signed-off-by: Peter Choi <phkchoi89@gmail.com>
 2015-03-26 15:05:45 -06:00
Alexander Morozov d4fca8047c Merge pull request #11789 from parknicker/PostContainerWaitFix 
Changes response of postContainersWait to use a struct
 2015-03-26 08:40:00 -07:00
Nick Parker 1bc266dfa7 Changes response of postContainersWait to use a struct 
Signed-off-by: Nick Parker <nikaios@gmail.com>
 2015-03-25 21:01:14 -06:00
bobby abbott 0cd6c05d81 Fixes hacks from progressreader refactor 
related to #10959

Signed-off-by: bobby abbott <ttobbaybbob@gmail.com>
 2015-03-25 18:21:02 -07:00
Antonio Murdaca c79b9bab54 Remove engine.Status and replace it with standard go error 
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
 2015-03-25 22:32:08 +01:00
Antonio Murdaca babd1b3e1f Return AuthResponse from postAuth api endpoint, Fixes #11607 
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
 2015-03-24 09:57:01 +01:00
Antonio Murdaca 0c3d2f6f96 Return ContainerExecCreateResponse from container exec start API endpoint, Fixes #11613 
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
 2015-03-24 00:41:54 +01:00
Jessie Frazelle 45ee402a63 Merge pull request #9774 from pwaller/cancellation 
Add basic build cancellation
 2015-03-22 19:16:23 -07:00
Peter Waller 671c12204c Implement build cancellation 
Add the capability to cancel the build by disconnecting the client.

This adds a `cancelled` channel which is used to signal that a build
should halt. The build is halted by sending a Kill signal and noticing
that the cancellation channel is closed.

This first pass implementation does not allow cancellation during a
pull, but that will come in a subsequent PR.

* Add documentation of cancellation to cli and API

* Protect job cancellation with sync.Once

* Add TestBuildCancelationKillsSleep

* Add test case for build cancellation of RUN statements.

Signed-off-by: Peter Waller <p@pwaller.net>
 2015-03-22 11:31:28 +00:00
Brian Goff 16309bef63 Add integration test for unix sock cleanup 
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
 2015-03-20 12:34:35 -04:00
Rik Nijessen 0c0e9836c4 Implement cleanup unix sockets after serving. 
Signed-off-by: Rik Nijessen <riknijessen@gmail.com>
 2015-03-20 09:12:59 -04:00
Brian Goff e6ae89a45a Allow setting resource constrains for build 
Closes #10191

Allow `docker build` to set --cpu-shares, --cpuset, --memory,
--memory-swap for all containers created by the build.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
 2015-03-18 20:57:13 -04:00
Michael Crosby 88f437d6c6 Merge pull request #11402 from miminar/err-cleanup 
Error formatting cleanups
 2015-03-16 16:13:16 -07:00
Michael Crosby 66bf7a269a Merge pull request #11300 from Microsoft/10662_jjh_server_factor_serverfd_and_systemd_for_windows 
Factor out ServeFD & systemd in server for Linux only (Not Windows)
 2015-03-16 14:12:48 -07:00
Michal Minar 210ab030bc Format error by value 
- Use `%v` verb to format errors.
- Give `param` constant in portallocator some better name.

Signed-off-by: Michal Minar <miminar@redhat.com>
 2015-03-16 12:05:53 +01:00
Aidan Hobson Sayers 8ef79ae8e4 Correctly check that gid parses as an int 
Signed-off-by: Aidan Hobson Sayers <aidanhs@cantab.net>
 2015-03-14 23:02:53 +00:00
Aidan Hobson Sayers 334382a8c3 Allow a non-existent groupid to own the docker socket 
Signed-off-by: Aidan Hobson Sayers <aidanhs@cantab.net>
 2015-03-13 18:12:50 +00:00
John Howard (VM) 081c6c76e2 Factor out ServeFD & systemd in server for Linux only (Not Windows) 
Signed-off-by: John Howard <John.Howard@microsoft.com>
 2015-03-10 15:06:16 -07:00
Alexander Morozov c5f9aa18f4 Merge pull request #11219 from icecrime/remove_maintainers_files 
Remove subdirectories MAINTAINERS files
 2015-03-09 09:02:58 -07:00
Arnaud Porterie 89bdaa35e0 Remove subdirectories MAINTAINERS files 
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com>
 2015-03-06 18:21:51 -08:00
Brian Goff 2ea6c2c264 Improve error messages for loading tls keys 
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
 2015-03-06 20:40:09 -05:00
resouer dc0a6c1f5e Rebase & update api doc v1.18 instead 
Signed-off-by: harry zhang <resouer@163.com>
 2015-03-03 12:32:17 +08:00
resouer f3dd2db4ff Add cors header flag and leave boolean flag not changed 
Deprecate api-enable-cors

Update docs & man files

Signed-off-by: harry zhang <resouer@163.com>
 2015-03-03 11:21:19 +08:00
Jessie Frazelle c5ecdfd878 Merge pull request #10971 from Microsoft/10662-api_server_factor_out_windows 
api\server: Factored out UnixHttp on Windows, supported on Linux only.
 2015-03-02 12:40:20 -08:00
Jessie Frazelle 2bfa701f45 Merge pull request #10986 from crosbymichael/create-api-type 
Create api types package for structured responses
 2015-03-02 12:22:02 -08:00
John Howard (VM) 69246e1527 api\server: Factored out UnixHttp on Windows, supported on Linux only. 
Signed-off-by: John Howard <John.Howard@microsoft.com>
 2015-02-25 09:24:34 -08:00
Michael Crosby f57c26553b Add ContainerCreateResponse type 
This type is produced on the server side and is a type safe struct that
can be encoded to json.  It is consumed via the client.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2015-02-24 15:27:49 -08:00
Dan Walsh 17abfc3ddc pass --change changes to the import job 
Docker-DCO-1.1-Signed-off-by: Dan Walsh <dwalsh@redhat.com> (github: rhatdan)
 2015-02-24 13:01:36 -05:00
Daniel, Dao Quang Minh f8e77dfb3d pass --change changes to the commit job 
Docker-DCO-1.1-Signed-off-by: Daniel, Dao Quang Minh <dqminh89@gmail.com> (github: dqminh)

Docker-DCO-1.1-Signed-off-by: Daniel, Dao Quang Minh <dqminh89@gmail.com> (github: rhatdan)
 2015-02-24 13:01:35 -05:00
mattyw 0ae455333b api/server: don't print warning if serving on localhost 
Fixes bug #10728

Signed-off-by: mattyw <gh@mattyw.net>
 2015-02-20 12:37:17 +08:00
Michael Crosby 34c804a139 Merge pull request #9705 from acbodine/9311-truncindex-error-duplicate-id-on-ambiguous-id 
Closes #9311 Handles container id/name collisions against daemon functionalities according to #8069
 2015-02-06 14:01:28 -08:00
Derek McGowan 403d981d70 Revert client signature 
Supports multiple tag push with daemon signature

Fixes #10444

Signed-off-by: Derek McGowan <derek@mcgstyle.net> (github: dmcgowan)
 2015-01-30 14:20:32 -08:00
Andrew C. Bodine d25a65375c Closes #9311 Handles container id/name collisions against daemon functionalities according to #8069 
Signed-off-by: Andrew C. Bodine <acbodine@us.ibm.com>
 2015-01-21 17:11:31 -08:00
Michael Crosby 65f58e2a74 Implement container stats collection in daemon 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2015-01-20 20:21:46 -08:00
Derek McGowan 188b56c836 Push flow 
Signed-off-by: Derek McGowan <derek@mcgstyle.net> (github: dmcgowan)
 2015-01-15 14:05:05 -08:00
Pierre Wacrenier 02923d43e2 Remove error return type from createRouter and ServeRequest 
Signed-off-by: Pierre Wacrenier <pierre.wacrenier@gmail.com>
 2015-01-13 22:43:31 +01:00
Srini Brahmaroutu 21a809d9ae rename a existing container 
Closes #3036

Signed-off-by: Srini Brahmaroutu <srbrahma@us.ibm.com>
 2015-01-13 03:27:17 +00:00
Doug Davis eb3ea3b43c Allow for Dockerfile to be named something else. 
Add a check to make sure Dockerfile is in the build context
Add docs and a testcase
Make -f relative to current dir, not build context

Signed-off-by: Doug Davis <dug@us.ibm.com>
 2015-01-06 16:33:26 -08:00
Michael Crosby 305c898cd7 Merge pull request #9795 from LK4D4/update_libcontainer 
Update libcontainer to 1597c68f7b941fd97881155d7f077852e2914e7b
 2014-12-23 15:41:26 -08:00
Alexander Morozov 50905a6d6c Update libcontainer to 1597c68f7b941fd97881155d7f077852e2914e7b 
This commit contains changes for docker:
* user.GetGroupFile to user.GetGroupPath docker/libcontainer#301
* Add systemd support for OOM docker/libcontainer#307
* Support for custom namespaces docker/libcontainer#279, docker/libcontainer#312
* Fixes #9699 docker/libcontainer#308

Signed-off-by: Alexander Morozov <lk4d4@docker.com>
 2014-12-23 12:10:03 -08:00
Johan Euphrosine 4fd2a9156c api/server: commenting proppy from maintainer 
Signed-off-by: Johan Euphrosine <proppy@google.com>
 2014-12-23 11:01:27 -08:00
Michael Crosby 21bba5d93a Merge pull request #9181 from icecrime/allocate_daemon_ports 
Allocate daemon listening ports
 2014-12-17 18:01:20 -08:00
Jean-Tiare Le Bigot c230f70413 Set HTTP upgrade header only when requested by client 
Signed-off-by: Jean-Tiare Le Bigot <jt@yadutaf.fr>
 2014-12-15 21:05:59 +01:00
Jean-Tiare Le Bigot 9256578f62 Set HTTP upgrade headers when hijacking connection 
Signed-off-by: Jean-Tiare Le Bigot <jt@yadutaf.fr>
 2014-12-13 14:24:51 +01:00
Jörg Thalheim a25168d28d Fix interactive TLS postContainersAttach 
related to 266a1044de

Signed-off-by: Jörg Thalheim <joerg@higgsboson.tk>
 2014-12-10 08:57:38 +01:00
Arnaud Porterie 266a1044de Fix interactive exec over TLS 
The code no longer assumes a net.TCPConn underlying the HTTP connection
in order to close attached streams.

Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com>
 2014-12-03 23:43:03 -08:00
Huayi Zhang 51172493ab Attach goroutine blocking profiler 
/debug/pprof/block is 404 currently

Signed-off-by: Huayi Zhang <irachex@gmail.com>
 2014-12-01 16:46:59 +08:00
Jessie Frazelle 00c2a8f323 Merge pull request #9208 from duglin/Issue8703 
Add support for docker exec to return cmd exitStatus
 2014-11-25 18:03:51 -08:00
Jessie Frazelle 9160e01cef Merge pull request #8893 from vieux/filter_events 
Events filtering (daemon side)
 2014-11-25 17:52:27 -08:00
Doug Davis 90928eb114 Add support for docker exec to return cmd exitStatus 
Note - only support the non-detached mode of exec right now.
Another PR will add -d support.

Closes #8703

Signed-off-by: Doug Davis <dug@us.ibm.com>
 2014-11-25 17:49:25 -08:00
unclejack 054e57a622 build: add pull flag to force image pulling 
Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com>
 2014-11-21 19:59:44 +02:00
Victor Vieux 7ff3b81054 events filtering 
Signed-off-by: Victor Vieux <vieux@docker.com>
 2014-11-20 19:46:48 +00:00
Arnaud Porterie 7c225333f2 Allocate daemon listening ports 
Mark the daemon listening ports as allocated in the portallocator in
order to prevent containers from exposing this port themselves.

Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com>
 2014-11-19 23:34:27 -08:00
Victor Vieux f676891192 Merge pull request #8905 from 13W/x-registry-auth 
allow to use x-registry-auth header with enabled cors
 2014-11-18 17:21:22 -08:00
Alexandr Morozov e12572f265 Merge pull request #9031 from cpuguy83/cleanup_api_server_creation 
Cleanup api server creation
 2014-11-12 15:37:34 -08:00
Brian Goff dacae746b7 Cleanup api server creation 
Current implementation is hard to reason about because of trying to mix
unix/tcp server implementations, even though they are quite different.
This cleans that up.

Also makes it possible to create and manage a new API server easily,
e.g. for adding an introspection socket to a container.

Built in such a way as to allow a non-HTTP server to work as well, such
as libchan.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
 2014-11-10 16:20:35 -05:00
Aleksa Sarai 3ac4aa0d6b *: transition to new libcontainer/user API 
This patch fixes the compilation errors in Docker due to changes in the
libcontainer/user API. There is no functionality change due to this
patch.

Signed-off-by: Aleksa Sarai <cyphar@cyphar.com> (github: cyphar)
 2014-11-08 10:03:12 +11:00
Vladimir Bulyga f12b7b4bc2 allow to use x-registry-auth header with enabled cors 
Signed-off-by: Vladimir Bulyga <xx@ccxx.cc>
 2014-11-01 19:22:28 +03:00
Alexandr Morozov 7c62cee51e Use logrus everywhere for logging 
Fixed #8761

Signed-off-by: Alexandr Morozov <lk4d4@docker.com>
 2014-10-24 15:03:06 -07:00
Phil Estes 9b430f4ec1 Fix error string mapping to HTTP response code to ignore case 
Docker-DCO-1.1-Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com> (github: estesp)
 2014-10-23 13:34:06 -04:00
Tibor Vass 9df3e45ba9 Merge pull request #8423 from unclejack/lint_changes 
lint changes part 1
 2014-10-21 12:15:58 -04:00
Daniel, Dao Quang Minh 7a062b2b8f Avoid fallback to SSL protocols < TLS1.0 
Signed-off-by: Tibor Vass <teabee89@gmail.com>

Docker-DCO-1.1-Signed-off-by: Daniel, Dao Quang Minh <dqminh89@gmail.com> (github: dqminh)
 2014-10-15 22:39:51 -04:00
Jessica Frazelle b66ac6a809 Revert "Fix line delimited JSON response" 
This reverts commit d2f75a3040.

Conflicts:
	integration-cli/docker_api_events_test.go

Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
 2014-10-09 13:46:21 -07:00
Jessica Frazelle 4c6b7cd1b5 Revert "Change content-type for json stream to application/x-json-stream." 
This reverts commit 10ab2089ce.

Conflicts:
	api/client/utils.go
	docs/sources/reference/api/docker_remote_api.md

Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
 2014-10-09 13:17:47 -07:00
unclejack 39fe2a3e4e pkg/truncindex: lint and add comments 
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)
 2014-10-06 22:00:58 +03:00
Tonis Tiigi 30d6ff99fc Fix streaming JSON Content-type for postBuild 
See #8101

lineDelim is used by streamJSON() so it needs to be set
before its called.

Signed-off-by: Tõnis Tiigi <tonistiigi@gmail.com> (github: tonistiigi)
 2014-10-06 19:20:10 +03:00
Brian Goff 86bfb9bca6 Fix #6231 - Accept chunked encoding on start 
Docker-DCO-1.1-Signed-off-by: Brian Goff <cpuguy83@gmail.com> (github: cpuguy83)
 2014-10-03 14:18:25 -04:00
Vishnu Kannan 021ecb1d13 Adding exec remote API documentation along with minor code cleanup. 
Docker-DCO-1.1-Signed-off-by: Vishnu Kannan <vishnuk@google.com> (github: vishh)
 2014-09-30 18:26:58 +00:00
Johan Euphrosine 8019eec681 api/server/MAINTAINERS: back from vacation 
Docker-DCO-1.1-Signed-off-by: Johan Euphrosine <proppy@google.com> (github: proppy)
 2014-09-29 10:03:07 -07:00
Doug Davis e2b8d4bd4a Add checks for app/json - issue #2515 
Signed-off-by: Doug Davis <dug@us.ibm.com>
 2014-09-25 08:54:48 -07:00
Jessica Frazelle 10ab2089ce Change content-type for json stream to application/x-json-stream. 
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
 2014-09-22 10:29:56 -07:00
unclejack 1f03e60c2a move stdcopy to pkg/stdcopy 
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)
 2014-09-17 18:06:17 +03:00
Alexandr Morozov 00fd008170 Merge pull request #8062 from vishh/run_in_phase2 
Add support for 'docker exec' - phase 2
 2014-09-16 23:56:12 +04:00
Vishnu Kannan c786a8ee5e Adding docker exec support in CLI. 
Fixed a bug in daemon that resulted in accessing of a closed pipe.

Docker-DCO-1.1-Signed-off-by: Vishnu Kannan <vishnuk@google.com> (github: vishh)
 2014-09-16 19:24:25 +00:00
Vishnu Kannan bfebdfde78 Splitting the exec remote API into two separate APIs inorder to support resizing of tty sessions. 
1. /container/<name>/exec - Creates a new exec command instance in the daemon and container '<name>'. Returns an unique ID for each exec command.
2. /exec/<name>/start - Starts an existing exec command instance. Removes the exec command from the daemon once it completes.

Adding /exec/<name>/resize to resize tty session of an exec command.

Docker-DCO-1.1-Signed-off-by: Vishnu Kannan <vishnuk@google.com> (github: vishh)
 2014-09-15 22:56:47 +00:00