p4u1/docker-cli
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
14,541 Commits 2 Branches 295 Tags
ac0bbebed03fa1af49d76da8ea759d08d7f85ed1
Commit Graph

188 Commits

Author SHA1 Message Date
Arnaud Porterie
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
Doug Davis
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
Alexander Morozov
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
Antonio Murdaca
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
Tibor Vass
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
Alexander Morozov
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
Alexander Morozov
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
Doug Davis
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
Shishir Mahajan
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
Michael Crosby
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
unclejack
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
Darren Shepherd
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
Darren Shepherd
acae61c8ad Infer type 
Signed-off-by: Darren Shepherd <darren@rancher.com>
Upstream-commit: 34f44c642faa94ae5d5677d49f690533c67cdf5e
Component: engine
 2015-04-01 17:31:09 -07:00
Tibor Vass
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
Michael Crosby
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
Jessie Frazelle
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
Alexander Morozov
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
Michael Crosby
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
Michael Crosby
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
Michael Crosby
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
Darren Shepherd
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
Michael Crosby
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
Jamie Hannaford
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
Hu Keping
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
Michael Crosby
a44788dbfa Merge pull request #11845 from lobatt/master 
Issue #11836
Upstream-commit: c0884860931273ef26bc26fb7d97081b3ae2aaef
Component: engine
 2015-03-27 14:55:04 -07:00
Brian Goff
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
chli
8de06741d7 Issue #11836 
Signed-off-by: chli <chli@freewheel.tv>
Upstream-commit: f581f742095e4b01b73e391546ee11323f8b5fd7
Component: engine
 2015-03-26 19:18:23 -04:00
Antonio Murdaca
e5b36a723c Replace aliased imports of logrus, fixes #11762 
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
Upstream-commit: 6f4d847046cb4e072de61d042c0266190d73a8c9
Component: engine
 2015-03-26 23:22:04 +01:00
Peter Choi
0913f2905d Changed snake case naming to camelCase 
Signed-off-by: Peter Choi <phkchoi89@gmail.com>
Upstream-commit: ae907e7af16136225417242ef5d55d3f6062fb3b
Component: engine
 2015-03-26 15:05:45 -06:00
Alexander Morozov
db74987998 Merge pull request #11789 from parknicker/PostContainerWaitFix 
Changes response of postContainersWait to use a struct
Upstream-commit: d4fca8047cc4b4b3bf21900c34169ee99cb17ad8
Component: engine
 2015-03-26 08:40:00 -07:00
Nick Parker
bfdce6caee Changes response of postContainersWait to use a struct 
Signed-off-by: Nick Parker <nikaios@gmail.com>
Upstream-commit: 1bc266dfa714f097cc9babf2f0c771566388d47b
Component: engine
 2015-03-25 21:01:14 -06:00
bobby abbott
0ee1e9f604 Fixes hacks from progressreader refactor 
related to #10959

Signed-off-by: bobby abbott <ttobbaybbob@gmail.com>
Upstream-commit: 0cd6c05d8112e9246b734107d54e2855e3d5fec5
Component: engine
 2015-03-25 18:21:02 -07:00
Antonio Murdaca
a16f3d6cb4 Remove engine.Status and replace it with standard go error 
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
Upstream-commit: c79b9bab541673af121d829ebc3b29ff1b01efa2
Component: engine
 2015-03-25 22:32:08 +01:00
Antonio Murdaca
287b673e43 Return AuthResponse from postAuth api endpoint, Fixes #11607 
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
Upstream-commit: babd1b3e1fd7be7674f6e96f264b1b841aeba3b9
Component: engine
 2015-03-24 09:57:01 +01:00
Antonio Murdaca
a82b5988e8 Return ContainerExecCreateResponse from container exec start API endpoint, Fixes #11613 
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
Upstream-commit: 0c3d2f6f9658ae9b1e7c7cc6f7fda730d4b04898
Component: engine
 2015-03-24 00:41:54 +01:00
