7b57fae046
Merge pull request #13507 from hqhq/hq_remove_redundant_set_header
...
Remove redundant set header
2015-05-27 10:44:57 -07:00
94d604357f
Remove redundant set header
...
Which is already done in writeJSON.
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
2015-05-27 18:25:57 +08:00
7c7aebfcfe
Return err if we got err on parseForm
...
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
2015-05-27 18:16:28 +08:00
ead2f80073
Windows: factor out bridge server+config
...
Signed-off-by: John Howard <jhoward@microsoft.com>
2015-05-23 19:22:06 -07:00
0bfbc6e788
Extract sockets initialization to a package.
...
Because I just used it somewhere else and it would be nice if I didn't have to copy and paste the code.
Signed-off-by: David Calavera <david.calavera@gmail.com>
2015-05-20 16:48:39 -07:00
53a795378d
Merge pull request #13324 from duglin/BadRCOnVersion
...
Make version check return 400 instead of 404
2015-05-20 11:13:56 -07:00
d18919e304
Docker integration with libnetwork
...
- Updated Dockerfile to satisfy libnetwork GOPATH requirements.
- Reworked daemon to allocate network resources using libnetwork.
- Reworked remove link code to also update network resources in libnetwork.
- Adjusted the exec driver command population to reflect libnetwork design.
- Adjusted the exec driver create command steps.
- Updated a few test cases to reflect the change in design.
- Removed the dns setup code from docker as resolv.conf is entirely managed
in libnetwork.
- Integrated with lxc exec driver.
Signed-off-by: Jana Radhakrishnan <mrjana@docker.com>
2015-05-19 22:40:19 +00:00
7fcf849749
Make version check return 400 instead of 404
...
Closes : #13321
Signed-off-by: Doug Davis <dug@us.ibm.com>
2015-05-19 11:21:05 -07:00
b5e932a3bf
Merge pull request #13237 from ahmetalpbalkan/tag/event
...
Introduce daemon event 'tag' upon image tagging
2015-05-16 09:05:03 -07:00
1630ed97ac
Introduce daemon event 'tag' upon image tagging
...
Signed-off-by: Ahmet Alp Balkan <ahmetalpbalkan@gmail.com>
2015-05-15 20:21:59 +00:00
b261ce5fb0
Revert "Fix inconsistent date formats in API"
...
This reverts commit 945fc9d882
2015-05-14 17:31:45 -07:00
ac81cd1fc3
Merge pull request #13202 from duglin/ImportFix
...
Fix a regression in `docker import` on error from URL
2015-05-14 10:36:50 -04:00
3f4926e49b
Fix a regression in `docker import` on error from URL
...
when the daemon can't download the image from a `docker import` the
error message was lost due to 'err' being redefined with a block by
mistake. This removes the ":" from "... err := " which fixes it.
Signed-off-by: Doug Davis <dug@us.ibm.com>
2015-05-14 06:56:52 -07:00
945fc9d882
Fix inconsistent date formats in API
...
Prior to this patch, the response of
- GET /images/json
- GET /containers/json
- GET /images/(name)/history
display the Created Time as UNIX format which doesn't make sense.
These should be more readable as CLI command `docker inspect` shows.
Due to the case that an older client with a newer version daemon, we
need the version check for now.
Signed-off-by: Hu Keping <hukeping@huawei.com>
2015-05-14 18:58:55 +08:00
6b700bdaca
Refactor pkg/stremformatter with custom constructors instead of passing a boolean
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
2015-05-13 00:09:41 +02:00
7284b08204
Remove API codepaths < 1.12
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
2015-05-12 20:09:49 +02:00
3b13e56fd7
Merge pull request #13000 from runcom/refactor-server-to-use-daemon-service-followup
...
Refactor server to use the daemon as a service
2015-05-12 10:27:43 -07:00
e2acca67c8
Move container.WaitStop, AttachWithLogs and WsAttachWithLogs to daemon service in api server
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
2015-05-11 19:56:41 +02:00
cb9a6b9aed
Add --since argument to docker logs cmd
...
Added --since argument to `docker logs` command. Accept unix
timestamps and shows logs only created after the specified date.
Default value is 0 and passing default value or not specifying
the value in the request causes parameter to be ignored (behavior
prior to this change).
Signed-off-by: Ahmet Alp Balkan <ahmetalpbalkan@gmail.com>
2015-05-10 20:42:14 +00:00
c5710c7318
Merge pull request #13093 from tianon/writeflusher
...
Move WriteFlusher out of utils into ioutils
2015-05-09 09:39:17 -07:00
dccb8b5c33
add cpu.cfs_period_us support
...
Signed-off-by: Ma Shimiao <mashimiao.fnst@cn.fujitsu.com>
2015-05-09 10:02:46 +08:00
223d6de728
Move WriteFlusher out of utils into ioutils
...
Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com>
2015-05-08 12:33:33 -06:00
404412282d
Merge pull request #12777 from ZJU-SEL/fix_pull_import_errpromt
...
Fix error prompt for pull & import handler postImagesCreate.
2015-05-07 16:27:15 -07:00
94def48878
Removing the SetDaemon method
...
Signed-off-by: Bharath Thiruveedula <bharath_ves@hotmail.com>
2015-05-07 22:25:13 +05:30
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
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
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
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
a2c76912e0
Rename int64Value to int64ValueOrZero.
...
Signed-off-by: Adria Casas <adriacasas88@gmail.com>
2015-05-05 08:54:28 +02:00
91fb4d672a
Merge pull request #10766 from cpuguy83/stats_pull_once
...
Allow pulling stats once and disconnecting.
2015-05-04 22:28:01 -07:00
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
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
531f4122bd
Remove engine mechanism
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
2015-04-30 01:35:16 +02:00
844538142d
Small if err cleaning
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
2015-04-27 21:50:33 +02:00
572ba9cb40
Merge pull request #12333 from Mashimiao/clean-up-viz
...
Clean up viz code
2015-04-27 14:13:03 -04:00
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
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
5f4fb8be00
Add cpu cfs quota to build
...
Signed-off-by: Lei Jitang <leijitang@huawei.com>
2015-04-24 08:54:08 +08:00
66acef865d
clean up viz code
...
Signed-off-by: Ma Shimiao <mashimiao.fnst@cn.fujitsu.com>
2015-04-24 08:38:14 +08:00
fa2c68a89e
Remove engine/job from graph
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
2015-04-23 23:36:29 +02:00
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
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
2c70288ca6
Merge pull request #12703 from LK4D4/carry_12596
...
remove job from image_export
2015-04-23 14:27:59 -04:00
2345389975
Merge pull request #12687 from WeiZhang555/NotFound
...
refactor httpError() and add 404 "not found" mapping
2015-04-23 11:21:09 -07:00
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
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
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
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
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
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
3872272170
Merge pull request #12406 from runcom/remove-job-container-inspect
...
Remove job from container_inspect
2015-04-22 21:05:15 -04:00
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
4b9fe9c298
Remove job from container_inspect
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
2015-04-23 00:58:13 +02:00
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
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
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
27811355bd
Remove writeJSONEnv
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
2015-04-21 18:14:39 +02:00
82f75df9e9
Merge pull request #12457 from calavera/remove_engine_job_builder
...
Remove engine.Job from Builder.
2015-04-20 17:27:17 -07:00
4bb8924b52
Merge pull request #12539 from WeiZhang555/httpError
...
change httpError logic
2015-04-20 17:26:09 -07:00
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
ae4063585e
Remove engine.Job from builder.CmdBuildConfig.
...
Signed-off-by: David Calavera <david.calavera@gmail.com>
2015-04-20 13:37:06 -07:00
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
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
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
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
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
b1d8ae3824
Merge pull request #12358 from ZJU-SEL/remove_job_from_tag
...
remove job from tag
2015-04-19 16:02:28 -04:00
99f6309b97
remove job from tag
...
Signed-off-by: Simei He <hesimei@zju.edu.cn>
2015-04-19 18:36:56 +08:00
055c6dbaef
Merge pull request #12490 from LK4D4/carry_12396
...
remove job from pull and import
2015-04-17 15:26:30 -04:00
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
a0bf80fe03
Remove builtins
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
2015-04-17 14:27:38 +02:00
e41192a3f8
Remove job from restart
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
2015-04-16 18:50:24 +02:00
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
767df67e31
Decode container configurations into typed structures.
...
Signed-off-by: David Calavera <david.calavera@gmail.com>
2015-04-15 10:22:07 -07:00
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
98996a432e
Remove engine.Job from Create action.
...
Signed-off-by: David Calavera <david.calavera@gmail.com>
2015-04-14 15:33:12 -07:00
610c436e07
Remove engine.Job from Start action.
...
Signed-off-by: David Calavera <david.calavera@gmail.com>
2015-04-14 15:33:12 -07:00
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
98f857772f
Remove container name not empty check
...
Signed-off-by: Megan Kostick <mkostick@us.ibm.com>
2015-04-14 11:27:06 -07:00
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
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
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
33e83d0581
Merge pull request #12279 from runcom/remove-job-commit
...
Remove job from commit
2015-04-13 09:57:54 -07:00
12eff0c26f
Merge pull request #12312 from runcom/remove-job-container-stats
...
Remove job from container stats
2015-04-13 11:58:31 -04:00
a4f98d3225
Merge pull request #12313 from runcom/remove-job-export
...
Remove job from export
2015-04-13 11:57:55 -04:00
bfb487dc50
Merge pull request #12304 from runcom/remove-job-logs
...
Remove job from logs
2015-04-13 08:38:46 -07:00
6b737752e3
Remove job from export
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
2015-04-13 15:27:45 +02:00
3341f3a355
fix api server resize&execResize
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
2015-04-13 08:42:12 +02:00
65a056345c
Remove jobs from stats
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
2015-04-13 08:33:53 +02:00
91bfed6049
Remove job from logs
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
2015-04-13 08:25:31 +02:00
a54fd325e6
Merge pull request #12305 from runcom/remove-job-exec-inspect
...
Remove job from execInspect
2015-04-12 08:30:38 -04:00
04cc6c6aa4
Remove job from stop
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
2015-04-12 00:41:16 +02:00
621ee1f6a4
Remove job from execInspect
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
2015-04-12 00:15:34 +02:00
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
c8529fde5f
Remove job from commit
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
2015-04-11 00:20:45 +02:00
db0ffba3b9
Remove job from wait
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
2015-04-10 20:17:02 +02:00
bae3273ef4
Merge pull request #12259 from duglin/RemoveJobTop
...
Remove Job from `docker top`
2015-04-10 10:56:01 -07:00
267bd51adb
Merge pull request #12248 from duglin/RemoveJobKill
...
Remove Job from `docker kill`
2015-04-10 10:52:18 -07:00
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
3e096cb9c9
Remove Job from `docker top`
...
Signed-off-by: Doug Davis <dug@us.ibm.com>
2015-04-09 18:17:50 -07:00
3cb751906a
Remove Job from `docker kill`
...
Signed-off-by: Doug Davis <dug@us.ibm.com>
2015-04-09 16:06:54 -07:00
e290a22dc9
Remove job from resize&execResize
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
2015-04-10 00:56:43 +02:00
eebfcde0ea
Merge pull request #12249 from runcom/remove-job-pause-unpause
...
Remove job from pause/unpause
2015-04-09 15:09:48 -07:00
5ccb1c764b
Remove job from pause/unpause
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
2015-04-09 22:50:48 +02:00
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
92a775bd7a
Merge pull request #12234 from runcom/remove-job-rmi
...
Remove job from rmi
2015-04-09 11:24:20 -07:00
3218f3936d
Merge pull request #12197 from runcom/remove-job-rm
...
Remove job from rm
2015-04-09 11:21:52 -07:00
e4afc379dc
Remove job from rmi
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
2015-04-09 19:39:14 +02:00
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
db13cb7f98
Remove job from rm
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
2015-04-09 18:46:24 +02:00
6ba7bf440e
Merge pull request #12184 from duglin/RemoveJobImages
...
Remove Job from `docker images`
2015-04-09 09:19:09 -07:00
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
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
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
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
7233bd223d
Merge pull request #12163 from duglin/RemoveJobPS
...
Remove Job from PS API
2015-04-08 13:43:47 -07:00
1bfa80bdd9
Remove Job from PS API
...
Signed-off-by: Doug Davis <dug@us.ibm.com>
2015-04-08 10:30:17 -07:00
3ebfc99d10
Merge pull request #12066 from LK4D4/split_events
...
Remove engine usage from events
2015-04-08 08:29:24 -07:00
e379e2668c
Remove engine.Job from diff
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
2015-04-08 15:52:10 +02:00
c44f513248
Remove engine usage from attach
...
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
2015-04-07 14:23:09 -07:00
c9eb37f975
Remove engine usage for events
...
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
2015-04-07 08:43:18 -07:00
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
e64f6baf11
Merge pull request #12010 from ibuildthecloud/small
...
Small changes from #11967 for review comments
2015-04-03 11:27:06 -07:00
3bea892d54
api/server: fix profiler HTTP serving
...
Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com>
2015-04-02 09:53:40 +03:00
34f44c642f
Infer type
...
Signed-off-by: Darren Shepherd <darren@rancher.com>
2015-04-01 17:31:09 -07:00
4467b6a2cb
Merge pull request #11974 from crosbymichael/registry-jobs
...
Remove jobs from registry.Service
2015-04-01 16:32:41 -04:00
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
596ddef7d7
Merge pull request #11967 from LK4D4/fix_panic
...
Avoid ServeApi race condition
2015-03-31 16:37:32 -07:00
62806cc85e
Refactor API socket handling
...
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2015-03-31 13:37:49 -07:00
7609d52797
Move Profiler into specific http.Handler
...
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2015-03-31 11:38:17 -07:00
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
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
fe9f3227b1
Merge pull request #11859 from HuKeping/eof
...
Add nice error message
2015-03-30 13:53:09 -07:00
8b795a05a8
Use ContainerCommitResponse struct for Commit cmd
...
Signed-off-by: Jamie Hannaford <jamie.hannaford@rackspace.com>
2015-03-28 17:55:45 +01:00
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
c088486093
Merge pull request #11845 from lobatt/master
...
Issue #11836
2015-03-27 14:55:04 -07:00
f581f74209
Issue #11836
...
Signed-off-by: chli <chli@freewheel.tv>
2015-03-26 19:18:23 -04:00
6f4d847046
Replace aliased imports of logrus, fixes #11762
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
2015-03-26 23:22:04 +01:00
d4fca8047c
Merge pull request #11789 from parknicker/PostContainerWaitFix
...
Changes response of postContainersWait to use a struct
2015-03-26 08:40:00 -07:00
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
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
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
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
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
45ee402a63
Merge pull request #9774 from pwaller/cancellation
...
Add basic build cancellation
2015-03-22 19:16:23 -07:00
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
16309bef63
Add integration test for unix sock cleanup
...
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2015-03-20 12:34:35 -04:00
0c0e9836c4
Implement cleanup unix sockets after serving.
...
Signed-off-by: Rik Nijessen <riknijessen@gmail.com>
2015-03-20 09:12:59 -04:00
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
88f437d6c6
Merge pull request #11402 from miminar/err-cleanup
...
Error formatting cleanups
2015-03-16 16:13:16 -07:00
Alexander Morozov
Qiang Huang
John Howard
David Calavera
Jana Radhakrishnan
Doug Davis
Ahmet Alp Balkan
Victor Vieux
Brian Goff
Hu Keping
Antonio Murdaca
Ma Shimiao
Tianon Gravi
Bharath Thiruveedula
Srini Brahmaroutu
Arnaud Porterie
Adria Casas
Tibor Vass
Julien Barbier
He Simei
Lei Jitang
Jessie Frazelle
Alexander Morozov
Zhang Wei
Doug Davis
Josh Hawn
jianbosun
Phil Estes
Megan Kostick
Evan Hazlett
Michael Crosby
Eric Windisch
WiseTrem
Shishir Mahajan
unclejack
Darren Shepherd
Michael Crosby
Jamie Hannaford
chli
Nick Parker
bobby abbott
Peter Waller
Rik Nijessen