6aab6b5654
Avoid nil pointer dereference while creating a container with an empty Config
...
Signed-off-by: Antonio Murdaca <runcom@linux.com >
Upstream-commit: 4ce817796e639391f6bc3e338f5a88985daacaca
Component: engine
2015-06-06 20:07:32 +02:00
1ddffd6be6
Merge pull request #13636 from tiborvass/refactor-tls
...
Refactor TLS code with a new `tlsconfig` package
Upstream-commit: efe5c647684d8050ed174e0984d07de0f8489bbd
Component: engine
2015-06-05 10:16:24 -07:00
01de0478de
Refactor TLS code with a new tlsconfig package
...
This patch creates a new `tlsconfig` package to handle creation of
secure-enough TLS configurations for clients and servers.
The package was created by refactoring TLS code in the client and the
daemon. After this patch, it is expected that all code creating TLS
configurations use this `tlsconfig` package for greater security,
consistency and readability.
On the server side, this fixes a bug where --tlsverify was not taken
into account. Now, if specified, it will require the client to
authenticate.
Signed-off-by: Tibor Vass <tibor@docker.com >
Upstream-commit: bfed4b7cc3820ee3a74580aca55d5918bf05eef5
Component: engine
2015-06-05 12:38:38 -04:00
3ebd8c1a62
Fix goroutine leak on logs -f with no output
...
Also noticed potential hang when only stdout or stderr are used with
follow=1
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
Upstream-commit: 0c84604f5458bc38b793e5bcdf86624eef3e3184
Component: engine
2015-06-04 13:56:40 -07:00
736776362e
fix version struct on old versions
...
Signed-off-by: Jessica Frazelle <princess@docker.com >
Upstream-commit: 229b599259b24b30fdecbb70bdbba417a81e9723
Component: engine
2015-06-03 16:56:50 -07:00
30f311bc4f
Support CloseNotifier for events
...
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
Upstream-commit: 9e7fc245a79535984c3e0dd3d2c4f042e92cdc6a
Component: engine
2015-06-03 11:42:51 -07:00
5276323624
Expose old config field for api < 1.19
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja >
Upstream-commit: 6deaa58ba5f051039643cedceee97c8695e2af74
Component: engine
2015-06-02 23:37:59 +02:00
35a3ad8b0c
Merge pull request #13666 from runcom/13665-kill-signal-wrong-handled
...
Fix wrong kill signal parsing
Upstream-commit: 2de2782fe89cf2793e868161985a3d7f764520df
Component: engine
2015-06-02 09:40:55 -07:00
66c03ea423
Fix wrong kill signal parsing
...
Signed-off-by: Antonio Murdaca <antonio.murdaca@gmail.com >
Upstream-commit: 39eec4c25bce6291534f9524dc52de65787d5b6e
Component: engine
2015-06-02 18:01:19 +02:00
f6a914544f
Merge pull request #13609 from Microsoft/10662-refixserverwindows
...
Windows: Fix windows to match linux after compile break
Upstream-commit: 05b1d02423179a32d9fed4f786af125054caec4c
Component: engine
2015-06-01 17:03:13 -07:00
c1e042a6e9
Merge pull request #13568 from jfrazelle/fix-release-script-for-experimental
...
fix release script for experimental
Upstream-commit: d37aad170ffe75eeaaea07d52863a6159417e5d6
Component: engine
2015-06-01 12:29:45 -04:00
0b80863b93
Windows: Refix server_windows to match linux
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: 2b7569ccc359a1925dbf48f88a2f2a61c277bc32
Component: engine
2015-05-29 21:25:27 -07:00
4f53f1bb13
Merge pull request #13425 from runcom/13421-stats-default-stream
...
Fix regression in stats API endpoint
Upstream-commit: 4389fc8bf975a5df567c8431dda82d19a09733a3
Component: engine
2015-05-29 15:05:21 -07:00
2b62e414ad
Fix regression in stats API endpoint where stream query param default is true
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja >
Upstream-commit: ec97f414657189f2ce95d6b5bda26aa9d206b705
Component: engine
2015-05-29 22:38:36 +02:00
a4e456d439
fix experimental version and release script
...
add api version experimental
Signed-off-by: Jessica Frazelle <princess@docker.com >
Upstream-commit: b372f9f224d2dcc2a7beca55751782060dc9b12f
Component: engine
2015-05-29 10:00:22 -07:00
9a122de919
Make the version mismatch message more explicit.
...
Signed-off-by: Raghuram Devarakonda <draghuram@gmail.com >
Upstream-commit: 7b6f9da52c961da18e2a91c4fcb8f124880244d8
Component: engine
2015-05-28 17:54:48 -04:00
5c975d5605
Merge pull request #13559 from LK4D4/fix_systemd_listen
...
Treat systemd listeners as all other
Upstream-commit: 1f22676fcb2c6f2bd1a1cbf6123587c4d4e917d0
Component: engine
2015-05-28 14:15:34 -07:00
147b33c180
Treat systemd listeners as all other
...
Fix #13549
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
Upstream-commit: 6f9fa64645cd67eb10a9c8bd903df518d572f50d
Component: engine
2015-05-28 12:15:03 -07:00
abc263e355
Merge pull request #13259 from Microsoft/10662-configbridge
...
Windows: factor out bridgeConfig from server+config
Upstream-commit: 45488f9dc0e2ad5087776445e2069a9ea2c8bf80
Component: engine
2015-05-28 12:59:57 -04:00
773a1624ef
Merge pull request #13507 from hqhq/hq_remove_redundant_set_header
...
Remove redundant set header
Upstream-commit: 7b57fae04668cc4841f0d31f8ce16ac8d044b446
Component: engine
2015-05-27 10:44:57 -07:00
a7e8383688
Remove redundant set header
...
Which is already done in writeJSON.
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com >
Upstream-commit: 94d604357ff9cf7a5fcc4d98ffe58f804adf0ae6
Component: engine
2015-05-27 18:25:57 +08:00
d3998344e0
Return err if we got err on parseForm
...
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com >
Upstream-commit: 7c7aebfcfef46337aa4e20f9d024916f71650545
Component: engine
2015-05-27 18:16:28 +08:00
08d07187fd
Windows: factor out bridge server+config
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: ead2f80073623cb53ade435811b155fe69f2774e
Component: engine
2015-05-23 19:22:06 -07:00
7811ce8b6f
Extract sockets initialization to a package.
...
Because I just used it somewhere else and it would be nice if I didn't have to copy and paste the code.
Signed-off-by: David Calavera <david.calavera@gmail.com >
Upstream-commit: 0bfbc6e78823fc2f455b01a02721f17bcbcaecff
Component: engine
2015-05-20 16:48:39 -07:00
baf6ea6d24
Merge pull request #13324 from duglin/BadRCOnVersion
...
Make version check return 400 instead of 404
Upstream-commit: 53a795378ddb092fc6da8c05ff442f5ed52b7bdb
Component: engine
2015-05-20 11:13:56 -07:00
13426de5e6
Docker integration with libnetwork
...
- Updated Dockerfile to satisfy libnetwork GOPATH requirements.
- Reworked daemon to allocate network resources using libnetwork.
- Reworked remove link code to also update network resources in libnetwork.
- Adjusted the exec driver command population to reflect libnetwork design.
- Adjusted the exec driver create command steps.
- Updated a few test cases to reflect the change in design.
- Removed the dns setup code from docker as resolv.conf is entirely managed
in libnetwork.
- Integrated with lxc exec driver.
Signed-off-by: Jana Radhakrishnan <mrjana@docker.com >
Upstream-commit: d18919e304c240df84502cdcc5ed655d92d12d4f
Component: engine
2015-05-19 22:40:19 +00:00
bca5faa4ca
Make version check return 400 instead of 404
...
Closes : #13321
Signed-off-by: Doug Davis <dug@us.ibm.com >
Upstream-commit: 7fcf849749322b3e02ae0305f40e505e83b54e9a
Component: engine
2015-05-19 11:21:05 -07:00
3c170ee3af
Merge pull request #13271 from Microsoft/10662-nounixsocket
...
Windows: No unix_socket.go
Upstream-commit: 692b7b911ede20eda92bf8b0b9cdd81b901de1fd
Component: engine
2015-05-16 21:34:15 -04:00
c8d066f882
Merge pull request #13237 from ahmetalpbalkan/tag/event
...
Introduce daemon event 'tag' upon image tagging
Upstream-commit: b5e932a3bf1e9ba2682f0c3df2cc8fdf51f60229
Component: engine
2015-05-16 09:05:03 -07:00
5e2fb0c11a
Windows: No unix_socket.go
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: 6c187b8b4b5110ff416e09e34a2a73304d01044d
Component: engine
2015-05-15 15:49:02 -07:00
540e90ab62
Introduce daemon event 'tag' upon image tagging
...
Signed-off-by: Ahmet Alp Balkan <ahmetalpbalkan@gmail.com >
Upstream-commit: 1630ed97acc7bc3a08b57ce5acaa3d8e37a24694
Component: engine
2015-05-15 20:21:59 +00:00
56ea157723
Revert "Fix inconsistent date formats in API"
...
This reverts commit 945fc9d882324ac87505e34bb74e6ebe30be1309.
Signed-off-by: Victor Vieux <victorvieux@gmail.com >
Upstream-commit: b261ce5fb007371892bc40a5853337db09a1c8ae
Component: engine
2015-05-14 17:31:45 -07:00
59274bcf1f
Merge pull request #13202 from duglin/ImportFix
...
Fix a regression in `docker import` on error from URL
Upstream-commit: ac81cd1fc36c57b0275992f5e6586728c41dc068
Component: engine
2015-05-14 10:36:50 -04:00
703705b500
Fix a regression in docker import on error from URL
...
when the daemon can't download the image from a `docker import` the
error message was lost due to 'err' being redefined with a block by
mistake. This removes the ":" from "... err := " which fixes it.
Signed-off-by: Doug Davis <dug@us.ibm.com >
Upstream-commit: 3f4926e49b5f6df00ca09328e990729e00cb1a92
Component: engine
2015-05-14 06:56:52 -07:00
2e9a18b752
Fix inconsistent date formats in API
...
Prior to this patch, the response of
- GET /images/json
- GET /containers/json
- GET /images/(name)/history
display the Created Time as UNIX format which doesn't make sense.
These should be more readable as CLI command `docker inspect` shows.
Due to the case that an older client with a newer version daemon, we
need the version check for now.
Signed-off-by: Hu Keping <hukeping@huawei.com >
Upstream-commit: 945fc9d882324ac87505e34bb74e6ebe30be1309
Component: engine
2015-05-14 18:58:55 +08:00
aeecef0f70
Refactor pkg/stremformatter with custom constructors instead of passing a boolean
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja >
Upstream-commit: 6b700bdacae0b416d8239a0a24729fe327d425d1
Component: engine
2015-05-13 00:09:41 +02:00
4a0ddadbc0
Remove API codepaths < 1.12
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja >
Upstream-commit: 7284b08204fb85838170bdf82e2c379e1a4713c9
Component: engine
2015-05-12 20:09:49 +02:00
baa93a3d54
Merge pull request #13000 from runcom/refactor-server-to-use-daemon-service-followup
...
Refactor server to use the daemon as a service
Upstream-commit: 3b13e56fd7c6542ae535d83c12939c46bd40e2ad
Component: engine
2015-05-12 10:27:43 -07:00
12071c528f
Move container.WaitStop, AttachWithLogs and WsAttachWithLogs to daemon service in api server
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja >
Upstream-commit: e2acca67c8e089429c8a5d5171887e5de42e3917
Component: engine
2015-05-11 19:56:41 +02:00
365c18080f
Add --since argument to docker logs cmd
...
Added --since argument to `docker logs` command. Accept unix
timestamps and shows logs only created after the specified date.
Default value is 0 and passing default value or not specifying
the value in the request causes parameter to be ignored (behavior
prior to this change).
Signed-off-by: Ahmet Alp Balkan <ahmetalpbalkan@gmail.com >
Upstream-commit: cb9a6b9aed1577bb5590300125d05d9b1c201c16
Component: engine
2015-05-10 20:42:14 +00:00
ab315ef02f
Merge pull request #13093 from tianon/writeflusher
...
Move WriteFlusher out of utils into ioutils
Upstream-commit: c5710c73185d81909b02c0c2683d6183aeef9e61
Component: engine
2015-05-09 09:39:17 -07:00
560ba9b809
add cpu.cfs_period_us support
...
Signed-off-by: Ma Shimiao <mashimiao.fnst@cn.fujitsu.com >
Upstream-commit: dccb8b5c339e218222bae4ce74bbeccb9e020c82
Component: engine
2015-05-09 10:02:46 +08:00
a9af2bce60
Move WriteFlusher out of utils into ioutils
...
Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com >
Upstream-commit: 223d6de728ac5df5394b4990f81a466c858d519c
Component: engine
2015-05-08 12:33:33 -06:00
260671a89b
Merge pull request #12777 from ZJU-SEL/fix_pull_import_errpromt
...
Fix error prompt for pull & import handler postImagesCreate.
Upstream-commit: 404412282dc917b4e810f71a996656ebdc048b3b
Component: engine
2015-05-07 16:27:15 -07:00
0a2accc995
Removing the SetDaemon method
...
Signed-off-by: Bharath Thiruveedula <bharath_ves@hotmail.com >
Upstream-commit: 94def48878294ff3b35f8724343b14e2c48a09f8
Component: engine
2015-05-07 22:25:13 +05:30
b9064ad316
Merge pull request #12822 from brahmaroutu/container_stop_api
...
restapi stop fails if ?t=int not present
Upstream-commit: d78755d15972fd1d3115d9927932f82bc09483df
Component: engine
2015-05-07 09:38:59 -07:00
e580063058
Restapi for stop fails if ?t=int not present
...
Signed-off-by: Srini Brahmaroutu <srbrahma@us.ibm.com >
Upstream-commit: 68e9c07850c95ded1e0a8adda39a8efe68e1c0ee
Component: engine
2015-05-07 15:43:50 +00:00
e90b34218e
Do not check and return strconv.Atoi error in api container restart, regression
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja >
Upstream-commit: 74121a42118750e560e772a3fee33e9d7bd903d0
Component: engine
2015-05-07 01:49:16 +02:00
f6876820fd
Merge pull request #11844 from jbarbier/cgroup-parent-42
...
Adding cgroup-parent option for docker build
Upstream-commit: e960e4bb129de15b3beb7da37421e32af8dccf2f
Component: engine
2015-05-05 14:46:47 -07:00
3f873c25b6
Rename int64Value to int64ValueOrZero.
...
Signed-off-by: Adria Casas <adriacasas88@gmail.com >
Upstream-commit: a2c76912e04b087233577b46f96f446c5d13e2de
Component: engine
2015-05-05 08:54:28 +02:00
