jmzwcn
28547a1a3a
Remove empty line after client.CmdInspect docstring #12706
...
Signed-off-by: Daniel Zhang <jmzwcn@gmail.com>
Remove empty line after client.CmdInspect docstring
fix #12706
Signed-off-by: Daniel Zhang <jmzwcn@gmail.com>
Remove empty line after client.CmdInspect docstring
fix #12706
Signed-off-by: Daniel Zhang <jmzwcn@gmail.com>
2015-05-03 17:23:18 +08:00
Antonio Murdaca
c7cfdb65aa
Refactor server to use daemon as the service layer in controllers
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
2015-05-02 03:12:58 +02:00
Alexander Morozov
393678474f
Merge pull request #12924 from runcom/provide-struct-to-cli-stream
...
Provide a struct to configure cli streaming
2015-05-01 15:10:58 -07:00
Antonio Murdaca
d9639409fd
Provide a struct to configure cli streaming
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
2015-05-01 20:23:44 +02:00
Qiang Huang
79f13d1497
fix docker rm name issue
...
Addresses https://github.com/docker/docker/issues/12308
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
2015-05-01 22:26:40 +08:00
Doug Davis
68ee5bdf96
Don't wrap 'cp' help too soon.
...
Minor thing but docker cp --help was:
Copy files/folders from a PATH on the container to a HOSTDIR on the host
running the command. Use '-' to write the data
as a tar file to STDOUT.
This changes it to:
Copy files/folders from a PATH on the container to a HOSTDIR on the host
running the command. Use '-' to write the data as a tar file to STDOUT.
The \n made the output look funky.
Signed-off-by: Doug Davis <dug@us.ibm.com>
2015-04-30 14:43:14 -07:00
jhowardmsft
86d1223a29
Windows: mkdirall volume path aware
...
Signed-off-by: jhowardmsft <jhoward@microsoft.com>
2015-04-30 11:59:42 -07:00
Antonio Murdaca
531f4122bd
Remove engine mechanism
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
2015-04-30 01:35:16 +02:00
Doug Davis
534ed8c2d4
Remove use of "DEBUG" env var from CLI and decouple DEBUG from --log-level
...
Signed-off-by: Doug Davis <dug@us.ibm.com>
2015-04-29 06:20:33 -07:00
Brian Goff
f2f8e4c5c9
Merge pull request #12870 from coolljt0725/fix_rename_help
...
Fix docker rename help not consistent with other commands
2015-04-29 09:14:03 -04:00
Lei Jitang
0e752adf55
Fix docker rename help not consistent with other commands
...
Signed-off-by: Lei Jitang <leijitang@huawei.com>
2015-04-29 19:37:20 +08:00
Qiang Huang
c7812f01c7
fix a minor inspect format issue
...
Before, inspect cont1 cont2 shows:
[{
xxx
}
,{
xxx
}
]
After, it shows:
[
{
xxx
}
,{
xxx
}
]
Because `func (*Encoder) Encode` always followed by a newline character,
so it's difficult to put '}' and ']' one the same line.
To get symmetry, above is our choice.
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
2015-04-28 18:51:04 +08:00
Antonio Murdaca
844538142d
Small if err cleaning
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
2015-04-27 21:50:33 +02:00
Tibor Vass
572ba9cb40
Merge pull request #12333 from Mashimiao/clean-up-viz
...
Clean up viz code
2015-04-27 14:13:03 -04:00
He Simei
6d9439c627
remove useless http call from export
...
Signed-off-by: He Simei <hesimei@zju.edu.cn>
2015-04-27 12:41:03 +08:00
Julien Barbier
bb41193998
Happy birthday Docker! cgroup-parent option for docker build. Thanks to Michael, Nathan and Jessie for their support! #42
...
Signed-off-by: Julien Barbier <write0@gmail.com>
2015-04-25 15:25:51 -04:00
He Simei
daad696e09
Fix error prompt for pull & import handler postImagesCreate.
...
Signed-off-by: He Simei <hesimei@zju.edu.cn>
2015-04-25 09:10:32 +08:00
Alexander Morozov
790c63a5ef
Merge pull request #12502 from calavera/shallow_git_history
...
Shallow clone using git to build images.
2015-04-24 10:16:01 -07:00
David Calavera
1cfb307d70
Remove duplicated git clone logic.
...
Signed-off-by: David Calavera <david.calavera@gmail.com>
2015-04-24 09:39:45 -07:00
Lei Jitang
5f4fb8be00
Add cpu cfs quota to build
...
Signed-off-by: Lei Jitang <leijitang@huawei.com>
2015-04-24 08:54:08 +08:00
Ma Shimiao
66acef865d
clean up viz code
...
Signed-off-by: Ma Shimiao <mashimiao.fnst@cn.fujitsu.com>
2015-04-24 08:38:14 +08:00
Antonio Murdaca
fa2c68a89e
Remove engine/job from graph
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
2015-04-23 23:36:29 +02:00
Alexander Morozov
799cf056e7
Merge pull request #11839 from brahmaroutu/template_11641
...
Allow go template to work properly with inspect …
2015-04-23 13:07:40 -07:00
Jessie Frazelle
1492a7d7fd
Merge pull request #12702 from LK4D4/good_ol_flushed
...
Return weird behaviour of returning json errors
2015-04-23 13:03:29 -07:00
Arnaud Porterie
c4914f071f
Merge pull request #12577 from jfrazelle/actually-depreciate-rm
...
actually depreciate -rm insteam of --rm.. and a few others
2015-04-23 11:55:20 -07:00
Alexander Morozov
9ed5bfb083
Merge pull request #12636 from duglin/MoveConfig
...
Move CLI config processing out from under registry dir
2015-04-23 11:50:31 -07:00
Brian Goff
2c70288ca6
Merge pull request #12703 from LK4D4/carry_12596
...
remove job from image_export
2015-04-23 14:27:59 -04:00
Srini Brahmaroutu
231d362db7
Allow go template to work properly with inspect
...
Closes #11641
Signed-off-by: Srini Brahmaroutu <srbrahma@us.ibm.com>
2015-04-23 18:25:18 +00:00
Jessie Frazelle
2345389975
Merge pull request #12687 from WeiZhang555/NotFound
...
refactor httpError() and add 404 "not found" mapping
2015-04-23 11:21:09 -07:00
Simei He
2a14b7dd35
remove job from image_export
...
Signed-off-by: He Simei <hesimei@zju.edu.cn>
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
2015-04-23 10:54:25 -07:00
Alexander Morozov
ec51ba01db
Return weird behaviour of returning json errors
...
We need this, so client can get error from stream and not from status
code, which is already 200, because write to ResponseWriter was occured.
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
2015-04-23 10:27:37 -07:00
Doug Davis
bb9da6ba92
Move CLI config processing out from under registry dir
...
No logic changes should be in here, just moving things around.
Signed-off-by: Doug Davis <dug@us.ibm.com>
2015-04-23 10:18:38 -07:00
Alexander Morozov
2351b87551
Merge pull request #12505 from ZJU-SEL/remove_job_from_push
...
remove job from push
2015-04-23 09:57:17 -07:00
Alexander Morozov
71ac5b7903
Merge pull request #12681 from hqhq/hq_fix_test_in_apiserver
...
fix test case name
2015-04-23 09:21:00 -07:00
Simei He
d456401fe1
remove job from push
...
Signed-off-by: Simei He <hesimei@zju.edu.cn>
Signed-off-by: He Simei <hesimei@zju.edu.cn>
2015-04-23 21:21:56 +08:00
Zhang Wei
ab42a3a23a
refactor httpError() and add 404 "not found" mapping
...
When docker pull a non-existent repo, daemon will report "image xxx not found"
with an error code 500, which should be 404.
This commit add 404 "not found" mapping and refactor httpError function.
Signed-off-by: Zhang Wei <zhangwei555@huawei.com>
2015-04-23 19:37:47 +08:00
Simei He
70bb0d8ed7
remove job from load
...
Signed-off-by: Simei He <hesimei@zju.edu.cn>
Signed-off-by: He Simei <hesimei@zju.edu.cn>
2015-04-23 19:13:12 +08:00
Qiang Huang
a8d2fbe7b4
fix test case name
...
Name like this will never run by go test. And this test case won't
get PAAS.
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
2015-04-23 18:41:30 +08:00
Doug Davis
eae272f90e
Merge pull request #12390 from hqhq/hq_fix_inspect
...
fix inspect format result
2015-04-22 23:06:13 -04:00
Qiang Huang
b0ef3194aa
fix inspect format result
...
Currently `docker inspect -f` use json.Unmarshal() unmarshal
to interface, it will store all JSON numbers in float64, so
we use `docker inspect 4f0d73b75a0d | grep Memory` and
`docker inspect -f {{.HostConfig.Memory}} 4f0d73b75a0d` will
get different values.
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
2015-04-23 09:28:07 +08:00
Brian Goff
3872272170
Merge pull request #12406 from runcom/remove-job-container-inspect
...
Remove job from container_inspect
2015-04-22 21:05:15 -04:00
Doug Davis
5ea8dc376c
Merge pull request #12649 from jlhawn/fix_pull_err_explosion
...
Correctly format API error on image pull
2015-04-22 20:28:24 -04:00
Antonio Murdaca
4b9fe9c298
Remove job from container_inspect
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
2015-04-23 00:58:13 +02:00
Jessie Frazelle
3c9ae03a86
Merge pull request #12650 from LK4D4/carry_12472
...
remove execCreate & execStart from job
2015-04-22 15:32:14 -07:00
Josh Hawn
fd4f7c4e5c
Correctly format API error on image pull
...
Docker-DCO-1.1-Signed-off-by: Josh Hawn <josh.hawn@docker.com> (github: jlhawn)
2015-04-22 14:11:25 -07:00
jianbosun
24425021d2
remove execCreate & execStart from job
...
Also removed the function ExecConfigFromJob
Signed-off-by: Sun Jianbo <wonderflow@zju.edu.cn>
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
2015-04-22 13:51:57 -07:00
Peggy Li
58065d0dd9
Fix golint errors in docker/api/client
...
Signed-off-by: Peggy Li <peggyli.224@gmail.com>
2015-04-22 00:14:23 -07:00
Alexander Morozov
a2f74aa4b4
Remove chain of engine passing from builder to loadManifest
...
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
2015-04-21 14:55:23 -07:00
Antonio Murdaca
27811355bd
Remove writeJSONEnv
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
2015-04-21 18:14:39 +02:00
Jessie Frazelle
17d5450bc3
Merge pull request #10736 from coolljt0725/add_cpu_limit
...
Add support cpu cfs_quota
2015-04-20 17:55:01 -07:00
Jessie Frazelle
47b703593e
Merge pull request #12430 from icecrime/11551_carry
...
Add -H|--human command-line flag to `docker history`
2015-04-20 17:28:24 -07:00
Jessie Frazelle
82f75df9e9
Merge pull request #12457 from calavera/remove_engine_job_builder
...
Remove engine.Job from Builder.
2015-04-20 17:27:17 -07:00
Jessie Frazelle
4bb8924b52
Merge pull request #12539 from WeiZhang555/httpError
...
change httpError logic
2015-04-20 17:26:09 -07:00
Jessica Frazelle
f3d4c33213
actually depreciate -rm, -sig-proxy, -name, seriously its been forever
...
Signed-off-by: Jessica Frazelle <princess@docker.com>
2015-04-20 17:20:23 -07:00
Jessie Frazelle
4a25c5d25b
Merge pull request #12533 from ankushagarwal/gofmt-directory
...
gofmt 1.4.2 src directory
2015-04-20 17:02:43 -07:00
David Calavera
3b05005a12
Add flusher check to utils.WriteFlusher.
...
That way we can know when the stream has been flushed.
Signed-off-by: David Calavera <david.calavera@gmail.com>
2015-04-20 14:25:45 -07:00
David Calavera
ae4063585e
Remove engine.Job from builder.CmdBuildConfig.
...
Signed-off-by: David Calavera <david.calavera@gmail.com>
2015-04-20 13:37:06 -07:00
David Calavera
9a2c009751
Remove engine.Job references from builder.CmdBuild
...
Signed-off-by: David Calavera <david.calavera@gmail.com>
2015-04-20 13:37:04 -07:00
Alexander Morozov
08ef006d17
Merge pull request #12009 from duglin/AddConfig
...
Migrate .dockercfg to .docker/config.json and support for HTTP Headers
2015-04-20 13:12:17 -07:00
Doug Davis
18c9b6c645
Add .docker/config.json and support for HTTP Headers
...
This PR does the following:
- migrated ~/.dockerfg to ~/.docker/config.json. The data is migrated
but the old file remains in case its needed
- moves the auth json in that fie into an "auth" property so we can add new
top-level properties w/o messing with the auth stuff
- adds support for an HttpHeaders property in ~/.docker/config.json
which adds these http headers to all msgs from the cli
In a follow-on PR I'll move the config file process out from under
"registry" since it not specific to that any more. I didn't do it here
because I wanted the diff to be smaller so people can make sure I didn't
break/miss any auth code during my edits.
Signed-off-by: Doug Davis <dug@us.ibm.com>
2015-04-20 13:05:24 -07:00
Alexander Morozov
da7bca4496
Make all http handlers api.server.Server methods
...
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
2015-04-20 09:45:31 -07:00
Zhang Wei
66239ab5c9
change httpError logic
...
Signed-off-by: Zhang Wei <zhangwei555@huawei.com>
Signed-off-by: Zhang Wei <zhangwei198900@gmail.com>
2015-04-20 23:26:56 +08:00
Lei Jitang
dcc50e1d59
Add support cpu cfs quota
...
Signed-off-by: Lei Jitang <leijitang@huawei.com>
2015-04-20 08:16:47 -07:00
Alexander Morozov
d9ed316522
Make API server datastructure
...
Added daemon field to it, will use it later for acces to daemon from
handlers
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
2015-04-20 08:13:39 -07:00
Alexander Morozov
b5584ec24a
Merge pull request #12537 from hqhq/hq_remove_unused_function
...
remove unused function in server_unit_test.go
2015-04-20 07:51:53 -07:00
Hu Keping
f4942ed864
Remove Job from Info API
...
Two main things
- Create a real struct Info for all of the data with the proper types
- Add test for REST API get info
Signed-off-by: Hu Keping <hukeping@huawei.com>
2015-04-20 18:14:06 +08:00
Qiang Huang
641a7ec9ad
remove unused function in server_unit_test.go
...
After engine refactor, some functions are no longer used.
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
2015-04-20 16:27:47 +08:00
Ankush Agarwal
edf541c22b
gofmt whole directory
...
Signed-off-by: Ankush Agarwal <ankushagarwal11@gmail.com>
2015-04-20 01:08:51 -07:00
Doug Davis
b1d8ae3824
Merge pull request #12358 from ZJU-SEL/remove_job_from_tag
...
remove job from tag
2015-04-19 16:02:28 -04:00
Simei He
99f6309b97
remove job from tag
...
Signed-off-by: Simei He <hesimei@zju.edu.cn>
2015-04-19 18:36:56 +08:00
Brian Goff
055c6dbaef
Merge pull request #12490 from LK4D4/carry_12396
...
remove job from pull and import
2015-04-17 15:26:30 -04:00
Simei He
6e38a53f96
remove job from pull and import
...
Closes #12396
Signed-off-by: Simei He <hesimei@zju.edu.cn>
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
2015-04-17 09:55:02 -07:00
Antonio Murdaca
a0bf80fe03
Remove builtins
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
2015-04-17 14:27:38 +02:00
Hu Keping
b052f7a87c
Change log severity for non-tlsverify bind
...
closes #12459
Signed-off-by: Hu Keping <hukeping@huawei.com>
2015-04-17 21:27:58 +08:00
Antonio Murdaca
e41192a3f8
Remove job from restart
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
2015-04-16 18:50:24 +02:00
Arnaud Porterie
ae5cf30c7c
Add -H|--human flag to `docker history`
...
Add a flag to print sizes and dates in human readable format.
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com>
2015-04-16 08:38:18 -07:00
Dave Henderson
dcff07d03d
Adding a verbose time option to output formatted timestamps
...
Fixes #11413
Signed-off-by: Dave Henderson <Dave.Henderson@ca.ibm.com>
2015-04-16 08:34:50 -07:00
Brian Goff
de923f59b3
Merge pull request #12253 from calavera/remove_job_from_start_and_create
...
Remove engine.Job from Start and Create
2015-04-15 21:49:25 -04:00
Alexander Morozov
83d809f3d2
Merge pull request #12388 from xiaods/issue-12373
...
client.StatusError don't be returned as a pointer
2015-04-15 17:34:38 -07:00
Deshi Xiao
bae3023eef
client.StatusError don't be returned as a pointer
...
closes #12373
1. remove & from client.StatusError
2. remove * from Error method
Signed-off-by: Deshi Xiao <xiaods@gmail.com>
2015-04-16 01:27:07 +08:00
David Calavera
767df67e31
Decode container configurations into typed structures.
...
Signed-off-by: David Calavera <david.calavera@gmail.com>
2015-04-15 10:22:07 -07:00
Qiang Huang
f8dc7e8754
Add cpuset-mems support for docker build
...
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
2015-04-15 09:34:12 +08:00
David Calavera
98996a432e
Remove engine.Job from Create action.
...
Signed-off-by: David Calavera <david.calavera@gmail.com>
2015-04-14 15:33:12 -07:00
David Calavera
610c436e07
Remove engine.Job from Start action.
...
Signed-off-by: David Calavera <david.calavera@gmail.com>
2015-04-14 15:33:12 -07:00
Phil Estes
5395cdcae5
Merge pull request #12269 from kostickm/12251-remove-not-empty-check
...
Remove container name not empty check
2015-04-14 17:55:13 -04:00
Megan Kostick
98f857772f
Remove container name not empty check
...
Signed-off-by: Megan Kostick <mkostick@us.ibm.com>
2015-04-14 11:27:06 -07:00
Alexander Morozov
5be5749d54
Merge pull request #12370 from buddhamagnet/11593-api-client-docs
...
add docs for DockerCli and NewDockerCli fixes #11593
2015-04-14 11:00:19 -07:00
buddhamagnet
69747b3c1e
add docs for DockerCli and NewDockerCli
...
Signed-off-by: buddhamagnet <buddhamagnet@gmail.com>
2015-04-14 18:33:11 +01:00
Brian Goff
392fd243bc
Merge pull request #12365 from HuKeping/list
...
Use local variable err instead of a outer one
2015-04-14 12:49:15 -04:00
Hu Keping
a0804e8e11
Use local variable err instead of a outer one
...
Signed-off-by: Hu Keping <hukeping@huawei.com>
2015-04-15 00:29:53 +08:00
Antonio Murdaca
c30a55f14d
Refactor utils/utils, fixes #11923
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
2015-04-14 01:37:36 +02:00
Michael Crosby
6fa2a1e486
Merge pull request #12172 from ZJU-SEL/change_stats
...
change memory usage display
2015-04-13 13:32:45 -07:00
Michael Crosby
75b911eb3c
Merge pull request #12222 from chenhanxiao/cp-support-colon
...
cp: add support for copy filename with ":"
2015-04-13 13:09:12 -07:00
Evan Hazlett
3509132a6e
Merge pull request #12301 from ewindisch/https_links
...
Use HTTPS links for URLs in READMEs / comments / docs
2015-04-13 14:30:53 -04:00
Michael Crosby
6f928be7ef
Merge pull request #12320 from runcom/fix-api-resize-exec-resize
...
fix api server resize&execResize
2015-04-13 09:59:11 -07:00
Michael Crosby
33e83d0581
Merge pull request #12279 from runcom/remove-job-commit
...
Remove job from commit
2015-04-13 09:57:54 -07:00
Brian Goff
12eff0c26f
Merge pull request #12312 from runcom/remove-job-container-stats
...
Remove job from container stats
2015-04-13 11:58:31 -04:00
Brian Goff
a4f98d3225
Merge pull request #12313 from runcom/remove-job-export
...
Remove job from export
2015-04-13 11:57:55 -04:00
Alexander Morozov
bfb487dc50
Merge pull request #12304 from runcom/remove-job-logs
...
Remove job from logs
2015-04-13 08:38:46 -07:00
Antonio Murdaca
6b737752e3
Remove job from export
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
2015-04-13 15:27:45 +02:00
Antonio Murdaca
3341f3a355
fix api server resize&execResize
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
2015-04-13 08:42:12 +02:00
Antonio Murdaca
65a056345c
Remove jobs from stats
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
2015-04-13 08:33:53 +02:00
Antonio Murdaca
91bfed6049
Remove job from logs
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
2015-04-13 08:25:31 +02:00
Doug Davis
a54fd325e6
Merge pull request #12305 from runcom/remove-job-exec-inspect
...
Remove job from execInspect
2015-04-12 08:30:38 -04:00
Antonio Murdaca
04cc6c6aa4
Remove job from stop
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
2015-04-12 00:41:16 +02:00
Antonio Murdaca
621ee1f6a4
Remove job from execInspect
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
2015-04-12 00:15:34 +02:00
Eric Windisch
ca37301d54
Link to HTTPS URLs in engine comments
...
Updates most of the instances of HTTP urls in the engine's
comments. Does not account for any use in the code itself,
documentation, contrib, or project files.
Signed-off-by: Eric Windisch <eric@windisch.us>
2015-04-11 13:31:34 -04:00
jianbosun
d6d8f45b04
change memory usage display
...
using standard unix postfixes add unit test for display
also change doc for memory usage display change
for example GiB will be GB
Signed-off-by: Sun Jianbo <wonderflow@zju.edu.cn>
2015-04-11 20:04:34 +08:00
Antonio Murdaca
c8529fde5f
Remove job from commit
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
2015-04-11 00:20:45 +02:00
Antonio Murdaca
db0ffba3b9
Remove job from wait
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
2015-04-10 20:17:02 +02:00
Michael Crosby
bae3273ef4
Merge pull request #12259 from duglin/RemoveJobTop
...
Remove Job from `docker top`
2015-04-10 10:56:01 -07:00
Michael Crosby
267bd51adb
Merge pull request #12248 from duglin/RemoveJobKill
...
Remove Job from `docker kill`
2015-04-10 10:52:18 -07:00
Brian Goff
0693e34d7e
Merge pull request #12260 from HuKeping/rmjob-history
...
Remove Job from History API
2015-04-10 09:53:05 -04:00
Hu Keping
5c7c3fea6c
Remove Job from History API
...
a part of issue #12151
Signed-off-by: Hu Keping <hukeping@huawei.com>
2015-04-10 21:37:56 +08:00
Chen Hanxiao
5037297388
cp: add support for copy filename with ":"
...
We use ":" as separator CONTAINER:PATH.
This patch enables copy filename with ":"
to host.
Signed-off-by: Chen Hanxiao <chenhanxiao@cn.fujitsu.com>
2015-04-10 00:08:05 -04:00
Tibor Vass
fa2ace00a8
Rebase + some fixes
...
Signed-off-by: Tibor Vass <tibor@docker.com>
2015-04-09 21:29:42 -04:00
David Young
bf57339527
Add comment column in docker history command output
...
Signed-off-by: David Young <yangboh@cn.ibm.com>
2015-04-09 21:29:41 -04:00
Doug Davis
3e096cb9c9
Remove Job from `docker top`
...
Signed-off-by: Doug Davis <dug@us.ibm.com>
2015-04-09 18:17:50 -07:00
Doug Davis
3cb751906a
Remove Job from `docker kill`
...
Signed-off-by: Doug Davis <dug@us.ibm.com>
2015-04-09 16:06:54 -07:00
Antonio Murdaca
e290a22dc9
Remove job from resize&execResize
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
2015-04-10 00:56:43 +02:00
Michael Crosby
eebfcde0ea
Merge pull request #12249 from runcom/remove-job-pause-unpause
...
Remove job from pause/unpause
2015-04-09 15:09:48 -07:00
Alexander Morozov
67676529b3
Merge pull request #12092 from tiborvass/no-jobs-networkdriver-bridge
...
Remove jobs from daemon/networkdriver/bridge
2015-04-09 14:10:21 -07:00
Antonio Murdaca
5ccb1c764b
Remove job from pause/unpause
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
2015-04-09 22:50:48 +02:00
Alexander Morozov
ccdef895de
Removed engine from /copy
...
* Client and server use types.CopyConfig
* API calls container.Copy directly
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
2015-04-09 13:05:31 -07:00
Alexander Morozov
92a775bd7a
Merge pull request #12234 from runcom/remove-job-rmi
...
Remove job from rmi
2015-04-09 11:24:20 -07:00
Alexander Morozov
3218f3936d
Merge pull request #12197 from runcom/remove-job-rm
...
Remove job from rm
2015-04-09 11:21:52 -07:00
Antonio Murdaca
e4afc379dc
Remove job from rmi
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
2015-04-09 19:39:14 +02:00
Alexander Morozov
0fec3e19db
Fix regressions in attach
...
* Wrong bool parsing
* Attach always all streams
Were introduced in #12120
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
2015-04-09 09:58:44 -07:00
Antonio Murdaca
db13cb7f98
Remove job from rm
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
2015-04-09 18:46:24 +02:00
Alexander Morozov
6ba7bf440e
Merge pull request #12184 from duglin/RemoveJobImages
...
Remove Job from `docker images`
2015-04-09 09:19:09 -07:00
Doug Davis
8295bed3df
Merge pull request #12207 from WiseTrem/getBoolParam
...
Removing unused getBoolParam func from api/server/server.go
2015-04-09 08:28:48 -07:00
Hu Keping
49c4de4aeb
Remove Job from rename
...
A part of ISSUE#12151-Remove engine.Job mechanism
Signed-off-by: Hu Keping <hukeping@huawei.com>
2015-04-10 01:52:55 +08:00
WiseTrem
0fc75a3136
Removing unused getBoolParam func from api/server/server.go
...
Fix #12199
Signed-off-by: Gleb Shepelev <shepelyov.g@gmail.com>
2015-04-09 09:13:16 +03:00
Doug Davis
d045b9776b
Remove Job from `docker images`
...
Also removes engine.Table
Signed-off-by: Doug Davis <dug@us.ibm.com>
2015-04-08 19:33:01 -07:00
Tibor Vass
53582321ee
Remove jobs from daemon/networkdriver/bridge
...
Signed-off-by: Tibor Vass <tibor@docker.com>
2015-04-08 18:50:29 -04:00
Arnaud Porterie
7233bd223d
Merge pull request #12163 from duglin/RemoveJobPS
...
Remove Job from PS API
2015-04-08 13:43:47 -07:00
Megan Kostick
88119bb276
Fixing JSON Tags
...
Signed-off-by: Megan Kostick <mkostick@us.ibm.com>
2015-04-08 12:05:12 -07:00
Doug Davis
1bfa80bdd9
Remove Job from PS API
...
Signed-off-by: Doug Davis <dug@us.ibm.com>
2015-04-08 10:30:17 -07:00
Alexander Morozov
3ebfc99d10
Merge pull request #12066 from LK4D4/split_events
...
Remove engine usage from events
2015-04-08 08:29:24 -07:00
Antonio Murdaca
e379e2668c
Remove engine.Job from diff
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
2015-04-08 15:52:10 +02:00
Tibor Vass
dccda72a41
Merge pull request #12120 from LK4D4/split_attach
...
Remove engine usage from attach
2015-04-07 18:13:35 -04:00
Alexander Morozov
c44f513248
Remove engine usage from attach
...
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
2015-04-07 14:23:09 -07:00
Phil Estes
e011119a49
Merge pull request #12129 from duglin/RemoveTable5
...
Remove engine.Table from more daemon side stuff
2015-04-07 12:53:55 -04:00
Alexander Morozov
c9eb37f975
Remove engine usage for events
...
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
2015-04-07 08:43:18 -07:00
Doug Davis
650bc2ffe5
Remove engine.Table from more daemon side stuff
...
Signed-off-by: Doug Davis <dug@us.ibm.com>
2015-04-06 15:06:02 -07:00
Ahmet Alp Balkan
6e44246fed
Swap width/height in GetWinsize and monitorTtySize
...
Signed-off-by: Ahmet Alp Balkan <ahmetalpbalkan@gmail.com>
2015-04-06 14:31:42 -07:00
Phil Estes
dec48d6708
Merge pull request #12070 from duglin/RemoveTableCLI
...
Last step in removing engine.Table from api/client/*
2015-04-06 16:33:29 -04:00
Arnaud Porterie
ed8d402851
Merge pull request #11978 from x1022as/info-show-loggingdriver
...
docker info show logging driver info
2015-04-06 11:11:31 -07:00
Doug Davis
065648a832
Last step in removing engine.Tabel from api/client/*
...
Signed-off-by: Doug Davis <dug@us.ibm.com>
2015-04-06 10:55:53 -07:00
Shishir Mahajan
7d0053d554
Applying: Fix for Issue 11285: warning message displayed when updating an existing image
...
Signed-off-by: Shishir Mahajan <shishir.mahajan@redhat.com>
2015-04-06 09:05:03 -04:00
Jessie Frazelle
b2fbd9e632
Merge pull request #12060 from duglin/RemoveTable3
...
Remove engine.Table from docker search and fix missing field
2015-04-03 21:29:36 +00:00
Doug Davis
67b4cce0f6
Remove engine.Table from docker search and fix missing field
...
registry/SearchResults was missing the "is_automated" field.
I added it back in.
Pull this 'table' removal one from the others because it fixed
a bug too
Signed-off-by: Doug Davis <dug@us.ibm.com>
2015-04-03 11:27:30 -07:00
Michael Crosby
e64f6baf11
Merge pull request #12010 from ibuildthecloud/small
...
Small changes from #11967 for review comments
2015-04-03 11:27:06 -07:00
Jessie Frazelle
b3e9c274dd
Merge pull request #11981 from unclejack/fix_profiler
...
api/server: fix profiler HTTP serving
2015-04-03 18:25:12 +00:00
Michael Crosby
326a5545d4
Merge pull request #12058 from duglin/RemoveTable2
...
Remove engine.Table from docker history and docker rmi
2015-04-03 10:57:52 -07:00
Doug Davis
0b2fa9c707
Remove engine.Table from docker history and docker rmi
...
Signed-off-by: Doug Davis <dug@us.ibm.com>
2015-04-03 08:31:30 -07:00
Yuan Sun
87e0e4eb43
If docker search with --starts=${negative number}, it would show the warning.
...
Signed-off-by: Yuan Sun <sunyuan3@huawei.com>
2015-04-03 08:55:34 +08:00
Doug Davis
49c72506ac
Remove use of Table from 'docker diff'
...
Signed-off-by: Doug Davis <dug@us.ibm.com>
2015-04-02 16:55:58 -07:00
unclejack
3bea892d54
api/server: fix profiler HTTP serving
...
Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com>
2015-04-02 09:53:40 +03:00
Darren Shepherd
7433c9c92a
Make server_windows.go consistent with server_linux.go
...
Signed-off-by: Darren Shepherd <darren@rancher.com>
2015-04-01 17:31:15 -07:00
Darren Shepherd
34f44c642f
Infer type
...
Signed-off-by: Darren Shepherd <darren@rancher.com>
2015-04-01 17:31:09 -07:00
Arnaud Porterie
3fe7a3d537
Merge pull request #12005 from LK4D4/bump_docs
...
Bump API version and docs to v1.19
2015-04-01 15:34:28 -07:00
Alexander Morozov
81f9b72c64
Bump API version and docs to v1.19
...
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
2015-04-01 13:40:56 -07:00
Tibor Vass
4467b6a2cb
Merge pull request #11974 from crosbymichael/registry-jobs
...
Remove jobs from registry.Service
2015-04-01 16:32:41 -04:00
Doug Davis
d351aef8af
Remove dead code looking for non-existent err msg
...
Closes #11985
Signed-off-by: Doug Davis <dug@us.ibm.com>
2015-04-01 07:37:10 -07:00
Deng Guangxing
f5a401d3fe
docker info show logging driver info
...
Signed-off-by: Deng Guangxing <dengguangxing@huawei.com>
2015-04-01 16:05:14 +08:00
Michael Crosby
03d3d79b2b
Remove jobs from registry.Service
...
This makes `registry.Service` a first class type and does not use jobs
to interact with this type.
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2015-03-31 16:38:04 -07:00
Jessie Frazelle
596ddef7d7
Merge pull request #11967 from LK4D4/fix_panic
...
Avoid ServeApi race condition
2015-03-31 16:37:32 -07:00
Alexander Morozov
c717475714
Fix panic in integration tests
...
Closing activationLock only if it's not closed already. This is needed
only because integration tests using docker code directly and doesn't
care about global state.
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
2015-03-31 15:12:15 -07:00
Michael Crosby
62806cc85e
Refactor API socket handling
...
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2015-03-31 13:37:49 -07:00
Michael Crosby
7609d52797
Move Profiler into specific http.Handler
...
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2015-03-31 11:38:17 -07:00
Tibor Vass
ddbc68f564
Merge pull request #11843 from ahmetalpbalkan/win-cli/monitorttysize
...
windows: monitorTtySize correctly by polling
2015-03-31 11:14:04 -04:00
Michael Crosby
d8c628cf08
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>
2015-03-30 18:28:24 -07:00
Darren Shepherd
8f6a14452d
Avoid ServeApi race condition
...
If job "acceptconnections" is called before "serveapi" the API Accept()
method will hang forever waiting for activation. This is due to the fact
that when "acceptconnections" ran the activation channel was nil.
Signed-off-by: Darren Shepherd <darren@rancher.com>
2015-03-30 17:39:43 -07:00
Michael Crosby
fe9f3227b1
Merge pull request #11859 from HuKeping/eof
...
Add nice error message
2015-03-30 13:53:09 -07:00
Michael Crosby
00a15227f8
Merge pull request #11893 from runcom/11892-refactor-utils-flags
...
Refactor utils/flags.go
2015-03-30 13:35:40 -07:00
Antonio Murdaca
5670c6c695
Refactor utils/flags.go, fixes #11892
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
2015-03-29 03:22:46 +02:00
Jamie Hannaford
8b795a05a8
Use ContainerCommitResponse struct for Commit cmd
...
Signed-off-by: Jamie Hannaford <jamie.hannaford@rackspace.com>
2015-03-28 17:55:45 +01:00
Hu Keping
cee62a95a2
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>
2015-03-28 16:27:30 +08:00
Lei Jitang
013fb87543
Fix error from daemon no such image even when the image exist
...
Signed-off-by: Lei Jitang <leijitang@huawei.com>
2015-03-28 09:07:20 +08:00
Michael Crosby
c088486093
Merge pull request #11845 from lobatt/master
...
Issue #11836
2015-03-27 14:55:04 -07:00
Ankush Agarwal
6d21b2ba80
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>
2015-03-27 13:08:20 -07:00
Brian Goff
da5c863d20
Merge pull request #11788 from reikani/pchoi
...
Changed snake case naming to camelCase.
2015-03-26 23:55:50 -07:00
chli
f581f74209
Issue #11836
...
Signed-off-by: chli <chli@freewheel.tv>
2015-03-26 19:18:23 -04:00
Ahmet Alp Balkan
ebbceea8a7
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>
2015-03-26 16:08:05 -07:00
Antonio Murdaca
6f4d847046
Replace aliased imports of logrus, fixes #11762
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
2015-03-26 23:22:04 +01:00
Peter Choi
ae907e7af1
Changed snake case naming to camelCase
...
Signed-off-by: Peter Choi <phkchoi89@gmail.com>
2015-03-26 15:05:45 -06:00
Don Kjer
6b2eeaf896
Fix for issue 9922: private registry search with auth returns 401
...
Signed-off-by: Don Kjer <don.kjer@gmail.com>
2015-03-26 18:59:16 +00:00
Michael Crosby
708ed9d87a
Merge pull request #11766 from peggyl/11596-api-commands-godoc
...
Add godoc-style docstrings to Cmd... methods
2015-03-26 10:58:35 -07:00
Alexander Morozov
b9d19fdaef
Merge pull request #11786 from peggyl/golint-api-client
...
Fix golint errors for casing in api/client package
2015-03-26 09:28:33 -07:00
Alexander Morozov
d4fca8047c
Merge pull request #11789 from parknicker/PostContainerWaitFix
...
Changes response of postContainersWait to use a struct
2015-03-26 08:40:00 -07:00
Nick Parker
89d63d2a82
fixes comment for ContainerWaitResponse struct
...
Signed-off-by: Nick Parker <nikaios@gmail.com>
2015-03-25 22:22:58 -06:00
Peggy Li
2a5a402c71
Update CmdCommit docstring and fix CmdHelp whitespace
...
Signed-off-by: Peggy Li <peggyli.224@gmail.com>
2015-03-25 20:07:00 -07:00
Nick Parker
1bc266dfa7
Changes response of postContainersWait to use a struct
...
Signed-off-by: Nick Parker <nikaios@gmail.com>
2015-03-25 21:01:14 -06:00
Peggy Li
a465e26bb0
Fix golint errors for casing in api/client package
...
Signed-off-by: Peggy Li <peggyli.224@gmail.com>
2015-03-25 19:54:29 -07:00
bobby abbott
0cd6c05d81
Fixes hacks from progressreader refactor
...
related to #10959
Signed-off-by: bobby abbott <ttobbaybbob@gmail.com>
2015-03-25 18:21:02 -07:00
Arnaud Porterie
e589dc7424
Merge pull request #11757 from ankushagarwal/Fds
...
Rename 'Fds' to 'File Descriptors' in docker info
2015-03-25 16:24:57 -07:00
Antonio Murdaca
c79b9bab54
Remove engine.Status and replace it with standard go error
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
2015-03-25 22:32:08 +01:00
Peggy Li
b5d0380108
Add godoc-style docstrings to Cmd... methods
...
Signed-off-by: Peggy Li <peggyli.224@gmail.com>
2015-03-25 14:17:11 -07:00
Ankush Agarwal
161c2e5e74
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>
2015-03-25 12:04:15 -07:00
Doug Davis
0d65069a17
Fix login
...
Right now it returns:
```
FATA[0001] json: Unmarshal(non-pointer types.AuthResponse)
```
Signed-off-by: Doug Davis <dug@us.ibm.com>
2015-03-25 08:45:14 -07:00
Joey Gibson
58690c9cca
api/client - The code for all cli commands are in one file #11610
...
Signed-off-by: Joey Gibson <joey@joeygibson.com>
2015-03-24 23:57:23 -04:00
Michael Crosby
73dab8205a
Merge pull request #11679 from avidas/api-common-constants-document
...
Add comments to api/common constants
2015-03-24 14:43:09 -07:00
Michael Crosby
8eee55a35c
Merge pull request #11710 from runcom/11599-refactor-pkg-common
...
Refactor pkg/common, Fixes #11599
2015-03-24 11:45:07 -07:00
Antonio Murdaca
b80fae7356
Refactor pkg/common, Fixes #11599
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
2015-03-24 18:19:59 +01:00
Antonio Murdaca
babd1b3e1f
Return AuthResponse from postAuth api endpoint, Fixes #11607
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
2015-03-24 09:57:01 +01:00
Avi Das
c136591f40
Add comments to api/common constants, closes #11583
...
Signed-off-by: Avi Das <andas222@gmail.com>
2015-03-23 22:35:41 -05:00
Jessie Frazelle
e6b7d93072
Merge pull request #11665 from runcom/11613-api-exec-start-structured-response
...
Return ContainerExecCreateResponse from container exec create API endpoint
2015-03-23 17:52:15 -07:00
Jessie Frazelle
d5eea4e8b0
Merge pull request #11636 from robertabbott/refactor_networkfs
...
Refactor pkg/networkfs
2015-03-23 16:58:29 -07:00
Antonio Murdaca
0c3d2f6f96
Return ContainerExecCreateResponse from container exec start API endpoint, Fixes #11613
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
2015-03-24 00:41:54 +01:00
Alexander Morozov
197a3f0a98
Merge pull request #11570 from runcom/9658-consistent-autoremove
...
Remove container if --rm flag is passed and container cannot be started
2015-03-23 15:38:51 -07:00
Alexander Morozov
bd95202161
Merge pull request #11406 from MabinGo/CmdStart_fix
...
Fix hanging up problem when start and attach multiple containers at once
2015-03-23 10:17:50 -07:00
Antonio Murdaca
d124197cc7
Remove container if --rm flag is passed and container cannot be started
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
2015-03-23 13:03:31 +01:00
bobby abbott
a91b2431a3
Refactor pkg/networkfs
...
Solves #11591
Signed-off-by: bobby abbott <ttobbaybbob@gmail.com>
2015-03-22 23:53:47 -07:00
Mabin
7dc1af146d
Fix hanging up problem when start and attach multiple containers
...
Signed-off-by: Mabin <bin.ma@huawei.com>
2015-03-23 12:10:22 +08:00
Jessie Frazelle
45ee402a63
Merge pull request #9774 from pwaller/cancellation
...
Add basic build cancellation
2015-03-22 19:16:23 -07:00
Arnaud Porterie
e09ead98ef
Merge pull request #11566 from tiborvass/carry-10864
...
Carry 10864: ANSI terminal emulation for windows
2015-03-22 18:21:32 -07:00
Peter Waller
671c12204c
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>
2015-03-22 11:31:28 +00:00
Doug Davis
c536e5bfb4
Merge pull request #11397 from ahmetalpbalkan/win-cli/build-warning
...
Add cli build warning about chmod bits on windows
2015-03-20 19:19:38 -04:00
Ahmet Alp Balkan
4a8b3cad60
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>
2015-03-20 20:13:32 +00:00
Brian Goff
16309bef63
Add integration test for unix sock cleanup
...
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2015-03-20 12:34:35 -04:00
Rik Nijessen
0c0e9836c4
Implement cleanup unix sockets after serving.
...
Signed-off-by: Rik Nijessen <riknijessen@gmail.com>
2015-03-20 09:12:59 -04:00
Doug Davis
2cde817458
Merge pull request #11410 from cpuguy83/10191_build_resources
...
Allow setting resource constraints for build
2015-03-18 21:44:21 -04:00
Brian Goff
e6ae89a45a
Allow setting resource constrains for build
...
Closes #10191
Allow `docker build` to set --cpu-shares, --cpuset, --memory,
--memory-swap for all containers created by the build.
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2015-03-18 20:57:13 -04:00
Tibor Vass
8ec4e69839
Merge pull request #11430 from jfrazelle/export_outputflag
...
Modified `docker export` to allow an --output flag
2015-03-18 19:04:43 -04:00
Jessie Frazelle
29f809233e
Merge pull request #11464 from ncdc/fix-duplicate-dangling-images
...
Fix duplicate display of dangling images
2015-03-18 13:53:33 -07:00
moxiegirl
50bf3cbedc
Merge pull request #11305 from moxiegirl/HOSTPATH-text-11144
...
Clarify behavior of docker cp
2015-03-18 08:46:52 -07:00
Andy Goldstein
c680dd9e5a
Fix duplicate display of dangling images
...
Signed-off-by: Andy Goldstein <agoldste@redhat.com>
2015-03-18 10:41:01 -04:00
Arnaud Porterie
1ff5a91007
Merge pull request #10568 from LK4D4/logging_drivers
...
Logging drivers
2015-03-17 09:45:58 -07:00
Andy Goldstein
a2b0c9778f
Add ability to refer to image by name + digest
...
Add ability to refer to an image by repository name and digest using the
format repository@digest. Works for pull, push, run, build, and rmi.
Signed-off-by: Andy Goldstein <agoldste@redhat.com>
2015-03-17 10:10:42 +00:00
Joseph Kern
5ff122f797
Modified `docker export` to allow an --output flag
...
Copied code from CmdSave into CmdExport. This should work, not an expert in the API calls being made. But it does make more sense to have a consistent export/save flag.
Signed-off-by: Joseph Kern <joseph.a.kern@gmail.com>
checkpoint before edits on the export functions
Signed-off-by: Joseph Kern <joseph.a.kern@gmail.com>
Added an --output flag to docker export and created tests.
Signed-off-by: Joseph Kern <joseph.a.kern@gmail.com>
White space cleanup.
Signed-off-by: Joseph Kern <joseph.a.kern@gmail.com>
Docker-DCO-1.1-Signed-off-by: Joseph Kern <jkern@semafour.net> (github: jfrazelle)
checkpoint before edits on the export functions
Signed-off-by: Joseph Kern <joseph.a.kern@gmail.com>
White space cleanup.
Signed-off-by: Joseph Kern <joseph.a.kern@gmail.com>
Added text to reflect a new output option for the export command.
Signed-off-by: Joseph Kern <joseph.a.kern@gmail.com>
Whitespace clean up
Signed-off-by: Joseph Kern <joseph.a.kern@gmail.com>
Added man page documentation for the new --output flag in export
Signed-off-by: Joseph Kern <joseph.a.kern@gmail.com>
2015-03-17 00:20:19 -07:00
Michael Crosby
88f437d6c6
Merge pull request #11402 from miminar/err-cleanup
...
Error formatting cleanups
2015-03-16 16:13:16 -07:00
Michael Crosby
66bf7a269a
Merge pull request #11300 from Microsoft/10662_jjh_server_factor_serverfd_and_systemd_for_windows
...
Factor out ServeFD & systemd in server for Linux only (Not Windows)
2015-03-16 14:12:48 -07:00
Sachin Joshi
45262c4cb0
Use syscall consts, check for errors,
...
Also rename func for non-windows specific names.
Signed-off-by: Sachin Joshi <sachin_jayant_joshi@hotmail.com>
2015-03-16 14:04:56 -07:00
Sachin Joshi
d8c3090dd9
ANSI terminal emulation for windows
...
It is implemented by intercepting and interpreting the output
escape sequence by calling win32 console apis.
In addition the input from win32 console is translated to linux keycodes
Signed-off-by: Sachin Joshi <sachin_jayant_joshi@hotmail.com>
2015-03-16 14:04:49 -07:00
Alexander Morozov
8ae20d8eba
Merge pull request #10977 from robertabbott/10959-progressreader
...
Moves progressreader from utils to its own package
2015-03-16 12:45:33 -07:00
Mary Anthony
9a78ed8f48
Clarify behavior of docker cp
...
The STDOUT behavior of cp is not yet released in 1.50 so removed.
Also, tested against 1.5 all other behaviors and extended documentation to match.
Renamed HOSTPATH to HOSTDIR to give a self documenting name.
Adding back in the references to STDOUT
fix the command string
Entering Doug's comment re append and ~/tmp/foo in the glass
Adding in Doug's comments regarding PATHs and missing |-
Updating with James comments
Signed-off-by: Mary Anthony <mary@docker.com>
2015-03-16 12:44:28 -07:00
Michal Minar
210ab030bc
Format error by value
...
- Use `%v` verb to format errors.
- Give `param` constant in portallocator some better name.
Signed-off-by: Michal Minar <miminar@redhat.com>
2015-03-16 12:05:53 +01:00
Aidan Hobson Sayers
8ef79ae8e4
Correctly check that gid parses as an int
...
Signed-off-by: Aidan Hobson Sayers <aidanhs@cantab.net>
2015-03-14 23:02:53 +00:00
Alexander Morozov
bdf3a0295d
Fail docker logs on all logging drivers apart from 'json-file'
...
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
2015-03-13 15:02:09 -07:00
Aidan Hobson Sayers
334382a8c3
Allow a non-existent groupid to own the docker socket
...
Signed-off-by: Aidan Hobson Sayers <aidanhs@cantab.net>
2015-03-13 18:12:50 +00:00
moxiegirl
e781c9624c
Merge pull request #10620 from acbodine/notify_user_of_creds_save
...
Adds: notify user of login credential persistence for registry
2015-03-12 13:43:20 -07:00
moxiegirl
24408f1c18
Merge pull request #11325 from duglin/11289-HelpDashF
...
Minor tweak to build -f text to make it clear Dockerfile is in context
2015-03-11 14:58:38 -07:00
moxiegirl
d010bf0d99
Merge pull request #11291 from ahmetalpbalkan/info/system-date
...
Add system time to /info
2015-03-11 09:43:43 -07:00
Doug Davis
1b46248a33
Minor tweak to build -f text to make it clear Dockerfile is in context
...
Closes #11289
Signed-off-by: Doug Davis <dug@us.ibm.com>
2015-03-11 09:04:30 -07:00
Zen Lin(Zhinan Lin)
2b051bcbda
Normalize the log for docker subcommand usage,
...
delete unecessary blank after "[OPTIONS] "
and add a blank to the log between options and signature.
To make the code style consistency.
Signed-off-by: Zen Lin(Zhinan Lin) <linzhinan@huawei.com>
2015-03-11 18:58:32 +08:00
bobby abbott
12b278d354
Remove import to utils in progressreader
...
Added method in StreamFormatter to handle calls
from progressreader. Solves #10959
Signed-off-by: bobby abbott <ttobbaybbob@gmail.com>
2015-03-11 00:50:27 -07:00
Ahmet Alp Balkan
2977fd2b7a
Add system time to /info
...
This change adds daemon's system time as RFC3339Nano to the `/info` endpoint
and shows in a more readable format (UnixDate) in `docker -D info` output.
I will be using this to fix the clock skew between the remote test host and
the CI machines running `docker events`-related tests as they're using `--since`
and `--until` and the timestamps are not matching when daemon is not on the
same machine.
Signed-off-by: Ahmet Alp Balkan <ahmetalpbalkan@gmail.com>
2015-03-10 15:29:05 -07:00
John Howard (VM)
081c6c76e2
Factor out ServeFD & systemd in server for Linux only (Not Windows)
...
Signed-off-by: John Howard <John.Howard@microsoft.com>
2015-03-10 15:06:16 -07:00
Jessie Frazelle
8be1671f45
Merge pull request #11288 from estesp/warn-on-localhost-dns
...
Add warning for --dns flag set to localhost addresses.
2015-03-10 12:03:46 -07:00
Phil Estes
afa92a9af0
Add warning for --dns flag set to localhost addresses.
...
We should warn users who use the `--dns` command line option to point
DNS to a localhost address, either IPv4 or IPv6. Unless they have
specifically set up the container as a DNS server or are using
--net=host (which is why this should be allowed, but warned on because
those are pretty unique cases) a localhost address as a resolver will
not reach what they might expect (e.g. expecting it will hit localhost
on the Docker daemon/host).
Added a test for the message, and fixed up tests to separate stdout and
stderr that were using `--dns=127.0.0.1` to test the options.
Docker-DCO-1.1-Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com> (github: estesp)
2015-03-10 14:43:17 -04:00
Tibor Vass
aa19a78d3d
Merge pull request #11258 from HuKeping/cmdlogin
...
Remove leading spaces of username when login
2015-03-09 19:02:24 -04:00
Hu Keping
2687502ba4
Remove leading spaces of username when login
...
When we run `docker login` we will be asked to input our username.
Prior to this PR, "userA" and " userA" will be considered as two
diferrent user, which is not right.
Signed-off-by: Hu Keping <hukeping@huawei.com>
2015-03-10 07:54:08 +08:00
moxiegirl
b85c137f1d
Merge pull request #11227 from coolljt0725/fix_start_help_message
...
Fix docker start help message
2015-03-09 09:54:36 -07:00
moxiegirl
8b516bf5ce
Merge pull request #11177 from duglin/10805-cp-to-stdot
...
Add support for 'docker cp' to write to stdout
2015-03-09 09:51:48 -07:00
Alexander Morozov
c5f9aa18f4
Merge pull request #11219 from icecrime/remove_maintainers_files
...
Remove subdirectories MAINTAINERS files
2015-03-09 09:02:58 -07:00
Phil Estes
93e78ac8e7
Merge pull request #11225 from coolljt0725/show_error_message
...
Add docker start show error message form daemon when start failed
2015-03-08 14:39:40 -04:00
Lei Jitang
2a5a50dca7
Fix docker start muliple containers continue on one failed and
...
add docker start show error message from daemon when start failed
Signed-off-by: Lei Jitang <leijitang@huawei.com>
2015-03-08 13:44:25 +08:00
Doug Davis
6f0733a9e3
Merge pull request #11212 from cpuguy83/better_error_message_for_tls_issues
...
Improve error messages for loading tls keys
2015-03-07 16:47:16 -05:00
Lei Jitang
3c37f88aff
Fix docker start help message
...
Signed-off-by: Lei Jitang <leijitang@huawei.com>
2015-03-07 20:45:46 +08:00
Arnaud Porterie
89bdaa35e0
Remove subdirectories MAINTAINERS files
...
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com>
2015-03-06 18:21:51 -08:00
Brian Goff
2ea6c2c264
Improve error messages for loading tls keys
...
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2015-03-06 20:40:09 -05:00
Lei Jitang
518fdf972d
Fix start container failed hijack the stdin of terminal
...
Signed-off-by: Lei Jitang <leijitang@huawei.com>
2015-03-06 09:06:14 -08:00
Zhang Wentao
06a40f0f28
docker info display http/https_proxy setting
...
Signed-off-by: Zhang Wentao <zhangwentao234@huawei.com>
2015-03-06 09:02:21 +08:00
Doug Davis
f3d96e81e9
Add support for 'docker cp' to write to stdout
...
Closes #10805
Signed-off-by: Doug Davis <dug@us.ibm.com>
2015-03-05 15:22:08 -08:00
Jessie Frazelle
7b3ffd5cc0
Merge pull request #10586 from resouer/10532-fix-cors-hardcode
...
Fix 10532 to change --api-enable-cors to string.
2015-03-04 18:42:20 +00:00
Jessie Frazelle
ffc755ac14
Merge pull request #11134 from duglin/CheckMultiLineHelp
...
Fix 'docker ps --help' so the options don't span more than one line
2015-03-04 05:53:47 -08:00
Jessie Frazelle
beea697be3
Merge pull request #10858 from duglin/10807-MixedcaseDockerfile
...
Support dockerfile and Dockerfile
2015-03-04 03:52:49 -08:00
Doug Davis
15924f2385
Support dockerfile and Dockerfile
...
Closes #10807
Adds support for `dockerfile` ONLY when `Dockerfile` can't be found.
If we're building from a Dockerfile via stdin/URL then always download
it a `Dockerfile` and ignore the -f flag.
Signed-off-by: Doug Davis <dug@us.ibm.com>
2015-03-03 18:38:50 -08:00
Doug Davis
5595da2bde
Fix 'docker ps --help' so the options don't span more than one line
...
and add a testcase to catch this in the future.
While in there I also:
- removed extra periods from the few options that had them (new test)
- made the --filter option consistent across all command
Signed-off-by: Doug Davis <dug@us.ibm.com>
2015-03-03 10:02:23 -08:00
resouer
dc0a6c1f5e
Rebase & update api doc v1.18 instead
...
Signed-off-by: harry zhang <resouer@163.com>
2015-03-03 12:32:17 +08:00
resouer
f3dd2db4ff
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>
2015-03-03 11:21:19 +08:00
Jessie Frazelle
c5ecdfd878
Merge pull request #10971 from Microsoft/10662-api_server_factor_out_windows
...
api\server: Factored out UnixHttp on Windows, supported on Linux only.
2015-03-02 12:40:20 -08:00
Jessie Frazelle
2bfa701f45
Merge pull request #10986 from crosbymichael/create-api-type
...
Create api types package for structured responses
2015-03-02 12:22:02 -08:00
John Howard (VM)
69246e1527
api\server: Factored out UnixHttp on Windows, supported on Linux only.
...
Signed-off-by: John Howard <John.Howard@microsoft.com>
2015-02-25 09:24:34 -08:00
Ahmet Alp Balkan
5ecab9e831
Support windows style dockerfile paths for build cmd
...
Currently TestBuildRenamedDockerfile fails since passing
custom dockerfile paths like:
docker build -f dir/file .
fails on windows because those are unix paths. Instead, on
windows accept windows style paths like:
docker build -f dir\file .
and convert them to unix style paths using the helper we
have in `pkg/archive` so that daemon can correctly locate
the path in the context.
Signed-off-by: Ahmet Alp Balkan <ahmetalpbalkan@gmail.com>
2015-02-24 20:23:53 -08:00
Michael Crosby
f57c26553b
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>
2015-02-24 15:27:49 -08:00
Michael Crosby
7fed7d7eb4
Move stats api types into api/types package
...
Move the stats structs from the api/stats package into a new package
api/types that will contain all the api structs for docker's api request
and responses.
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2015-02-24 10:47:47 -08:00
Dan Walsh
17abfc3ddc
pass --change changes to the import job
...
Docker-DCO-1.1-Signed-off-by: Dan Walsh <dwalsh@redhat.com> (github: rhatdan)
2015-02-24 13:01:36 -05:00
Daniel, Dao Quang Minh
f8e77dfb3d
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)
2015-02-24 13:01:35 -05:00
Alexander Morozov
02c8881596
Merge pull request #10933 from ahmetalpbalkan/version-daemon-os-arch
...
cli: Add server OS/Arch info to 'version' cmd
2015-02-23 15:26:53 -08:00
Ahmet Alp Balkan
3346c2e4d9
cli: Add server OS/Arch info to 'version' cmd
...
Signed-off-by: Ahmet Alp Balkan <ahmetalpbalkan@gmail.com>
2015-02-23 14:32:25 -08:00
Srini Brahmaroutu
7a9c944b82
Removing dependencies from pkg into Docker internal code
...
Closes #10922
Signed-off-by: Srini Brahmaroutu <srbrahma@us.ibm.com>
2015-02-23 18:43:10 +00:00
Alexander Morozov
4cc8ccb8d2
Merge pull request #10730 from mattyw/fix-10728
...
api/server: don't print warning if serving on localhost
2015-02-20 10:43:56 -08:00
Michael Crosby
b32564798d
Merge pull request #10665 from brahmaroutu/autogen_removeXflag
...
Removing -X flag option and autogenerating code to create Dockerversion....
2015-02-20 09:53:07 -08:00
Chen Hanxiao
0050efcd8f
commands: fix a comment typo
...
s/overide/override
Signed-off-by: Chen Hanxiao <chenhanxiao@cn.fujitsu.com>
2015-02-20 23:46:29 +08:00
Srini Brahmaroutu
6871b9b16a
Removing -X flag option and autogenerated code to create Dockerversion.go functionality
...
Addresses #9207
Signed-off-by: Srini Brahmaroutu <srbrahma@us.ibm.com>
2015-02-20 05:40:12 +00:00
mattyw
0ae455333b
api/server: don't print warning if serving on localhost
...
Fixes bug #10728
Signed-off-by: mattyw <gh@mattyw.net>
2015-02-20 12:37:17 +08:00
Jessie Frazelle
934535db9c
Merge pull request #10468 from noironetworks/10457-Pause-and-unpause-accept-multi-containers
...
Allow docker pause and unpause to accept multiple containers
2015-02-19 15:16:05 -08:00
Steve Francia
1875cc2ef4
Merge pull request #10835 from jfrazelle/port-ranges
2015-02-19 16:11:59 -05:00
Rich Seymour
ea8cb16af7
calcuate -> calculate typo fix
...
Signed-off-by: Rich Seymour <rseymour@gmail.com>
2015-02-19 12:44:38 -05:00
Jessica Frazelle
ba99a73c2f
fix naming, add a test for port range on docker ps
...
Docker-DCO-1.1-Signed-off-by: Jessie Frazelle <jess@docker.com> (github: jfrazelle)
2015-02-16 11:08:32 -08:00
Colm Hally
5dfef4fe08
Group published and exposed ports by contiguous ranges
...
Signed-off-by: Colm Hally <colmhally@gmail.com>
2015-02-16 10:52:23 -08:00
Doug Davis
b55346b327
Fix 'docker stats' help message
...
Closes #10771
Signed-off-by: Doug Davis <dug@us.ibm.com>
2015-02-13 12:45:50 -08:00
Andrew C. Bodine
0fadc9bd90
adds notify user of login credential persistence for registry
...
Signed-off-by: Andrew C. Bodine <acbodine@us.ibm.com>
2015-02-12 23:45:50 -08:00
Brian Goff
f6e697d2ac
Do not use HTTP_PROXY for unix sock
...
Makes sure the CLI does not use HTTP_PROXY when connecting to unix
socket.
Also adds some tests to make sure this functionality works as expected.
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2015-02-12 11:38:52 -05:00
Alexander Morozov
d92b4232f7
Bump api version to 1.18
...
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
2015-02-10 10:48:54 -08:00
André Martins
0ce42dcc96
Fixes #10457-Pause-and-unpause-accept-multi-containers
...
Applied multi parameters to pause and unpause.
Created a new test file dedicated for pause commands.
Created a new utility function to get a slice of paused containers.
Updated documentation
Signed-off-by: André Martins <martins@noironetworks.com>
2015-02-07 00:28:49 +00:00
Michael Crosby
eb79acd7a0
Merge pull request #10421 from noironetworks/10388-Specifying_confliting_options
...
Specifying -a and -d to docker run should throw an error
2015-02-06 14:58:08 -08:00
Michael Crosby
34c804a139
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
2015-02-06 14:01:28 -08:00
Ahmet Alp Balkan
f9ae2d4fd4
Export $HOME lookup to pkg/homedir
...
Signed-off-by: Ahmet Alp Balkan <ahmetb@microsoft.com>
2015-02-06 11:42:45 -08:00
Ahmet Alp Balkan
6ffb77afd4
Extract $HOME usages into utils.GetHomeDir()
...
Refactored getHomeDir in docker/docker to GetHomeDir in utils
pkg. Currently covers all use cases on the client-side.
Signed-off-by: Ahmet Alp Balkan <ahmetb@microsoft.com>
2015-02-05 16:13:51 -08:00
Jessica Frazelle
4855612aae
Fix compilation on Go 1.3.3
...
Docker-DCO-1.1-Signed-off-by: Jessie Frazelle <jess@docker.com> (github: jfrazelle)
2015-02-04 13:35:20 -08:00
Doug Davis
2203b37733
Pretty the help text
...
This modifies the "docker help" text so that it is no wider than 80 chars
and each description fits on one line. This will also try to use ~ when
possible
Added a test to make sure we don't go over 80 chars again.
Added a test to make sure we use ~
Applied rules/tests to all docker commands - not just main help text
Closes #10214
Signed-off-by: Doug Davis <dug@us.ibm.com>
2015-02-04 07:59:16 -08:00
Arnaud Porterie
22e2254c74
Fix client-side validation of Dockerfile path
...
Arguments to `filepath.Rel` were reversed, making all builder tests to
fail.
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com>
2015-02-02 23:42:18 -08:00
Tibor Vass
73d5baf585
builder: prevent Dockerfile to leave build context
...
Signed-off-by: Tibor Vass <teabee89@gmail.com>
2015-02-02 23:40:24 -08:00
Michael Crosby
ab4f9495ba
Print zeros for initial stats collection on stopped container
...
When calling stats on stopped container's print out zeros for all of the
values to populate the initial table. This signals to the user that the
operations completed and will not block.
Closes #10504
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2015-02-02 15:01:13 -08:00
André Martins
af90fe6a63
Fixes #10388
...
The cmd.Lookup should be "-attach" and not "attach", as seen in
docker/docker/runconfig/parse.go
Signed-off-by: André Martins <martins@noironetworks.com>
2015-02-02 12:07:52 +00:00
Alexander Morozov
d8ad7c0edc
Merge pull request #10456 from dmcgowan/revert-client-signature
...
Revert client signature
2015-01-30 14:54:27 -08:00
Derek McGowan
403d981d70
Revert client signature
...
Supports multiple tag push with daemon signature
Fixes #10444
Signed-off-by: Derek McGowan <derek@mcgstyle.net> (github: dmcgowan)
2015-01-30 14:20:32 -08:00
Michael Crosby
1dc1b93451
Merge pull request #10460 from estesp/10387-setup-tcp-keepalive
...
Setup TCP keep-alive on hijacked HTTP(S) client <--> daemon sessions
2015-01-30 11:31:31 -08:00
Phil Estes
f73a6b3845
Setup TCP keep-alive on hijacked HTTP(S) client <--> daemon sessions
...
Fixes #10387
Without TCP keep-alive set on socket connections to the daemon, any
long-running container with std{out,err,in} attached that doesn't
read/write for a minute or longer will end in ECONNTIMEDOUT (depending
on network settings/OS defaults, etc.), leaving the docker client side
believing it is still waiting on data with no actual underlying socket
connection.
This patch turns on TCP keep-alive for the underlying TCP connection
for both TLS and standard HTTP hijacked daemon connections from the
docker client, with a keep-alive timeout of 30 seconds.
Docker-DCO-1.1-Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com>
2015-01-30 10:50:27 -05:00
Derek McGowan
0eed1f4d8d
Defer creation of trust key file until needed
...
Fixes #10442
Signed-off-by: Derek McGowan <derek@mcgstyle.net> (github: dmcgowan)
2015-01-29 13:46:12 -08:00
Michael Crosby
e15300b251
Merge pull request #10360 from dmcgowan/keyfile-error-message
...
Add file path to errors loading the key file
2015-01-26 14:44:07 -08:00
Michael Crosby
1c9e16f00f
Merge pull request #10359 from crosbymichael/stats-json
...
Remove omitempty json tags from stucts
2015-01-26 13:06:47 -08:00
Derek McGowan
a90e91b500
Add file path to errors loading the key file
...
Signed-off-by: Derek McGowan <derek@mcgstyle.net> (github: dmcgowan)
2015-01-26 12:58:45 -08:00
Michael Crosby
44f4c95c0e
Remove omitempty json tags from stucts
...
When unmarshaling the json response from the API in languages to a
dynamic object having the omitempty field tag on types such as float64
case the key to be omitted on 0.0 values. Various langages will
interpret this as a null when 0.0 is the actual value.
This patch removes the omitempty tags on fields that are not structs
where they can be safely omited.
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2015-01-26 11:16:29 -08:00
Derek McGowan
2cd5b7dae8
Use filepath instead of path
...
Currently loading the trust key uses path instead of filepath. This creates problems on some operating systems such as Windows.
Fixes #10319
Signed-off-by: Derek McGowan <derek@mcgstyle.net> (github: dmcgowan)
2015-01-23 14:44:30 -08:00
Victor Vieux
9c7689a10e
bump API version
...
Signed-off-by: Victor Vieux <vieux@docker.com>
2015-01-22 01:15:34 +00:00
Andrew C. Bodine
d25a65375c
Closes #9311 Handles container id/name collisions against daemon functionalities according to #8069
...
Signed-off-by: Andrew C. Bodine <acbodine@us.ibm.com>
2015-01-21 17:11:31 -08:00
Michael Crosby
bbc38497b6
Zero out stats values in the cli
...
Based on some feedback, when you have a container via the cli that you
are monitoring for stats, if you stop the container it will stay in the
display but report the last datapoint that was received.
This PR changes the display to zero out the values for containers where
an update has not been received within a specified duration, i.e. 2
seconds. This signals the user that the container has stopped as it
reports cpu and memory usage of 0.
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2015-01-21 15:33:53 -08:00
Michael Crosby
db9b1e3654
Update to docker stats documentation
...
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2015-01-21 11:44:23 -08:00
Michael Crosby
4b173199fd
Exit cli when all containers when no more containers to monitor
...
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2015-01-21 08:55:23 -08:00
Michael Crosby
76141a0077
Add documentation for stats feature
...
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2015-01-20 20:21:47 -08:00
Michael Crosby
2f46b7601a
Add pubsub package to handle robust publisher
...
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2015-01-20 20:21:46 -08:00
Michael Crosby
2d4fc1de05
Refactor usage calc for CPU and system usage
...
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2015-01-20 20:21:46 -08:00
Alexander Morozov
cc658804c0
Refactor cli for stats
...
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
2015-01-20 20:21:46 -08:00
Michael Crosby
4f174aa792
Evict stopped containers
...
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2015-01-20 20:21:46 -08:00
Michael Crosby
2640a10bca
Implement client side display for stats
...
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2015-01-20 20:21:46 -08:00
Michael Crosby
65f58e2a74
Implement container stats collection in daemon
...
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2015-01-20 20:21:46 -08:00
Arnaud Porterie
cb9db04fd7
Merge pull request #10128 from vieux/filters_image
...
Server-side restriction of allowed image filters
2015-01-19 13:24:03 -08:00
Jessie Frazelle
8b95ad230e
Merge pull request #9784 from dmcgowan/v2-registry
...
Client Support for Docker Registry HTTP API V2
2015-01-19 10:46:38 -08:00
Sebastiaan van Stijn
bf14bacac3
Fix typo in deprecation message.
...
Because the doc maintainers don't like Cockney.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2015-01-16 23:36:50 +01:00
Jessie Frazelle
00d19150bb
Merge pull request #9941 from SvenDowideit/build-pull-option-docs
...
Add build --pull and evenets --filter flags to the docs for 1.4
2015-01-16 13:49:56 -08:00
Victor Vieux
0e9acf7684
don't restrict filters in docker images
...
Signed-off-by: Victor Vieux <vieux@docker.com>
2015-01-16 01:09:01 +00:00
Derek McGowan
188b56c836
Push flow
...
Signed-off-by: Derek McGowan <derek@mcgstyle.net> (github: dmcgowan)
2015-01-15 14:05:05 -08:00
Sven Dowideit
18a2c77435
Add build --pull and evenets --filter flags to the docs for 1.4
...
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
2015-01-15 15:20:48 +13:00
Pierre Wacrenier
02923d43e2
Remove error return type from createRouter and ServeRequest
...
Signed-off-by: Pierre Wacrenier <pierre.wacrenier@gmail.com>
2015-01-13 22:43:31 +01:00
Jessie Frazelle
ab86f591c3
Merge pull request #9951 from andersjanmyr/add-proxy-from-environment-to-client
...
Add ProxyFromEnvironment enables client via proxy.
2015-01-13 10:53:00 -08:00
Jessie Frazelle
b9e42d66e7
Merge pull request #8570 from brahmaroutu/rename_container_3036
...
Rename a existing container
2015-01-13 10:37:29 -08:00
Dan Walsh
12a7e78b12
Fix docker run/exec/create not printing error messages
...
If an error message happens while parsing docker run or docker exec, the message
is not being printed out.
Docker-DCO-1.1-Signed-off-by: Dan Walsh <dwalsh@redhat.com> (github: rhatdan)
2015-01-13 09:23:13 -05:00
Srini Brahmaroutu
21a809d9ae
rename a existing container
...
Closes #3036
Signed-off-by: Srini Brahmaroutu <srbrahma@us.ibm.com>
2015-01-13 03:27:17 +00:00
Jessica Frazelle
cd5902fc7b
Fix range for go 1.3
...
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
2015-01-12 11:49:52 -08:00
Jean-Paul Calderone
f29ee87051
Use the official mime type that exists instead of an imaginary one that does not.
...
Signed-off-by: Jean-Paul Calderone <exarkun@twistedmatrix.com>
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@linux.com> (github: jfrazelle)
2015-01-09 20:24:54 -08:00
Tianon Gravi
6292354dc3
Fix silly little syntax mistake
...
Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com>
2015-01-09 15:03:11 -07:00
Tianon Gravi
b20363c4c0
Add "gofmt" from Go 1.3.3
...
Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com>
2015-01-09 09:54:58 -07:00
Don Kjer
33b931e718
Adding workaround to suppress gofmt issues with api/client/utils.go
...
Signed-off-by: Don Kjer <don.kjer@gmail.com>
2015-01-08 21:16:43 +00:00
Don Kjer
568f86eb18
Deprecating ResolveRepositoryName
...
Passing RepositoryInfo to ResolveAuthConfig, pullRepository, and pushRepository
Moving --registry-mirror configuration to registry config
Created resolve_repository job
Repo names with 'index.docker.io' or 'docker.io' are now synonymous with omitting an index name.
Adding test for RepositoryInfo
Adding tests for opts.StringSetOpts and registry.ValidateMirror
Fixing search term use of repoInfo
Adding integration tests for registry mirror configuration
Normalizing LookupImage image name to match LocalName parsing rules
Normalizing repository LocalName to avoid multiple references to an official image
Removing errorOut use in tests
Removing TODO comment
gofmt changes
golint comments cleanup. renaming RegistryOptions => registry.Options, and RegistryServiceConfig => registry.ServiceConfig
Splitting out builtins.Registry and registry.NewService calls
Stray whitespace cleanup
Moving integration tests for Mirrors and InsecureRegistries into TestNewIndexInfo unit test
Factoring out ValidateRepositoryName from NewRepositoryInfo
Removing unused IndexServerURL
Allowing json marshaling of ServiceConfig. Exposing ServiceConfig in /info
Switching to CamelCase for json marshaling
PR cleanup; removing 'Is' prefix from boolean members. Removing unneeded json tags.
Removing non-cleanup related fix for 'localhost:[port]' in splitReposName
Merge fixes for gh9735
Fixing integration test
Reapplying #9754
Adding comment on config.IndexConfigs use from isSecureIndex
Remove unused error return value from isSecureIndex
Signed-off-by: Don Kjer <don.kjer@gmail.com>
Adding back comment in isSecureIndex
Signed-off-by: Don Kjer <don.kjer@gmail.com>
2015-01-08 20:14:58 +00:00
Anders Janmyr
43d45e601f
Add ProxyFromEnvironment enables client via proxy.
...
Signed-off-by: Anders Janmyr <anders@janmyr.com>
2015-01-08 08:12:31 +01:00
Jessie Frazelle
91509bfb66
Merge pull request #9936 from icecrime/noecho_start_attached
...
Fix cli echoing container ID on start -a|-i
2015-01-06 19:07:40 -08:00