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
471b420e47
Merge pull request #11843 from ahmetalpbalkan/win-cli/monitorttysize
...
windows: monitorTtySize correctly by polling
Upstream-commit: ddbc68f564156818b068c6b1b8b3ce61edfaad43
Component: engine
2015-03-31 11:14:04 -04: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
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
f6752519af
Merge pull request #11893 from runcom/11892-refactor-utils-flags
...
Refactor utils/flags.go
Upstream-commit: 00a15227f8c7679a4a5c1f90e61367a3d1be92df
Component: engine
2015-03-30 13:35:40 -07:00
0f80e9e5da
Refactor utils/flags.go, fixes #11892
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja >
Upstream-commit: 5670c6c6954e08575a6c821137a7ea6d9084af93
Component: engine
2015-03-29 03:22:46 +02: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
0544f5e034
Fix error from daemon no such image even when the image exist
...
Signed-off-by: Lei Jitang <leijitang@huawei.com >
Upstream-commit: 013fb87543a47524efba3c371a1d22afe151287c
Component: engine
2015-03-28 09:07:20 +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
7cb8e54ded
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 >
Upstream-commit: 6d21b2ba80e274e49d67e8f3d88bf9b3df567ff5
Component: engine
2015-03-27 13:08:20 -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
73e4fc1db9
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 >
Upstream-commit: ebbceea8a79766b7624dd7970a79054ecf582b6d
Component: engine
2015-03-26 16:08:05 -07:00
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
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
04f472f007
Fix for issue 9922: private registry search with auth returns 401
...
Signed-off-by: Don Kjer <don.kjer@gmail.com >
Upstream-commit: 6b2eeaf8965bac07022752c411b1f8a0f35f9571
Component: engine
2015-03-26 18:59:16 +00:00
4d63ee40bb
Merge pull request #11766 from peggyl/11596-api-commands-godoc
...
Add godoc-style docstrings to Cmd... methods
Upstream-commit: 708ed9d87a5938e03abc019818ca2b42e2995482
Component: engine
2015-03-26 10:58:35 -07:00
137e45c97e
Merge pull request #11786 from peggyl/golint-api-client
...
Fix golint errors for casing in api/client package
Upstream-commit: b9d19fdaef68681186411a8ab2024211dda409d6
Component: engine
2015-03-26 09:28:33 -07:00
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
7938582b08
fixes comment for ContainerWaitResponse struct
...
Signed-off-by: Nick Parker <nikaios@gmail.com >
Upstream-commit: 89d63d2a82e9a4c20696e9e93736a99a10be6c91
Component: engine
2015-03-25 22:22:58 -06:00
953cdb72ca
Update CmdCommit docstring and fix CmdHelp whitespace
...
Signed-off-by: Peggy Li <peggyli.224@gmail.com >
Upstream-commit: 2a5a402c717fa0ff05b7e57e85bf3388ba1ee1a5
Component: engine
2015-03-25 20:07:00 -07:00
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
738874a52d
Fix golint errors for casing in api/client package
...
Signed-off-by: Peggy Li <peggyli.224@gmail.com >
Upstream-commit: a465e26bb05083c247ba74e1092338c43c76be47
Component: engine
2015-03-25 19:54:29 -07:00
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
ea26fe641c
Merge pull request #11757 from ankushagarwal/Fds
...
Rename 'Fds' to 'File Descriptors' in docker info
Upstream-commit: e589dc7424dfad993f1fc646b66fa04306a2df2d
Component: engine
2015-03-25 16:24:57 -07:00
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
ef0a4fa398
Add godoc-style docstrings to Cmd... methods
...
Signed-off-by: Peggy Li <peggyli.224@gmail.com >
Upstream-commit: b5d0380108dde9e96d51bb01821860a0799dee0d
Component: engine
2015-03-25 14:17:11 -07:00
12d1265301
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 >
Upstream-commit: 161c2e5e74e06b863b91d0f325faf083530ae1b8
Component: engine
2015-03-25 12:04:15 -07:00
2f53de071f
Fix login
...
Right now it returns:
```
FATA[0001] json: Unmarshal(non-pointer types.AuthResponse)
```
Signed-off-by: Doug Davis <dug@us.ibm.com >
Upstream-commit: 0d65069a175b08015147ecf57a93f7c16ad4e37c
Component: engine
2015-03-25 08:45:14 -07:00
ff6913868d
api/client - The code for all cli commands are in one file #11610
...
Signed-off-by: Joey Gibson <joey@joeygibson.com >
Upstream-commit: 58690c9cca5995035b721ed6f1337b0ddb932d7a
Component: engine
2015-03-24 23:57:23 -04:00
2ae56c859a
Merge pull request #11679 from avidas/api-common-constants-document
...
Add comments to api/common constants
Upstream-commit: 73dab8205a77320d728d5d77880b2e1109d07a67
Component: engine
2015-03-24 14:43:09 -07:00
4e35bd8884
Merge pull request #11710 from runcom/11599-refactor-pkg-common
...
Refactor pkg/common, Fixes #11599
Upstream-commit: 8eee55a35c8161bde7bee50231b67f8e33dd16e0
Component: engine
2015-03-24 11:45:07 -07:00
1e47557825
Refactor pkg/common, Fixes #11599
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja >
Upstream-commit: b80fae735684406d848b16a0f148a746e17ed25f
Component: engine
2015-03-24 18:19:59 +01:00
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
d3b04844fa
Add comments to api/common constants, closes #11583
...
Signed-off-by: Avi Das <andas222@gmail.com >
Upstream-commit: c136591f40c34de51bbb0691ae69f393ff8b2f0e
Component: engine
2015-03-23 22:35:41 -05:00
bb8cd4ea0b
Merge pull request #11665 from runcom/11613-api-exec-start-structured-response
...
Return ContainerExecCreateResponse from container exec create API endpoint
Upstream-commit: e6b7d9307269973d3dc8ff53cff4e141c47c671e
Component: engine
2015-03-23 17:52:15 -07:00
7074731d32
Merge pull request #11636 from robertabbott/refactor_networkfs
...
Refactor pkg/networkfs
Upstream-commit: d5eea4e8b04074b709d1bbe19b5336504df44446
Component: engine
2015-03-23 16:58:29 -07:00
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
d10460e7af
Merge pull request #11570 from runcom/9658-consistent-autoremove
...
Remove container if --rm flag is passed and container cannot be started
Upstream-commit: 197a3f0a98bbedc1253df3fae42837769871beb1
Component: engine
2015-03-23 15:38:51 -07:00
2ed910fd38
Merge pull request #11406 from MabinGo/CmdStart_fix
...
Fix hanging up problem when start and attach multiple containers at once
Upstream-commit: bd952021613b26b7d8b8d078adda72d9ff6def00
Component: engine
2015-03-23 10:17:50 -07:00
2d5a6d9e9b
Remove container if --rm flag is passed and container cannot be started
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja >
Upstream-commit: d124197cc726a3b69cc3cde8c4d560f3f0e1af9c
Component: engine
2015-03-23 13:03:31 +01:00
4b8e196164
Refactor pkg/networkfs
...
Solves #11591
Signed-off-by: bobby abbott <ttobbaybbob@gmail.com >
Upstream-commit: a91b2431a303f919b0737d95639d8e445124cb23
Component: engine
2015-03-22 23:53:47 -07:00
a1d0fa6752
Fix hanging up problem when start and attach multiple containers
...
Signed-off-by: Mabin <bin.ma@huawei.com >
Upstream-commit: 7dc1af146d24c346ac74c9dcb1df98f9ef51339d
Component: engine
2015-03-23 12:10:22 +08:00
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
bac420baa9
Merge pull request #11566 from tiborvass/carry-10864
...
Carry 10864: ANSI terminal emulation for windows
Upstream-commit: e09ead98ef41d14d7e3d8784a0edf29d4afd60f5
Component: engine
2015-03-22 18:21:32 -07:00
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
632e09a6f3
Merge pull request #11397 from ahmetalpbalkan/win-cli/build-warning
...
Add cli build warning about chmod bits on windows
Upstream-commit: c536e5bfb4e8f501ec27a9cc6d55b64d8f1a1603
Component: engine
2015-03-20 19:19:38 -04:00
638765fe3b
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 >
Upstream-commit: 4a8b3cad6096854027151dfbcfb4b2cd8841ad95
Component: engine
2015-03-20 20:13:32 +00:00
