David Calavera
2093616d7f
Merge pull request #15871 from Microsoft/10662-absolute
...
Windows: Fix absolute checks
2015-09-01 18:38:36 +02:00
John Howard
49c1b51ae2
Windows: Fix absolute checks
...
Signed-off-by: John Howard <jhoward@microsoft.com>
2015-09-01 08:41:37 -07:00
David Calavera
b5cc077864
Remove /containers/ps from the api router.
...
This route was deprecated more than two years ago in the linked
commit[1]. It's not referenced anywhere in the documentation and it's
time to stop maintaning it.
[1]: 4f9443927e
Signed-off-by: David Calavera <david.calavera@gmail.com>
2015-09-01 05:17:35 -04:00
David Calavera
96974170f8
Merge pull request #15606 from jlhawn/img_delete
...
[daemon] Refactor image_delete.go
2015-08-31 18:22:48 +02:00
David Calavera
754d81bd69
Merge pull request #15873 from cpuguy83/no_args_for_volume_subcmd
...
Fix `docker volume invalidarg` so it displays usage
2015-08-31 10:04:45 +02:00
Josh Hawn
111d2f3487
[daemon] Refactor image_delete.go
...
This file was not well documented and had very high cyclomatic complexity.
This patch completely rearranges this file and the ImageDelete method to
be easier to follow and more maintainable in the future.
Docker-DCO-1.1-Signed-off-by: Josh Hawn <josh.hawn@docker.com> (github: jlhawn)
2015-08-28 11:01:24 -07:00
David Calavera
433956cc47
Merge pull request #15310 from MHBauer/demon-lint-squash
...
golint fixes for daemon/ package
2015-08-28 17:34:36 +02:00
Alexander Morozov
6caaa8a635
Merge pull request #15023 from hqhq/hq_add_status_in_inspect
...
Add status string to State field for inspect
2015-08-28 08:27:36 -07:00
Morgan Bauer
abd72d4008
golint fixes for daemon/ package
...
- some method names were changed to have a 'Locking' suffix, as the
downcased versions already existed, and the existing functions simply
had locks around the already downcased version.
- deleting unused functions
- package comment
- magic numbers replaced by golang constants
- comments all over
Signed-off-by: Morgan Bauer <mbauer@us.ibm.com>
2015-08-27 22:07:42 -07:00
Brian Goff
38da43184d
Fix `docker volume invalid` so it displays usage
...
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2015-08-27 09:46:05 -04:00
Brian Goff
b3b7eb2723
Add volume API/CLI
...
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2015-08-26 13:37:52 -04:00
Cholerae Hu
d30990d7b1
api/client/restart.go:Fix a typo in comment
...
Signed-off-by: Yingqian Hu <choleraehyq@gmail.com>
2015-08-26 18:59:56 +08:00
David Calavera
b857dadb33
Merge pull request #15711 from monitorjbl/import-commit-message
...
adding message option to the import subcommand
2015-08-26 11:42:10 +02:00
Brian Goff
e134ccada7
Merge pull request #14978 from gesellix/websocket-disable-check-origin
...
skip checkOrigin during websocket handshake
2015-08-25 12:56:30 -04:00
David Calavera
6f8c4480e4
Merge pull request #14665 from coolljt0725/fix_build_with_resource_limit
...
Fix build with resource limit which system not support.
2015-08-25 16:42:13 +02:00
Taylor Jones
936b2c6afe
adding message option to the import subcommand
...
Signed-off-by: Taylor Jones <monitorjbl@gmail.com>
2015-08-25 02:55:04 +00:00
David Calavera
354a2e105d
Allow HEAD requests to container archives via CORS.
...
Add HEAD to Access-Control-Allow-Methods.
Signed-off-by: David Calavera <david.calavera@gmail.com>
2015-08-24 05:57:22 -04:00
Shijiang Wei
fcf9daad91
fix a panic when the exec fails to start
...
Signed-off-by: Shijiang Wei <mountkin@gmail.com>
2015-08-22 00:01:44 +08:00
Lei Jitang
211449a1ca
Fix docker stats show blkio when there are multiple block devices.
...
Signed-off-by: Lei Jiang <leijitang@huawei.com>
2015-08-20 11:46:21 +08:00
Lei Jitang
770daa15f3
Fix build with resource limit which system is not support.
...
Signed-off-by: Lei Jitang <leijitang@huawei.com>
2015-08-18 11:54:00 +08:00
Doug Davis
29ced5d0c4
Merge pull request #15599 from calavera/ps_format_q
...
Fix ignore `-q` flag in `docker ps` when there is a default format.
2015-08-17 15:44:28 -07:00
David Calavera
436fca704f
Merge pull request #15356 from Microsoft/10662-uncpathonbuild
...
Windows: Allow UNC paths on build
2015-08-17 13:34:27 -07:00
John Howard
df7ab6f3db
Windows: Allow UNC paths on build
...
Signed-off-by: John Howard <jhoward@microsoft.com>
Signed-off-by: Stefan J. Wernli <swernli@microsoft.com>
2015-08-17 11:03:54 -07:00
David Calavera
df46bfdd4d
Fix ignore `-q` flag in `docker ps` when there is a default format.
...
Docker ps default format should not take precedence over cli flags.
This happens effectively for other flags except `-q`.
We need to let the cli to set the format as table to print the
expected output with `-q`.
Signed-off-by: David Calavera <david.calavera@gmail.com>
2015-08-17 10:48:04 -07:00
Brian Goff
5ffcecf130
Fix issue with exec TTY caused by 15446
...
The bool logic around setting up the TTY ended up getting flipped
accidentally.
Also added a test for exec with TTY.
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2015-08-14 14:55:26 -07:00
Sebastiaan van Stijn
c6c195a465
Merge pull request #13501 from vdemeester/8048-image-repository-tag
...
Fix #8048 : make `docker images repository:tag` work
2015-08-13 21:36:21 +02:00
Vincent Demeester
4fb88d2e11
Fix #8048 : make `docker images repository:tag` work
...
Make command like "docker images ubuntu:14.04" work and filter out the
image with the given tag.
Closes #8048 .
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2015-08-13 08:50:09 +02:00
Jessie Frazelle
d3198fa8c4
Merge pull request #15446 from cpuguy83/better_err_on_exec_err
...
Return better errors from exec
2015-08-12 11:13:29 -07:00
Mrunal Patel
d626f77e36
Fix incorrect comment
...
Signed-off-by: Mrunal Patel <mrunalp@gmail.com>
2015-08-11 19:45:23 -04:00
Tobias Gesellchen
9bde19e72a
skip checkOrigin during websocket handshake
...
Signed-off-by: Tobias Gesellchen <tobias@gesellix.de>
2015-08-12 00:05:59 +02:00
Tonis Tiigi
6e3740450d
Mark network ui endpoints unix-only
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2015-08-10 21:49:27 -07:00
Brian Goff
f078f75bf2
Return better errors from exec
...
Also cleans up some of the API side of exec.
Was writing the header twice (two different headers).
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2015-08-10 09:53:19 -04:00
Qiang Huang
81cc8ebc93
Change all docker -d to docker daemon
...
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
2015-08-10 20:48:08 +08:00
Brian Goff
cc73fc03e8
Merge pull request #15421 from maaquib/15418-ps-image-id-too-wide
...
Truncating image id is docker ps to a length of 12
2015-08-08 07:48:16 -04:00
Arnaud Porterie
bf892dcfcc
Merge pull request #15420 from vlajos/typofixes-vlajos-20150807
...
typofix - https://github.com/vlajos/misspell_fixer
2015-08-08 01:08:49 -07:00
Lei Jitang
dc2a7ab750
Typo: remove unconsistent period in docker info
...
Signed-off-by: Lei Jitang <leijitang@huawei.com>
2015-08-08 13:06:59 +08:00
Hu Keping
c536cec5ea
Remove useless if-else
...
It is better to use simple form without else.
Signed-off-by: Hu Keping <hukeping@huawei.com>
2015-08-08 20:02:44 +08:00
Mohammed Aaqib Ansari
1a2ccf59ee
Truncating image id to 12 in docker ps
...
Signed-off-by: Mohammed Aaqib Ansari <maaquib@gmail.com>
2015-08-07 20:53:48 -04:00
Veres Lajos
5146232723
typofix - https://github.com/vlajos/misspell_fixer
...
Signed-off-by: Veres Lajos <vlajos@gmail.com>
2015-08-07 23:25:49 +01:00
David Calavera
0262d40ba7
Merge pull request #15370 from cpuguy83/better_error_on_client_connect
...
Better/more specific error messages on connect
2015-08-07 13:00:44 -07:00
David Calavera
0a0e9701f7
Merge pull request #14897 from WeiZhang555/golint-api-types
...
fix golint warnings/errors on package api/types/
2015-08-07 10:51:27 -07:00
David Calavera
70cae97ee2
Merge pull request #14811 from devx/refactor-clientRequestAttemptLogin
...
Cleanup: Factor cmdAttempt out of cli.clientRequestAttemptLogin
2015-08-07 10:47:18 -07:00
Zhang Wei
3d6617ffe7
fix golint warnings/errors on package api/types/
...
Signed-off-by: Zhang Wei <zhangwei555@huawei.com>
2015-08-07 09:43:43 +08:00
Brian Goff
9994a35b5d
Better/more specific error messages on connect
...
Closes #15309
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2015-08-06 16:41:37 -04:00
John Howard
2a237615c0
Windows - make docker cp functional
...
Signed-off-by: John Howard <jhoward@microsoft.com>
Conflicts:
pkg/archive/copy.go
Make it compile
Signed-off-by: John Howard <jhoward@microsoft.com>
2015-08-06 11:22:38 -07:00
Antonio Murdaca
931645c460
Remove pkg/systemd
...
Signed-off-by: Antonio Murdaca <runcom@linux.com>
2015-08-06 14:35:00 +02:00
Qiang Huang
e0af23dc18
Cleanup: Merge adjustCPUShares to adoptContainerSettings
...
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
2015-08-06 08:15:14 +08:00
David Calavera
3d3db0d4af
Fail fail when the ps format template is invalid.
...
Fixes error continuing execution when the parsing fails.
Signed-off-by: David Calavera <david.calavera@gmail.com>
2015-08-05 13:22:24 -07:00
Arnaud Porterie
7374852be9
Merge pull request #14921 from aaronlehmann/int64
...
Fix uses of "int" where "int64" should be used instead
2015-08-04 19:16:13 -07:00
Vincent Demeester
f7e43d45b3
Add more unit tests (thus coverage) to pkg api
...
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2015-08-04 19:51:02 +02:00