0ct0pu5/moby
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
48972 commits 14 branches 412 tags 338 MiB
Commit graph

1374 commits

Author SHA1 Message Date
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