Antonio Murdaca
4ce817796e
Avoid nil pointer dereference while creating a container with an empty Config
...
Signed-off-by: Antonio Murdaca <runcom@linux.com>
2015-06-06 20:07:32 +02:00
Arnaud Porterie
efe5c64768
Merge pull request #13636 from tiborvass/refactor-tls
...
Refactor TLS code with a new `tlsconfig` package
2015-06-05 10:16:24 -07:00
Tibor Vass
bfed4b7cc3
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>
2015-06-05 12:38:38 -04:00
Brian Goff
0c84604f54
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>
2015-06-04 13:56:40 -07:00
Jessica Frazelle
229b599259
fix version struct on old versions
...
Signed-off-by: Jessica Frazelle <princess@docker.com>
2015-06-03 16:56:50 -07:00
Alexander Morozov
9e7fc245a7
Support CloseNotifier for events
...
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
2015-06-03 11:42:51 -07:00
Antonio Murdaca
6deaa58ba5
Expose old config field for api < 1.19
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
2015-06-02 23:37:59 +02:00
Arnaud Porterie
2de2782fe8
Merge pull request #13666 from runcom/13665-kill-signal-wrong-handled
...
Fix wrong kill signal parsing
2015-06-02 09:40:55 -07:00
Antonio Murdaca
39eec4c25b
Fix wrong kill signal parsing
...
Signed-off-by: Antonio Murdaca <antonio.murdaca@gmail.com>
2015-06-02 18:01:19 +02:00
Arnaud Porterie
05b1d02423
Merge pull request #13609 from Microsoft/10662-refixserverwindows
...
Windows: Fix windows to match linux after compile break
2015-06-01 17:03:13 -07:00
Phil Estes
d37aad170f
Merge pull request #13568 from jfrazelle/fix-release-script-for-experimental
...
fix release script for experimental
2015-06-01 12:29:45 -04:00
John Howard
2b7569ccc3
Windows: Refix server_windows to match linux
...
Signed-off-by: John Howard <jhoward@microsoft.com>
2015-05-29 21:25:27 -07:00
David Calavera
4389fc8bf9
Merge pull request #13425 from runcom/13421-stats-default-stream
...
Fix regression in stats API endpoint
2015-05-29 15:05:21 -07:00
Antonio Murdaca
ec97f41465
Fix regression in stats API endpoint where stream query param default is true
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
2015-05-29 22:38:36 +02:00
Jessica Frazelle
b372f9f224
fix experimental version and release script
...
add api version experimental
Signed-off-by: Jessica Frazelle <princess@docker.com>
2015-05-29 10:00:22 -07:00
Raghuram Devarakonda
7b6f9da52c
Make the version mismatch message more explicit.
...
Signed-off-by: Raghuram Devarakonda <draghuram@gmail.com>
2015-05-28 17:54:48 -04:00
Jessie Frazelle
1f22676fcb
Merge pull request #13559 from LK4D4/fix_systemd_listen
...
Treat systemd listeners as all other
2015-05-28 14:15:34 -07:00
Alexander Morozov
6f9fa64645
Treat systemd listeners as all other
...
Fix #13549
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
2015-05-28 12:15:03 -07:00
Brian Goff
45488f9dc0
Merge pull request #13259 from Microsoft/10662-configbridge
...
Windows: factor out bridgeConfig from server+config
2015-05-28 12:59:57 -04:00
Alexander Morozov
7b57fae046
Merge pull request #13507 from hqhq/hq_remove_redundant_set_header
...
Remove redundant set header
2015-05-27 10:44:57 -07:00
Qiang Huang
94d604357f
Remove redundant set header
...
Which is already done in writeJSON.
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
2015-05-27 18:25:57 +08:00
Qiang Huang
7c7aebfcfe
Return err if we got err on parseForm
...
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
2015-05-27 18:16:28 +08:00
John Howard
ead2f80073
Windows: factor out bridge server+config
...
Signed-off-by: John Howard <jhoward@microsoft.com>
2015-05-23 19:22:06 -07:00
David Calavera
0bfbc6e788
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>
2015-05-20 16:48:39 -07:00
Alexander Morozov
53a795378d
Merge pull request #13324 from duglin/BadRCOnVersion
...
Make version check return 400 instead of 404
2015-05-20 11:13:56 -07:00
Jana Radhakrishnan
d18919e304
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>
2015-05-19 22:40:19 +00:00
Doug Davis
7fcf849749
Make version check return 400 instead of 404
...
Closes : #13321
Signed-off-by: Doug Davis <dug@us.ibm.com>
2015-05-19 11:21:05 -07:00
Brian Goff
692b7b911e
Merge pull request #13271 from Microsoft/10662-nounixsocket
...
Windows: No unix_socket.go
2015-05-16 21:34:15 -04:00
Alexander Morozov
b5e932a3bf
Merge pull request #13237 from ahmetalpbalkan/tag/event
...
Introduce daemon event 'tag' upon image tagging
2015-05-16 09:05:03 -07:00
John Howard
6c187b8b4b
Windows: No unix_socket.go
...
Signed-off-by: John Howard <jhoward@microsoft.com>
2015-05-15 15:49:02 -07:00
Ahmet Alp Balkan
1630ed97ac
Introduce daemon event 'tag' upon image tagging
...
Signed-off-by: Ahmet Alp Balkan <ahmetalpbalkan@gmail.com>
2015-05-15 20:21:59 +00:00
Victor Vieux
b261ce5fb0
Revert "Fix inconsistent date formats in API"
...
This reverts commit 945fc9d882
.
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
2015-05-14 17:31:45 -07:00
Brian Goff
ac81cd1fc3
Merge pull request #13202 from duglin/ImportFix
...
Fix a regression in `docker import` on error from URL
2015-05-14 10:36:50 -04:00
Doug Davis
3f4926e49b
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>
2015-05-14 06:56:52 -07:00
Hu Keping
945fc9d882
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>
2015-05-14 18:58:55 +08:00
Antonio Murdaca
6b700bdaca
Refactor pkg/stremformatter with custom constructors instead of passing a boolean
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
2015-05-13 00:09:41 +02:00
Antonio Murdaca
7284b08204
Remove API codepaths < 1.12
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
2015-05-12 20:09:49 +02:00
Alexander Morozov
3b13e56fd7
Merge pull request #13000 from runcom/refactor-server-to-use-daemon-service-followup
...
Refactor server to use the daemon as a service
2015-05-12 10:27:43 -07:00
Antonio Murdaca
e2acca67c8
Move container.WaitStop, AttachWithLogs and WsAttachWithLogs to daemon service in api server
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
2015-05-11 19:56:41 +02:00
Ahmet Alp Balkan
cb9a6b9aed
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>
2015-05-10 20:42:14 +00:00
Alexander Morozov
c5710c7318
Merge pull request #13093 from tianon/writeflusher
...
Move WriteFlusher out of utils into ioutils
2015-05-09 09:39:17 -07:00
Ma Shimiao
dccb8b5c33
add cpu.cfs_period_us support
...
Signed-off-by: Ma Shimiao <mashimiao.fnst@cn.fujitsu.com>
2015-05-09 10:02:46 +08:00
Tianon Gravi
223d6de728
Move WriteFlusher out of utils into ioutils
...
Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com>
2015-05-08 12:33:33 -06:00
David Calavera
404412282d
Merge pull request #12777 from ZJU-SEL/fix_pull_import_errpromt
...
Fix error prompt for pull & import handler postImagesCreate.
2015-05-07 16:27:15 -07:00
Bharath Thiruveedula
94def48878
Removing the SetDaemon method
...
Signed-off-by: Bharath Thiruveedula <bharath_ves@hotmail.com>
2015-05-07 22:25:13 +05:30
David Calavera
d78755d159
Merge pull request #12822 from brahmaroutu/container_stop_api
...
restapi stop fails if ?t=int not present
2015-05-07 09:38:59 -07:00
Srini Brahmaroutu
68e9c07850
Restapi for stop fails if ?t=int not present
...
Signed-off-by: Srini Brahmaroutu <srbrahma@us.ibm.com>
2015-05-07 15:43:50 +00:00
Antonio Murdaca
74121a4211
Do not check and return strconv.Atoi error in api container restart, regression
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
2015-05-07 01:49:16 +02:00
Arnaud Porterie
e960e4bb12
Merge pull request #11844 from jbarbier/cgroup-parent-42
...
Adding cgroup-parent option for docker build
2015-05-05 14:46:47 -07:00
Adria Casas
a2c76912e0
Rename int64Value to int64ValueOrZero.
...
Signed-off-by: Adria Casas <adriacasas88@gmail.com>
2015-05-05 08:54:28 +02:00