Mary Anthony
cb4af853f6
Tweaking text identified in PR #13147
...
Signed-off-by: Mary Anthony <mary@docker.com>
2015-06-02 12:44:47 -07:00
Alexander Morozov
cd80a61cc1
Merge pull request #13443 from duglin/CleanupEvents
...
Cleanup container LogEvent calls
2015-06-01 14:04:33 -07:00
Doug Davis
8232312c1e
Cleanup container LogEvent calls
...
Move some calls to container.LogEvent down lower so that there's
less of a chance of them being missed. Also add a few more events
that appear to have been missed.
Added testcases for new events: commit, copy, resize, attach, rename, top
Signed-off-by: Doug Davis <dug@us.ibm.com>
2015-06-01 12:39:28 -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
Tobias Gesellchen
16e649c589
indicate HostConfig to be used for "create container"
...
Closes #13614
Signed-off-by: Tobias Gesellchen <tobias@gesellix.de>
2015-06-01 07:04:41 +02:00
moxiegirl
093f57a261
Merge pull request #13460 from moxiegirl/add-created-state-diagram
...
Updating event diagram with the created state. Cool, thank you.
2015-05-30 19:47:24 -07:00
Sebastiaan van Stijn
f2154a5a6b
Merge pull request #13367 from duglin/Issue13353
...
Add a "Created" state for new containers that haven't been run yet
2015-05-30 19:49:38 +02:00
Doug Davis
dc697b1c9f
Add a "Created" state for new containers that haven't been run yet
...
Closes #13353
Signed-off-by: Doug Davis <dug@us.ibm.com>
2015-05-30 07:48:46 -07:00
Vincent Demeester
c61fa8471a
Update api documentation to add labels in commit
...
It is already possible to set labels at commit when using the API. But
it is not present in the API documentation. Added an integration test
too, to validate this work (and will be in the future).
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2015-05-30 11:31:51 +02:00
Antonio Murdaca
c42ede311b
Revert api doc for 1.19 about PortSpecs removal
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
2015-05-30 00:32:03 +02:00
Antonio Murdaca
15134a3320
Remove PortSpecs from Config
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
2015-05-29 22:38:09 +02:00
David Calavera
f1fed87fc0
Merge pull request #13392 from runcom/syslog-connection-url-log-opt
...
Add syslog-address log-opt
2015-05-29 10:21:57 -07: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
Hu Keping
22fda380a9
Fix inconsistent of remote API and document
...
Signed-off-by: Hu Keping <hukeping@huawei.com>
2015-05-29 22:56:35 +08:00
Antonio Murdaca
e8c88d2533
Add syslog-address log-opt
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
2015-05-29 00:42:11 +02:00
Jessica Frazelle
e76d0f5571
bump api version to 1.20
...
Signed-off-by: Jessica Frazelle <princess@docker.com>
2015-05-28 15:32:05 -07:00
Mary Anthony
30901609a8
Fixes to the 1.19 version
...
updating with changes to this instant
Signed-off-by: Mary Anthony <mary@docker.com>
2015-05-28 14:25:26 -07:00
Mary Anthony
9c65862cd6
Updating with the created state
...
Signed-off-by: Mary Anthony <mary@docker.com>
2015-05-25 07:33:01 -07:00
Mary Anthony
6de4138465
Finally, finally, close #12164
...
Updating with typo Seb found
Signed-off-by: Mary Anthony <mary@docker.com>
2015-05-23 14:27:50 -07:00
Jessie Frazelle
19790c46dc
Merge pull request #13338 from icecrime/13023_experimental_env_var
...
Add DOCKER_EXPERIMENTAL environment variable
2015-05-20 13:04:28 -07:00
Arnaud Porterie
ca6722f1c5
Add DOCKER_EXPERIMENTAL environment variable
...
The DOCKER_EXPERIMENTAL environment variable drives the activation of
the 'experimental' build tag.
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com>
2015-05-20 12:21:17 -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
Sven Dowideit
a09dfbcaad
Merge pull request #13214 from zoechi/master
...
add bwu_docker
2015-05-20 13:43:16 +10: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
Raghuram Devarakonda
9c0608565c
Bring /info API doc in line with the actual response.
...
The fix handles versions 1.18 and 1.19.
Closes #13139 .
Signed-off-by: Raghuram Devarakonda <draghuram@gmail.com>
2015-05-18 13:55:42 -04: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
Günter Zöchbauer
ef956253d8
Add bwu_docker to the list.
...
Signed-off-by: Guenter Zoechbauer <guenter@gzoechbauer.com>
2015-05-14 15:27:51 +02: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
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
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
Jessie Frazelle
128a07b512
Merge pull request #13027 from runcom/fix-typo-reference-remote-api
...
Fix typo in the api remote reference for links
2015-05-07 17:53:21 -07:00
Qiang Huang
f133f11a7d
add blkio.weight support
...
We can use this to control block IO weight of a container.
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
2015-05-07 11:55:58 +08:00
Antonio Murdaca
72a0272a62
Fix typo in the api remote reference for links
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
2015-05-06 22:08:10 +02:00
Tibor Vass
91fb4d672a
Merge pull request #10766 from cpuguy83/stats_pull_once
...
Allow pulling stats once and disconnecting.
2015-05-04 22:28:01 -07:00
Brian Goff
f3023a93d1
Allow pulling stats once and disconnecting.
...
Adds a `stream` query param to the stats API which allows API users to
only collect one stats entry and disconnect instead of keeping the
connection alive to stream more stats.
Also adds a `--no-stream` flag to `docker stats` which does the same
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2015-05-04 10:49:13 -04:00
HuKeping
a4a924e1b6
Feature: option for disable OOM killer
...
Add cgroup support for disable OOM killer.
Signed-off-by: Hu Keping <hukeping@huawei.com>
2015-05-04 21:11:29 +08:00
Daniel Nephin
cfd0f53b03
Add missing API docs about filtering by label.
...
Signed-off-by: Daniel Nephin <dnephin@gmail.com>
2015-04-26 15:36:01 -04:00
Ed Costello
fa9299f4c0
Copy edits for typos
...
Signed-off-by: Ed Costello <epc@epcostello.com>
2015-04-25 15:01:05 -04:00
Rick Wieman
6359326761
Makes headings in documentation consistent
...
Fixes #10673 .
Signed-off-by: Rick Wieman <git@rickw.nl>
2015-04-23 07:41:30 +02:00
Dan Walsh
364287b741
Add journald as a supported logger for containers
...
Docker-DCO-1.1-Signed-off-by: Dan Walsh <dwalsh@redhat.com> (github: rhatdan)
2015-04-21 12:57:54 -04:00
Mary Anthony
fe8fb24b53
In with the old menu layout
...
Signed-off-by: Mary Anthony <mary@docker.com>
2015-04-15 19:02:01 -07:00
Brian Goff
f0c60f7085
Merge pull request #12387 from x1022as/inspect-logpath
...
Inspect show right LogPath in json-file driver
2015-04-15 14:28:39 -04:00
moxiegirl
2499baefdd
Merge pull request #12399 from emirozer/master
...
closes #8945
2015-04-15 10:53:10 -07:00
Emir Ozer
960de9c8dd
closes #8945
...
Signed-off-by: Emir Ozer <emirozer@yandex.com>
2015-04-15 15:31:23 +02:00
Deng Guangxing
acf025ad1b
Inspect show right LogPath in json-file driver
...
Signed-off-by: Deng Guangxing <dengguangxing@huawei.com>
2015-04-15 11:51:24 +08:00
Qiang Huang
8077b2fb80
add support for cpuset.mems
...
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
2015-04-15 09:33:46 +08:00
David Calavera
d71c929d08
Fix JSON format in the remote api configuration examples.
...
Signed-off-by: David Calavera <david.calavera@gmail.com>
2015-04-13 16:12:00 -07:00
Yuan Sun
4f492e794a
update docker_remote_api_v1.*
...
Signed-off-by: Yuan Sun <sunyuan3@huawei.com>
2015-04-11 18:11:49 +08:00
Raghuram Devarakonda
202e0380f3
Adds example request and Json parameter information for container
...
start API.
Closes #10304 .
Signed-off-by: Raghuram Devarakonda <draghuram@gmail.com>
2015-04-10 11:10:41 -04:00
Ahmet Alp Balkan
b66597eef1
docs: Markdown format fix around LogConfig param
...
Signed-off-by: Ahmet Alp Balkan <ahmetalpbalkan@gmail.com>
2015-04-08 16:16:37 -07:00