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

3832 commits

Author SHA1 Message Date
Tibor Vass
ddbc68f564 Merge pull request #11843 from ahmetalpbalkan/win-cli/monitorttysize 
windows: monitorTtySize correctly by polling
 2015-03-31 11:14:04 -04: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
Michael Crosby
00a15227f8 Merge pull request #11893 from runcom/11892-refactor-utils-flags 
Refactor utils/flags.go
 2015-03-30 13:35:40 -07:00
Antonio Murdaca
5670c6c695 Refactor utils/flags.go, fixes #11892 
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
 2015-03-29 03:22:46 +02: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
Lei Jitang
013fb87543 Fix error from daemon no such image even when the image exist 
Signed-off-by: Lei Jitang <leijitang@huawei.com>
 2015-03-28 09:07:20 +08:00
Michael Crosby
c088486093 Merge pull request #11845 from lobatt/master 
Issue #11836
 2015-03-27 14:55:04 -07:00
Ankush Agarwal
6d21b2ba80 Replace fmt.Fprint* with io.WriteString 
This fixes vet warnings in api/client/stats.go

Fixes #11825

Signed-off-by: Ankush Agarwal <ankushagarwal11@gmail.com>
 2015-03-27 13:08:20 -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
Ahmet Alp Balkan
ebbceea8a7 windows: monitorTtySize correctly by polling 
This change makes `monitorTtySize` work correctly on windows by polling
into win32 API to get terminal size (because there's no SIGWINCH on
windows) and send it to the engine over Remove API properly.

Average getttysize syscall takes around 30-40 ms on an average windows
machine as far as I can tell, therefore in a `for` loop, checking every
250ms if size has changed or not.

I'm not sure if there's a better way to do it on windows, if so,
somebody please send a link 'cause I could not find.

Signed-off-by: Ahmet Alp Balkan <ahmetalpbalkan@gmail.com>
 2015-03-26 16:08:05 -07: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
Don Kjer
6b2eeaf896 Fix for issue 9922: private registry search with auth returns 401 
Signed-off-by: Don Kjer <don.kjer@gmail.com>
 2015-03-26 18:59:16 +00:00
Michael Crosby
708ed9d87a Merge pull request #11766 from peggyl/11596-api-commands-godoc 
Add godoc-style docstrings to Cmd... methods
 2015-03-26 10:58:35 -07:00
Alexander Morozov
b9d19fdaef Merge pull request #11786 from peggyl/golint-api-client 
Fix golint errors for casing in api/client package
 2015-03-26 09:28:33 -07: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
89d63d2a82 fixes comment for ContainerWaitResponse struct 
Signed-off-by: Nick Parker <nikaios@gmail.com>
 2015-03-25 22:22:58 -06:00
Peggy Li
2a5a402c71 Update CmdCommit docstring and fix CmdHelp whitespace 
Signed-off-by: Peggy Li <peggyli.224@gmail.com>
 2015-03-25 20:07: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
Peggy Li
a465e26bb0 Fix golint errors for casing in api/client package 
Signed-off-by: Peggy Li <peggyli.224@gmail.com>
 2015-03-25 19:54:29 -07: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
Arnaud Porterie
e589dc7424 Merge pull request #11757 from ankushagarwal/Fds 
Rename 'Fds' to 'File Descriptors' in docker info
 2015-03-25 16:24:57 -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
Peggy Li
b5d0380108 Add godoc-style docstrings to Cmd... methods 
Signed-off-by: Peggy Li <peggyli.224@gmail.com>
 2015-03-25 14:17:11 -07:00
Ankush Agarwal
161c2e5e74 Rename Fds to File Descriptors in docker info 
This makes the docker info more readable. Also change a log line
in a test file renaming Fds

Signed-off-by: Ankush Agarwal <ankushagarwal11@gmail.com>
 2015-03-25 12:04:15 -07:00
Doug Davis
0d65069a17 Fix login 
Right now it returns:
```
FATA[0001] json: Unmarshal(non-pointer types.AuthResponse)
```

Signed-off-by: Doug Davis <dug@us.ibm.com>
 2015-03-25 08:45:14 -07:00
Joey Gibson
58690c9cca api/client - The code for all cli commands are in one file #11610 
Signed-off-by: Joey Gibson <joey@joeygibson.com>
 2015-03-24 23:57:23 -04:00
Michael Crosby
73dab8205a Merge pull request #11679 from avidas/api-common-constants-document 
Add comments to api/common constants
 2015-03-24 14:43:09 -07:00
Michael Crosby
8eee55a35c Merge pull request #11710 from runcom/11599-refactor-pkg-common 
Refactor pkg/common, Fixes #11599
 2015-03-24 11:45:07 -07:00
Antonio Murdaca
b80fae7356 Refactor pkg/common, Fixes #11599 
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
 2015-03-24 18:19:59 +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
Avi Das
c136591f40 Add comments to api/common constants, closes #11583 
Signed-off-by: Avi Das <andas222@gmail.com>
 2015-03-23 22:35:41 -05:00
Jessie Frazelle
e6b7d93072 Merge pull request #11665 from runcom/11613-api-exec-start-structured-response 
Return ContainerExecCreateResponse from container exec create API endpoint
 2015-03-23 17:52:15 -07:00
Jessie Frazelle
d5eea4e8b0 Merge pull request #11636 from robertabbott/refactor_networkfs 
Refactor pkg/networkfs
 2015-03-23 16:58:29 -07: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
Alexander Morozov
197a3f0a98 Merge pull request #11570 from runcom/9658-consistent-autoremove 
Remove container if --rm flag is passed and container cannot be started
 2015-03-23 15:38:51 -07:00
Alexander Morozov
bd95202161 Merge pull request #11406 from MabinGo/CmdStart_fix 
Fix hanging up problem when start and attach multiple containers at once
 2015-03-23 10:17:50 -07:00
Antonio Murdaca
d124197cc7 Remove container if --rm flag is passed and container cannot be started 
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
 2015-03-23 13:03:31 +01:00
bobby abbott
a91b2431a3 Refactor pkg/networkfs 
Solves #11591

Signed-off-by: bobby abbott <ttobbaybbob@gmail.com>
 2015-03-22 23:53:47 -07:00
Mabin
7dc1af146d Fix hanging up problem when start and attach multiple containers 
Signed-off-by: Mabin <bin.ma@huawei.com>
 2015-03-23 12:10:22 +08:00
Jessie Frazelle
45ee402a63 Merge pull request #9774 from pwaller/cancellation 
Add basic build cancellation
 2015-03-22 19:16:23 -07:00
Arnaud Porterie
e09ead98ef Merge pull request #11566 from tiborvass/carry-10864 
Carry 10864: ANSI terminal emulation for windows
 2015-03-22 18:21:32 -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
Doug Davis
c536e5bfb4 Merge pull request #11397 from ahmetalpbalkan/win-cli/build-warning 
Add cli build warning about chmod bits on windows
 2015-03-20 19:19:38 -04:00
Ahmet Alp Balkan
4a8b3cad60 Add cli build warning about chmod bits on windows 
This shows a warning message about adjusted file/directory permission bits
when the `docker build` cli command is executed on windows.

Signed-off-by: Ahmet Alp Balkan <ahmetalpbalkan@gmail.com>
 2015-03-20 20:13:32 +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