Jessie Frazelle
088f0e2cb3 Merge pull request #9774 from pwaller/cancellation 
Add basic build cancellation
Upstream-commit: 45ee402a631a59e2a33df7b2f63a49f6f3f84f09
Component: engine
 2015-03-22 19:16:23 -07:00
Peter Waller
7c1bfa9093 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>
Upstream-commit: 671c12204cb469d868f646da1474d5bad6541770
Component: engine
 2015-03-22 11:31:28 +00:00
Brian Goff
449ca606a0 Add integration test for unix sock cleanup 
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Upstream-commit: 16309bef6395a50ee2871780b81caed8bc6c498e
Component: engine
 2015-03-20 12:34:35 -04:00
Rik Nijessen
e274da0bb7 Implement cleanup unix sockets after serving. 
Signed-off-by: Rik Nijessen <riknijessen@gmail.com>
Upstream-commit: 0c0e9836c4bed0190718b0ddd0028790b19c200c
Component: engine
 2015-03-20 09:12:59 -04:00
Brian Goff
5e80a64076 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>
Upstream-commit: e6ae89a45a699bd44f03517396777e34ec76018b
Component: engine
 2015-03-18 20:57:13 -04:00
Michael Crosby
7a404617a3 Merge pull request #11402 from miminar/err-cleanup 
Error formatting cleanups
Upstream-commit: 88f437d6c619f7b07a22cb5750814bce4d8d7164
Component: engine
 2015-03-16 16:13:16 -07:00
Michael Crosby
1902f8ca99 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)
Upstream-commit: 66bf7a269a29c1058384727ec852024198a5db77
Component: engine
 2015-03-16 14:12:48 -07:00
Michal Minar
c29e43cc4b 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>
Upstream-commit: 210ab030bc3dab7bcf8f7252f2f9facb5a26cb6b
Component: engine
 2015-03-16 12:05:53 +01:00
Aidan Hobson Sayers
9bd1fc5995 Correctly check that gid parses as an int 
Signed-off-by: Aidan Hobson Sayers <aidanhs@cantab.net>
Upstream-commit: 8ef79ae8e42ae020a373712bd7d08bcb81e3fa97
Component: engine
 2015-03-14 23:02:53 +00:00
Aidan Hobson Sayers
b9f12f801a Allow a non-existent groupid to own the docker socket 
Signed-off-by: Aidan Hobson Sayers <aidanhs@cantab.net>
Upstream-commit: 334382a8c31285689f0b060de81b8f631d928970
Component: engine
 2015-03-13 18:12:50 +00:00
John Howard (VM)
806995e9fe Factor out ServeFD & systemd in server for Linux only (Not Windows) 
Signed-off-by: John Howard <John.Howard@microsoft.com>
Upstream-commit: 081c6c76e2e9924159e1d320525048e4657a9e74
Component: engine
 2015-03-10 15:06:16 -07:00
Alexander Morozov
102aaf6e25 Merge pull request #11219 from icecrime/remove_maintainers_files 
Remove subdirectories MAINTAINERS files
Upstream-commit: c5f9aa18f4a09a0ab6743d1e7c2de1ee355461cc
Component: engine
 2015-03-09 09:02:58 -07:00
Arnaud Porterie
5506a9a27c Remove subdirectories MAINTAINERS files 
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com>
Upstream-commit: 89bdaa35e04b74b7c6528783e0f7b8154b2a3d31
Component: engine
 2015-03-06 18:21:51 -08:00
Brian Goff
1c4e8d93e0 Improve error messages for loading tls keys 
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Upstream-commit: 2ea6c2c264f0f43beb877a83aea3e6e6ad38ae5d
Component: engine
 2015-03-06 20:40:09 -05:00
resouer
d382609cd2 Rebase & update api doc v1.18 instead 
Signed-off-by: harry zhang <resouer@163.com>
Upstream-commit: dc0a6c1f5edd78d23ab676c54c3e84df3c2b2bbf
Component: engine
 2015-03-03 12:32:17 +08:00