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
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
f947fbc4ae
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 >
Upstream-commit: f3dd2db4ff7de1399a49af928cd3eae4fccf8764
Component: engine
2015-03-03 11:21:19 +08:00
7023b06ad1
Merge pull request #10971 from Microsoft/10662-api_server_factor_out_windows
...
api\server: Factored out UnixHttp on Windows, supported on Linux only.
Upstream-commit: c5ecdfd878d67d0595561a04e4945f60893f8c6f
Component: engine
2015-03-02 12:40:20 -08:00
c6435e1b51
Merge pull request #10986 from crosbymichael/create-api-type
...
Create api types package for structured responses
Upstream-commit: 2bfa701f45b55fbfd7e5d5a1d6fa45a8d84cd19a
Component: engine
2015-03-02 12:22:02 -08:00
d7d038bd8a
api\server: Factored out UnixHttp on Windows, supported on Linux only.
...
Signed-off-by: John Howard <John.Howard@microsoft.com >
Upstream-commit: 69246e15276d7010c00269be140b9fb1a5c11ae5
Component: engine
2015-02-25 09:24:34 -08:00
ab99465eeb
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 >
Upstream-commit: f57c26553b91e16fa3ee6a815943eaf8f29af82b
Component: engine
2015-02-24 15:27:49 -08:00
4e766f5eaa
pass --change changes to the import job
...
Docker-DCO-1.1-Signed-off-by: Dan Walsh <dwalsh@redhat.com > (github: rhatdan)
Upstream-commit: 17abfc3ddc79592753289a8556a343e276fb15b5
Component: engine
2015-02-24 13:01:36 -05:00
280f363541
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)
Upstream-commit: f8e77dfb3de50b3c4f0f8c852389a6ed5bcbcd6e
Component: engine
2015-02-24 13:01:35 -05:00
05600313fd
api/server: don't print warning if serving on localhost
...
Fixes bug #10728
Signed-off-by: mattyw <gh@mattyw.net >
Upstream-commit: 0ae455333b3357f30f27da10557e4d9c006b5ba7
Component: engine
2015-02-20 12:37:17 +08:00
dfd79f3c67
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
Upstream-commit: 34c804a139cc086e9fa6d3f99442f083b6d5e1e7
Component: engine
2015-02-06 14:01:28 -08:00
12b02aa7f6
Revert client signature
...
Supports multiple tag push with daemon signature
Fixes #10444
Signed-off-by: Derek McGowan <derek@mcgstyle.net > (github: dmcgowan)
Upstream-commit: 403d981d70dc8a493a9a10be4b5d2e2ce871f380
Component: engine
2015-01-30 14:20:32 -08:00
685b876322
Closes #9311 Handles container id/name collisions against daemon functionalities according to #8069
...
Signed-off-by: Andrew C. Bodine <acbodine@us.ibm.com >
Upstream-commit: d25a65375c880017ac0c516389b0b7afde810517
Component: engine
2015-01-21 17:11:31 -08:00
947efff180
Implement container stats collection in daemon
...
Signed-off-by: Michael Crosby <crosbymichael@gmail.com >
Upstream-commit: 65f58e2a742205c9e8470b360bd439642a5c8211
Component: engine
2015-01-20 20:21:46 -08:00
6a46693a7d
Push flow
...
Signed-off-by: Derek McGowan <derek@mcgstyle.net > (github: dmcgowan)
Upstream-commit: 188b56c836e49e3c888e1e27e4e26b5cc0f1caaa
Component: engine
2015-01-15 14:05:05 -08:00
a75e2deaba
Remove error return type from createRouter and ServeRequest
...
Signed-off-by: Pierre Wacrenier <pierre.wacrenier@gmail.com >
Upstream-commit: 02923d43e20f7be6c2e1ed48846d188a682ff919
Component: engine
2015-01-13 22:43:31 +01:00
eacdfc7d44
rename a existing container
...
Closes #3036
Signed-off-by: Srini Brahmaroutu <srbrahma@us.ibm.com >
Upstream-commit: 21a809d9ae0ef8392f37c9262dca93ff31966e22
Component: engine
2015-01-13 03:27:17 +00:00
269ee3bcdf
Allow for Dockerfile to be named something else.
...
Add a check to make sure Dockerfile is in the build context
Add docs and a testcase
Make -f relative to current dir, not build context
Signed-off-by: Doug Davis <dug@us.ibm.com >
Upstream-commit: eb3ea3b43c716ad727521a7d0bc20d7321bb0867
Component: engine
2015-01-06 16:33:26 -08:00
2a5b064872
Merge pull request #9795 from LK4D4/update_libcontainer
...
Update libcontainer to 1597c68f7b941fd97881155d7f077852e2914e7b
Upstream-commit: 305c898cd7fa8e7152f3f01cfdc2f5c14b4d35f0
Component: engine
2014-12-23 15:41:26 -08:00
c77458bef6
Update libcontainer to 1597c68f7b941fd97881155d7f077852e2914e7b
...
This commit contains changes for docker:
* user.GetGroupFile to user.GetGroupPath docker/libcontainer#301
* Add systemd support for OOM docker/libcontainer#307
* Support for custom namespaces docker/libcontainer#279, docker/libcontainer#312
* Fixes #9699 docker/libcontainer#308
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
Upstream-commit: 50905a6d6ce2fdd1ab0c33ec0b7a26895e0cbeea
Component: engine
2014-12-23 12:10:03 -08:00
5de3fe398b
api/server: commenting proppy from maintainer
...
Signed-off-by: Johan Euphrosine <proppy@google.com >
Upstream-commit: 4fd2a9156cafba7d0747d7a049eda12aac86daf8
Component: engine
2014-12-23 11:01:27 -08:00
0935b51529
Merge pull request #9181 from icecrime/allocate_daemon_ports
...
Allocate daemon listening ports
Upstream-commit: 21bba5d93a888e20d7fa8d7dd56efbdd1fd486c1
Component: engine
2014-12-17 18:01:20 -08:00
92f0893f9e
Set HTTP upgrade header only when requested by client
...
Signed-off-by: Jean-Tiare Le Bigot <jt@yadutaf.fr >
Upstream-commit: c230f7041302351aed6d5c4ac82b98262d9562ef
Component: engine
2014-12-15 21:05:59 +01:00
15b350dcf5
Set HTTP upgrade headers when hijacking connection
...
Signed-off-by: Jean-Tiare Le Bigot <jt@yadutaf.fr >
Upstream-commit: 9256578f62ffe885befa3ef2dbdd9ec0bea1d7e8
Component: engine
2014-12-13 14:24:51 +01:00
3f619723e5
Fix interactive TLS postContainersAttach
...
related to 266a1044deb9a085ed43dccdc6
Signed-off-by: Jörg Thalheim <joerg@higgsboson.tk >
Upstream-commit: a25168d28d552c33988c1a0f3d6a54355c246566
Component: engine
2014-12-10 08:57:38 +01:00
1c71415b94
Fix interactive exec over TLS
...
The code no longer assumes a net.TCPConn underlying the HTTP connection
in order to close attached streams.
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com >
Upstream-commit: 266a1044deb9a085ed43dccdc6cfa0723e5142b0
Component: engine
2014-12-03 23:43:03 -08:00
cc225fbb9e
Attach goroutine blocking profiler
...
/debug/pprof/block is 404 currently
Signed-off-by: Huayi Zhang <irachex@gmail.com >
Upstream-commit: 51172493ab6d2b31760b9fe273c7d4d0917a9bb7
Component: engine
2014-12-01 16:46:59 +08:00
3253386751
Merge pull request #9208 from duglin/Issue8703
...
Add support for docker exec to return cmd exitStatus
Upstream-commit: 00c2a8f323548b7d0aa54cfd10a594dd93ddbed0
Component: engine
2014-11-25 18:03:51 -08:00
039ddfff8b
Merge pull request #8893 from vieux/filter_events
...
Events filtering (daemon side)
Upstream-commit: 9160e01cefbc4a7dd2ad38167c928c959dde3fad
Component: engine
2014-11-25 17:52:27 -08:00
c28ef478d3
Add support for docker exec to return cmd exitStatus
...
Note - only support the non-detached mode of exec right now.
Another PR will add -d support.
Closes #8703
Signed-off-by: Doug Davis <dug@us.ibm.com >
Upstream-commit: 90928eb1140fc0394e2a79d5e9a91dbc0f02484c
Component: engine
2014-11-25 17:49:25 -08:00
19f9fcbc25
build: add pull flag to force image pulling
...
Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com >
Upstream-commit: 054e57a622e6a065c343806e7334920d17a03c5b
Component: engine
2014-11-21 19:59:44 +02:00
f6afb58177
events filtering
...
Signed-off-by: Victor Vieux <vieux@docker.com >
Upstream-commit: 7ff3b81054b028a4399c86340489fe3937049abe
Component: engine
2014-11-20 19:46:48 +00:00
f04fedef6e
Allocate daemon listening ports
...
Mark the daemon listening ports as allocated in the portallocator in
order to prevent containers from exposing this port themselves.
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com >
Upstream-commit: 7c225333f22378e380309bd0c3afc1b3311b1373
Component: engine
2014-11-19 23:34:27 -08:00
5660f63578
Merge pull request #8905 from 13W/x-registry-auth
...
allow to use x-registry-auth header with enabled cors
Upstream-commit: f676891192670df3e5c79c4612a86186329d658f
Component: engine
2014-11-18 17:21:22 -08:00
4981609d4e
Merge pull request #9031 from cpuguy83/cleanup_api_server_creation
...
Cleanup api server creation
Upstream-commit: e12572f265383fa64b84c2a13fb1c23abfd7335e
Component: engine
2014-11-12 15:37:34 -08:00
bbc96d66b4
Cleanup api server creation
...
Current implementation is hard to reason about because of trying to mix
unix/tcp server implementations, even though they are quite different.
This cleans that up.
Also makes it possible to create and manage a new API server easily,
e.g. for adding an introspection socket to a container.
Built in such a way as to allow a non-HTTP server to work as well, such
as libchan.
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
Upstream-commit: dacae746b70f50dd1f3ea9d40834386b96b6c200
Component: engine
2014-11-10 16:20:35 -05:00
5ab5947fb6
*: transition to new libcontainer/user API
...
This patch fixes the compilation errors in Docker due to changes in the
libcontainer/user API. There is no functionality change due to this
patch.
Signed-off-by: Aleksa Sarai <cyphar@cyphar.com > (github: cyphar)
Upstream-commit: 3ac4aa0d6ba6cb10b9a46df40f18b81dba137840
Component: engine
2014-11-08 10:03:12 +11:00
5e75202137
allow to use x-registry-auth header with enabled cors
...
Signed-off-by: Vladimir Bulyga <xx@ccxx.cc >
Upstream-commit: f12b7b4bc21ff6a64505909a9ba49107877d2ca4
Component: engine
2014-11-01 19:22:28 +03:00
2d56e3cbc6
Use logrus everywhere for logging
...
Fixed #8761
Signed-off-by: Alexandr Morozov <lk4d4@docker.com >
Upstream-commit: 7c62cee51edc91634046b4faa6c6f1841cd53ec1
Component: engine
2014-10-24 15:03:06 -07:00
2a7b8eaaa5
Fix error string mapping to HTTP response code to ignore case
...
Docker-DCO-1.1-Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com > (github: estesp)
Upstream-commit: 9b430f4ec1083d2e73abe4269a85c8cdd91a5ade
Component: engine
2014-10-23 13:34:06 -04:00
d1d44d2d21
Merge pull request #8423 from unclejack/lint_changes
...
lint changes part 1
Upstream-commit: 9df3e45ba985a6ed7e9a07b308d56d694d1c13ad
Component: engine
2014-10-21 12:15:58 -04:00
8091e3851f
Avoid fallback to SSL protocols < TLS1.0
...
Signed-off-by: Tibor Vass <teabee89@gmail.com >
Docker-DCO-1.1-Signed-off-by: Daniel, Dao Quang Minh <dqminh89@gmail.com > (github: dqminh)
Upstream-commit: 7a062b2b8f7751fbb926e6ddc9f7df8a1b281eb6
Component: engine
2014-10-15 22:39:51 -04:00
3b7c4216ab
Revert "Fix line delimited JSON response"
...
This reverts commit d2f75a3040e72562ffa825d5c3efa7004af2640a.
Conflicts:
integration-cli/docker_api_events_test.go
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com > (github: jfrazelle)
Upstream-commit: b66ac6a80990d382a3859cd5ca8c53f038bdc1ff
Component: engine
2014-10-09 13:46:21 -07:00
ffd31097c3
Revert "Change content-type for json stream to application/x-json-stream."
...
This reverts commit 10ab2089ce189d5bea3f7aaac3b5081471309478.
Conflicts:
api/client/utils.go
docs/sources/reference/api/docker_remote_api.md
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com > (github: jfrazelle)
Upstream-commit: 4c6b7cd1b560c72f2c79c28f77644f05b3ee657e
Component: engine
2014-10-09 13:17:47 -07:00
85977c7e75
pkg/truncindex: lint and add comments
...
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com > (github: unclejack)
Upstream-commit: 39fe2a3e4e059c4235f2e1692e240058fccc0ea3
Component: engine
2014-10-06 22:00:58 +03:00
46821ac41b
Fix streaming JSON Content-type for postBuild
...
See #8101
lineDelim is used by streamJSON() so it needs to be set
before its called.
Signed-off-by: Tõnis Tiigi <tonistiigi@gmail.com > (github: tonistiigi)
Upstream-commit: 30d6ff99fc6a22937b21bd9f35610d5f74a9b6e7
Component: engine
2014-10-06 19:20:10 +03:00
fce5950bb6
Fix #6231 - Accept chunked encoding on start
...
Docker-DCO-1.1-Signed-off-by: Brian Goff <cpuguy83@gmail.com > (github: cpuguy83)
Upstream-commit: 86bfb9bca6a5e1e78b01741b076505c137f52673
Component: engine
2014-10-03 14:18:25 -04:00
1dd6380138
Adding exec remote API documentation along with minor code cleanup.
...
Docker-DCO-1.1-Signed-off-by: Vishnu Kannan <vishnuk@google.com > (github: vishh)
Upstream-commit: 021ecb1d1355e8291a5a872c761a1e367072e308
Component: engine
2014-09-30 18:26:58 +00:00
f1fc2d14e1
api/server/MAINTAINERS: back from vacation
...
Docker-DCO-1.1-Signed-off-by: Johan Euphrosine <proppy@google.com > (github: proppy)
Upstream-commit: 8019eec68169d35fd4eff78fcceed0f151abfcd7
Component: engine
2014-09-29 10:03:07 -07:00
f5181e9a50
Add checks for app/json - issue #2515
...
Signed-off-by: Doug Davis <dug@us.ibm.com >
Upstream-commit: e2b8d4bd4a77426b555bb1e6f57fc27f04f6c84b
Component: engine
2014-09-25 08:54:48 -07:00
