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
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
7e0beddb7a
Remove job from resize&execResize
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja >
Upstream-commit: e290a22dc935c2472e08be7362b7d3b0f6303615
Component: engine
2015-04-10 00:56:43 +02:00
49e1965bf2
Merge pull request #12249 from runcom/remove-job-pause-unpause
...
Remove job from pause/unpause
Upstream-commit: eebfcde0ea459bc9100ddde4b3c4e13a06a472cc
Component: engine
2015-04-09 15:09:48 -07:00
f7db80586a
Remove job from pause/unpause
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja >
Upstream-commit: 5ccb1c764b04449811aa4d8095a9ee609b901cf7
Component: engine
2015-04-09 22:50:48 +02:00
1164c8a3e0
Removed engine from /copy
...
* Client and server use types.CopyConfig
* API calls container.Copy directly
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
Upstream-commit: ccdef895def5e42706e792b4891ad2d06bbf488a
Component: engine
2015-04-09 13:05:31 -07:00
6ece2fa7f9
Merge pull request #12234 from runcom/remove-job-rmi
...
Remove job from rmi
Upstream-commit: 92a775bd7a8a379d92a83cc49bd78ec74d7c126d
Component: engine
2015-04-09 11:24:20 -07:00
f97c21daca
Merge pull request #12197 from runcom/remove-job-rm
...
Remove job from rm
Upstream-commit: 3218f3936dda688ef7bee0b196895d00284d7538
Component: engine
2015-04-09 11:21:52 -07:00
b19229f86e
Remove job from rmi
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja >
Upstream-commit: e4afc379dcee66475f3becb34cd2675f3ee9279c
Component: engine
2015-04-09 19:39:14 +02:00
ea52df6141
Fix regressions in attach
...
* Wrong bool parsing
* Attach always all streams
Were introduced in #12120
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
Upstream-commit: 0fec3e19dbff15b3cd8fa3693f694e34d8dcc5a9
Component: engine
2015-04-09 09:58:44 -07:00
601b29bbae
Remove job from rm
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja >
Upstream-commit: db13cb7f98a30169311cf2e4a80867a94f49d377
Component: engine
2015-04-09 18:46:24 +02:00
c900c31960
Merge pull request #12184 from duglin/RemoveJobImages
...
Remove Job from `docker images`
Upstream-commit: 6ba7bf440ee1604486015f421456668d00e795a2
Component: engine
2015-04-09 09:19:09 -07:00
0eb6cc5ff7
Merge pull request #12207 from WiseTrem/getBoolParam
...
Removing unused getBoolParam func from api/server/server.go
Upstream-commit: 8295bed3df0e92adfa784ed2564ba094202924d4
Component: engine
2015-04-09 08:28:48 -07:00
16b268e23a
Remove Job from rename
...
A part of ISSUE#12151-Remove engine.Job mechanism
Signed-off-by: Hu Keping <hukeping@huawei.com >
Upstream-commit: 49c4de4aebe0ecc3005e56a9ab06b5e43f5b312c
Component: engine
2015-04-10 01:52:55 +08:00
85a5c923c7
Removing unused getBoolParam func from api/server/server.go
...
Fix #12199
Signed-off-by: Gleb Shepelev <shepelyov.g@gmail.com >
Upstream-commit: 0fc75a3136456621c074124819567816420f55bf
Component: engine
2015-04-09 09:13:16 +03:00
8bd8b0185d
Remove Job from docker images
...
Also removes engine.Table
Signed-off-by: Doug Davis <dug@us.ibm.com >
Upstream-commit: d045b9776b5dc16e12b3d7c7558a24cdc5d1aba7
Component: engine
2015-04-08 19:33:01 -07:00
58278c5226
Merge pull request #12163 from duglin/RemoveJobPS
...
Remove Job from PS API
Upstream-commit: 7233bd223d4760af604e619a06c2c9ffe3fa1e22
Component: engine
2015-04-08 13:43:47 -07:00
b3b1e4936b
Remove Job from PS API
...
Signed-off-by: Doug Davis <dug@us.ibm.com >
Upstream-commit: 1bfa80bdd9ac05b01867492d2e6dda668aa7715c
Component: engine
2015-04-08 10:30:17 -07:00
c65fa515f2
Merge pull request #12066 from LK4D4/split_events
...
Remove engine usage from events
Upstream-commit: 3ebfc99d1057d841c1cdd4f19e80fceea5ab380e
Component: engine
2015-04-08 08:29:24 -07:00
f3e1f81e2d
Remove engine.Job from diff
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja >
Upstream-commit: e379e2668cecf8a0f9ef29eb57ee881f4d313d58
Component: engine
2015-04-08 15:52:10 +02:00
c29bb140cc
Merge pull request #12120 from LK4D4/split_attach
...
Remove engine usage from attach
Upstream-commit: dccda72a41638c16b63c166d65a1ed663f01b60c
Component: engine
2015-04-07 18:13:35 -04:00
49e191d0e4
Remove engine usage from attach
...
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
Upstream-commit: c44f513248a8b40b1b2221726c7441881383e919
Component: engine
2015-04-07 14:23:09 -07:00
0d3afdf0c8
Remove engine usage for events
...
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
Upstream-commit: c9eb37f9752d72d9a4280d703368e5e73adfffa1
Component: engine
2015-04-07 08:43:18 -07:00
d5f5705973
Remove engine.Table from more daemon side stuff
...
Signed-off-by: Doug Davis <dug@us.ibm.com >
Upstream-commit: 650bc2ffe545f874adeb3c1d6f54e9158a7d647e
Component: engine
2015-04-06 15:06:02 -07:00
9d18deed31
Applying: Fix for Issue 11285: warning message displayed when updating an existing image
...
Signed-off-by: Shishir Mahajan <shishir.mahajan@redhat.com >
Upstream-commit: 7d0053d554c453f0ec426bde2899dd55a265f09a
Component: engine
2015-04-06 09:05:03 -04:00
dd7175bcb6
Merge pull request #12010 from ibuildthecloud/small
...
Small changes from #11967 for review comments
Upstream-commit: e64f6baf116771b22a3050cf686624dbb6b19f37
Component: engine
2015-04-03 11:27:06 -07:00
842af15e9f
api/server: fix profiler HTTP serving
...
Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com >
Upstream-commit: 3bea892d5458fc627f2ebe26f44a09df018d1fcc
Component: engine
2015-04-02 09:53:40 +03:00
82a7741d14
Make server_windows.go consistent with server_linux.go
...
Signed-off-by: Darren Shepherd <darren@rancher.com >
Upstream-commit: 7433c9c92a9d2b53331f729249ddbbfa70cb76de
Component: engine
2015-04-01 17:31:15 -07:00
acae61c8ad
Infer type
...
Signed-off-by: Darren Shepherd <darren@rancher.com >
Upstream-commit: 34f44c642faa94ae5d5677d49f690533c67cdf5e
Component: engine
2015-04-01 17:31:09 -07:00
80f31b5c3f
Merge pull request #11974 from crosbymichael/registry-jobs
...
Remove jobs from registry.Service
Upstream-commit: 4467b6a2cbb2b075803e4a6cc10672871cb6c323
Component: engine
2015-04-01 16:32:41 -04:00
753b8ae08c
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 >
Upstream-commit: 03d3d79b2b3f8b720fff2d649aff0ef791cff417
Component: engine
2015-03-31 16:38:04 -07:00
ac9aaec491
Merge pull request #11967 from LK4D4/fix_panic
...
Avoid ServeApi race condition
Upstream-commit: 596ddef7d73273103a7b900fa46d4392e1d3e27b
Component: engine
2015-03-31 16:37:32 -07:00
03e99ba9b2
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 >
Upstream-commit: c71747571458bf992c729c483c9509e8182d630b
Component: engine
2015-03-31 15:12:15 -07:00
358cb6ec63
Refactor API socket handling
...
Signed-off-by: Michael Crosby <crosbymichael@gmail.com >
Upstream-commit: 62806cc85e7faee56acc454b67b8f36786472759
Component: engine
2015-03-31 13:37:49 -07:00
c31a2f1ade
Move Profiler into specific http.Handler
...
Signed-off-by: Michael Crosby <crosbymichael@gmail.com >
Upstream-commit: 7609d5279743b47450cc1273ee75504bb6abf8b6
Component: engine
2015-03-31 11:38:17 -07:00
45221d6bfb
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 >
Upstream-commit: d8c628cf082a50c0a2a5e381a21da8279a5462b4
Component: engine
2015-03-30 18:28:24 -07:00
9ef99b3372
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 >
Upstream-commit: 8f6a14452dfd88aedc8ac9577a98c38a555baadc
Component: engine
2015-03-30 17:39:43 -07:00
dfa22e2d7b
Merge pull request #11859 from HuKeping/eof
...
Add nice error message
Upstream-commit: fe9f3227b18504add673b9c62669032c3f17e726
Component: engine
2015-03-30 13:53:09 -07:00
1bfc9627bf
Use ContainerCommitResponse struct for Commit cmd
...
Signed-off-by: Jamie Hannaford <jamie.hannaford@rackspace.com >
Upstream-commit: 8b795a05a8fa8a6f747ee5cc0c087bca9d42199d
Component: engine
2015-03-28 17:55:45 +01:00
9d0d13f217
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 >
Upstream-commit: cee62a95a2086dace52f2492de781aa333abca3b
Component: engine
2015-03-28 16:27:30 +08:00
a44788dbfa
Merge pull request #11845 from lobatt/master
...
Issue #11836
Upstream-commit: c0884860931273ef26bc26fb7d97081b3ae2aaef
Component: engine
2015-03-27 14:55:04 -07:00
1c9316a817
Merge pull request #11788 from reikani/pchoi
...
Changed snake case naming to camelCase.
Upstream-commit: da5c863d20df8c030b3ffc6c4e95f976ed162721
Component: engine
2015-03-26 23:55:50 -07:00
8de06741d7
Issue #11836
...
Signed-off-by: chli <chli@freewheel.tv >
Upstream-commit: f581f742095e4b01b73e391546ee11323f8b5fd7
Component: engine
2015-03-26 19:18:23 -04:00
