1a3f9a1f39
api/client/restart.go:Fix a typo in comment
...
Signed-off-by: Yingqian Hu <choleraehyq@gmail.com >
Upstream-commit: d30990d7b1468488768847521a3a7ce66a081015
Component: engine
2015-08-26 18:59:56 +08:00
6dd2b74345
Merge pull request #15711 from monitorjbl/import-commit-message
...
adding message option to the import subcommand
Upstream-commit: b857dadb334fe0660abce4ae73a8b5b5c7f92c33
Component: engine
2015-08-26 11:42:10 +02:00
434547ed08
Merge pull request #14978 from gesellix/websocket-disable-check-origin
...
skip checkOrigin during websocket handshake
Upstream-commit: e134ccada7fae12271c4169e592b8bf09aff923d
Component: engine
2015-08-25 12:56:30 -04:00
b498641d47
Merge pull request #14665 from coolljt0725/fix_build_with_resource_limit
...
Fix build with resource limit which system not support.
Upstream-commit: 6f8c4480e4f99b08c84d25f1611d6b12ee646066
Component: engine
2015-08-25 16:42:13 +02:00
15378abfc2
adding message option to the import subcommand
...
Signed-off-by: Taylor Jones <monitorjbl@gmail.com >
Upstream-commit: 936b2c6afe490b562df4ebea854b116c3b40a9f5
Component: engine
2015-08-25 02:55:04 +00:00
e7fb39d7af
Allow HEAD requests to container archives via CORS.
...
Add HEAD to Access-Control-Allow-Methods.
Signed-off-by: David Calavera <david.calavera@gmail.com >
Upstream-commit: 354a2e105d26a310501891e6c097eacfd037d8c6
Component: engine
2015-08-24 05:57:22 -04:00
589fca3f48
fix a panic when the exec fails to start
...
Signed-off-by: Shijiang Wei <mountkin@gmail.com >
Upstream-commit: fcf9daad91d9be24ceddbc4add4d3a8179c9b32c
Component: engine
2015-08-22 00:01:44 +08:00
fc4db8ccd2
Fix docker stats show blkio when there are multiple block devices.
...
Signed-off-by: Lei Jiang <leijitang@huawei.com >
Upstream-commit: 211449a1cad317e80610e40c9d8c88df35cae60d
Component: engine
2015-08-20 11:46:21 +08:00
6442b64e6e
Fix build with resource limit which system is not support.
...
Signed-off-by: Lei Jitang <leijitang@huawei.com >
Upstream-commit: 770daa15f359ddc7329a2a031332c251e5a53a29
Component: engine
2015-08-18 11:54:00 +08:00
f00550c0b6
Merge pull request #15599 from calavera/ps_format_q
...
Fix ignore `-q` flag in `docker ps` when there is a default format.
Upstream-commit: 29ced5d0c4d67b3609c95bc039589009086852b3
Component: engine
2015-08-17 15:44:28 -07:00
ff003f32f9
Merge pull request #15356 from Microsoft/10662-uncpathonbuild
...
Windows: Allow UNC paths on build
Upstream-commit: 436fca704f7cf14b85d1b9324033a1a778d75134
Component: engine
2015-08-17 13:34:27 -07:00
f3a123c54b
Windows: Allow UNC paths on build
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Signed-off-by: Stefan J. Wernli <swernli@microsoft.com >
Upstream-commit: df7ab6f3dbec85c1cf32b36c4c7dcfdc374f6566
Component: engine
2015-08-17 11:03:54 -07:00
4c6bab5f50
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 >
Upstream-commit: df46bfdd4d28dcab432b2fc6c36131ff95223148
Component: engine
2015-08-17 10:48:04 -07:00
57a36297f7
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 >
Upstream-commit: 5ffcecf130aea8c0b92d1be728e2c302cf2c6c70
Component: engine
2015-08-14 14:55:26 -07:00
f1cc5568e9
Merge pull request #13501 from vdemeester/8048-image-repository-tag
...
Fix #8048 : make `docker images repository:tag` work
Upstream-commit: c6c195a465652e96b06e76b44a1df075cba9ad80
Component: engine
2015-08-13 21:36:21 +02:00
d024131050
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 >
Upstream-commit: 4fb88d2e11f2f16c520b36e4c6e00db44ae26b8c
Component: engine
2015-08-13 08:50:09 +02:00
60f12fa9b0
Merge pull request #15446 from cpuguy83/better_err_on_exec_err
...
Return better errors from exec
Upstream-commit: d3198fa8c4f704a2ddd4d876003757b30a61c00c
Component: engine
2015-08-12 11:13:29 -07:00
b585740325
Fix incorrect comment
...
Signed-off-by: Mrunal Patel <mrunalp@gmail.com >
Upstream-commit: d626f77e36e16911358248af678cc00900a6f5b5
Component: engine
2015-08-11 19:45:23 -04:00
c6ac4667d6
skip checkOrigin during websocket handshake
...
Signed-off-by: Tobias Gesellchen <tobias@gesellix.de >
Upstream-commit: 9bde19e72a59a2af2dcbc72abf2521fa02718bcc
Component: engine
2015-08-12 00:05:59 +02:00
223b2cba85
Mark network ui endpoints unix-only
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com >
Upstream-commit: 6e3740450d3265546e6992ec4890cfdaa78296e3
Component: engine
2015-08-10 21:49:27 -07:00
978d8e86f8
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 >
Upstream-commit: f078f75bf25353720f28f9f1ea180374fe205302
Component: engine
2015-08-10 09:53:19 -04:00
8120b4d8fe
Change all docker -d to docker daemon
...
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com >
Upstream-commit: 81cc8ebc93c20537d5fab4c016a3774f58b3e483
Component: engine
2015-08-10 20:48:08 +08:00
a7b91c7783
Merge pull request #15421 from maaquib/15418-ps-image-id-too-wide
...
Truncating image id is docker ps to a length of 12
Upstream-commit: cc73fc03e8fe8d339e0be89dd2ad8eda9d06262b
Component: engine
2015-08-08 07:48:16 -04:00
755087c2f9
Merge pull request #15420 from vlajos/typofixes-vlajos-20150807
...
typofix - https://github.com/vlajos/misspell_fixer
Upstream-commit: bf892dcfcc002ee374057033a940ce2250181066
Component: engine
2015-08-08 01:08:49 -07:00
f2606dcb4e
Typo: remove unconsistent period in docker info
...
Signed-off-by: Lei Jitang <leijitang@huawei.com >
Upstream-commit: dc2a7ab7504fb334e4285b24b280a3a49ed33096
Component: engine
2015-08-08 13:06:59 +08:00
f2c4f16feb
Remove useless if-else
...
It is better to use simple form without else.
Signed-off-by: Hu Keping <hukeping@huawei.com >
Upstream-commit: c536cec5ea8026b6d93ad53d10bdd2a2cf523d03
Component: engine
2015-08-08 20:02:44 +08:00
2b85b35ea0
Truncating image id to 12 in docker ps
...
Signed-off-by: Mohammed Aaqib Ansari <maaquib@gmail.com >
Upstream-commit: 1a2ccf59eefc14c6bd5abb23f0556ffc5c77bacf
Component: engine
2015-08-07 20:53:48 -04:00
2c6e673ce7
typofix - https://github.com/vlajos/misspell_fixer
...
Signed-off-by: Veres Lajos <vlajos@gmail.com >
Upstream-commit: 514623272398574c8fd7ef3fe42c5b2ae161349a
Component: engine
2015-08-07 23:25:49 +01:00
b0a38c37db
Merge pull request #15370 from cpuguy83/better_error_on_client_connect
...
Better/more specific error messages on connect
Upstream-commit: 0262d40ba7d2edc67077a17aebbcdca1e2472a1e
Component: engine
2015-08-07 13:00:44 -07:00
c8706706f4
Merge pull request #14897 from WeiZhang555/golint-api-types
...
fix golint warnings/errors on package api/types/
Upstream-commit: 0a0e9701f7bbe58e75eff9d1934fde0a5038ee9c
Component: engine
2015-08-07 10:51:27 -07:00
461b0e0926
Merge pull request #14811 from devx/refactor-clientRequestAttemptLogin
...
Cleanup: Factor cmdAttempt out of cli.clientRequestAttemptLogin
Upstream-commit: 70cae97ee25cacd11868c95338e864e4f0b6681c
Component: engine
2015-08-07 10:47:18 -07:00
502a6d4faf
fix golint warnings/errors on package api/types/
...
Signed-off-by: Zhang Wei <zhangwei555@huawei.com >
Upstream-commit: 3d6617ffe7d9242107ac09eab4f2d8ce87acb95c
Component: engine
2015-08-07 09:43:43 +08:00
13560065bd
Better/more specific error messages on connect
...
Closes #15309
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
Upstream-commit: 9994a35b5d4af281304b5146f88a225b9237712e
Component: engine
2015-08-06 16:41:37 -04:00
efe044b445
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 >
Upstream-commit: 2a237615c0915b60b8dc6c13a377bb766780ecbf
Component: engine
2015-08-06 11:22:38 -07:00
23d0cda657
Remove pkg/systemd
...
Signed-off-by: Antonio Murdaca <runcom@linux.com >
Upstream-commit: 931645c46056ae24b2df51c447b6df1a66b2ca30
Component: engine
2015-08-06 14:35:00 +02:00
3ec8bc1fa3
Cleanup: Merge adjustCPUShares to adoptContainerSettings
...
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com >
Upstream-commit: e0af23dc18eac17633ab1f2541f26b56c303a18c
Component: engine
2015-08-06 08:15:14 +08:00
82b6f1602c
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 >
Upstream-commit: 3d3db0d4af6cf483299a152133f19f9df760dc11
Component: engine
2015-08-05 13:22:24 -07:00
aa73b79fe2
Merge pull request #14921 from aaronlehmann/int64
...
Fix uses of "int" where "int64" should be used instead
Upstream-commit: 7374852be9def787921aea2ca831771982badecf
Component: engine
2015-08-04 19:16:13 -07:00
4b1fbc6af4
Add more unit tests (thus coverage) to pkg api
...
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: f7e43d45b396d6c1f7d8f3f0606917501f466015
Component: engine
2015-08-04 19:51:02 +02:00
a4a7851f11
Merge pull request #13698 from cpuguy83/split_api_routes_from_setup
...
Move api handlers to separate file
Upstream-commit: 102724700bf816a826da30d4eb35b51486413ccc
Component: engine
2015-08-03 14:03:15 -04:00
0cd1b722f7
Split API handlers into domain specific files
...
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
Upstream-commit: 1a77580030439cef25e8f987b03733f173662746
Component: engine
2015-08-03 11:12:44 -04:00
dd73699a9b
Updated to use latest version of notary
...
Update UX to use aliases for root, snapshot, and target key
Signed-off-by: Derek McGowan <derek@mcgstyle.net > (github: dmcgowan)
Upstream-commit: 6ce76cd9ed0e014e109ec632fa21b7e853f56951
Component: engine
2015-07-31 17:32:35 -07:00
761b152e62
Fix uses of "int" where "int64" should be used instead
...
Some structures use int for sizes and UNIX timestamps. On some
platforms, int is 32 bits, so this can lead to the year 2038 issues and
overflows when dealing with large containers or layers.
Consistently use int64 to store sizes and UNIX timestamps in
api/types/types.go. Update related to code accordingly (i.e.
strconv.FormatInt instead of strconv.Itoa).
Use int64 in progressreader package to avoid integer overflow when
dealing with large quantities. Update related code accordingly.
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com >
Upstream-commit: 1f61084d83aea37b212468aaa975020094b7f7c9
Component: engine
2015-07-31 16:31:40 -07:00
03122f024f
Merge pull request #15144 from aaronlehmann/graph-cleanup
...
Documentation improvements and code cleanups for graph package
Upstream-commit: 8f2dca538619372663a94bc5141dbc7f121defb8
Component: engine
2015-07-31 15:11:34 -07:00
712ef17493
Docker stats: display Block IO stats
...
Signed-off-by: Zhang Wei <zhangwei555@huawei.com >
Upstream-commit: 6a4ac63aaac829e94c7d6cbb31a8d36b93757620
Component: engine
2015-07-31 21:26:32 +08:00
61c2d57722
Use default no-op uuid.Loggerf for client cli
...
Signed-off-by: Tibor Vass <tibor@docker.com >
Upstream-commit: 3face3c521127cb86570c68d5f2a8f55e7633146
Component: engine
2015-07-30 21:19:51 -04:00
c5a5900eb9
Documentation improvements and code cleanups for graph package
...
Expand the godoc documentation for the graph package.
Centralize DefaultTag in the graphs/tag package instead of defining it
twice.
Remove some unnecessary "config" structs that are only used to pass
a few parameters to a function.
Simplify the GetParentsSize function - there's no reason for it to take
an accumulator argument.
Unexport some functions that aren't needed outside the package.
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com >
Upstream-commit: d4836cd7ec1c085c5a5caa7eb7f5eda4ace10eb6
Component: engine
2015-07-30 14:27:10 -07:00
0c28668f97
Merge pull request #14950 from ottok/master
...
Multiple fixes to 'docker stats' output
Upstream-commit: 85051832522ca217401d6eb4ddda1b1a7fdce9ad
Component: engine
2015-07-30 14:02:35 -07:00
a55bf4a409
Merge pull request #14885 from jlhawn/fix_cp_symlink
...
Fix copying of symlinks in containers
Upstream-commit: 030f61df3db2c053d68aacddc2c6893db3dee6ce
Component: engine
2015-07-30 13:42:40 -07:00
c7e78a7a31
Merge pull request #14844 from WeiZhang555/golint-api
...
fix golint errors/warnings of pkg api/
Upstream-commit: 2f1a7c903f163b3d85c96683971aaad4a24585d7
Component: engine
2015-07-30 16:02:06 -04:00
