Commit Graph

1929 Commits

Author SHA1 Message Date
04ae4edf2f Fix logrus formatting
This fix tries to fix logrus formatting by removing `f` from
`logrus.[Error|Warn|Debug|Fatal|Panic|Info]f` when formatting string
is not present.

This fix fixes #23459.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
Upstream-commit: a72b45dbec3caeb3237d1af5aedd04adeb083571
Component: engine
2016-06-11 13:16:55 -07:00
ad3cf97c76 Merge pull request #23403 from WeiZhang555/split-utils
Move GetExitCode to package container and unexport it
Upstream-commit: ee8c512dc32117fbd327b4a19da0ffefe47abfcd
Component: engine
2016-06-10 15:38:06 -07:00
8900670b4f Merge pull request #23351 from thaJeztah/remove-go-1.4-fix
remove fallback for Go 1.4
Upstream-commit: 12970bef34dbad39beb87a87d553020750347ec4
Component: engine
2016-06-10 09:16:46 -07:00
6975ac43d7 Merge pull request #23412 from vdemeester/migrate-load-and-save-to-cobra
Use spf13/cobra for docker load and save
Upstream-commit: a05536ff42d8a59d72cd95dfc38dc848e736420c
Component: engine
2016-06-10 12:02:18 +02:00
cde498e147 Fix some context sharing/plumbing
With cobra switch (and maybe before), some context weren't *plumbed* the
right way, fixing that.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: 075b75fa14e878afa87ad4fd989f03a8541b13eb
Component: engine
2016-06-09 17:58:10 +02:00
50d0524958 Migrate save command to cobra
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: 6632fd27881faf899bbc33a8219a84ff18443270
Component: engine
2016-06-09 17:38:20 +02:00
7c6917a358 Migrate load command to cobra
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: 8b1d40271fd2abcd6b703a2d9e6036bceb01c050
Component: engine
2016-06-09 17:28:33 +02:00
3c333d1fd5 Move GetExitCode to package container and unexport it
GetExitCode is used only by container package, so move it to package
container and unexport it

Signed-off-by: Zhang Wei <zhangwei555@huawei.com>
Upstream-commit: c111b7eb3d25b5f7a07a6037fcca33282de91ef3
Component: engine
2016-06-09 18:04:53 +08:00
6828e7721d Merge pull request #23334 from WeiZhang555/cobra-stats
Migrate stats and events command to cobra
Upstream-commit: e884a515e96201d4027a6c9c1b4fa884fc2d21a3
Component: engine
2016-06-08 23:50:46 +02:00
abc5e5e918 Merge pull request #23384 from jannickfahlbusch/fix-typos
Fix some typos
Upstream-commit: 8a22c4166b3f82f4ae447a89541e8b691a3bddda
Component: engine
2016-06-08 23:46:47 +02:00
ecac3fcd79 Merge pull request #23344 from pdalpra/timeout-as-time.Duration
Timeout as time.duration
Upstream-commit: 6fd8c96f6164fa70170a2400f8fa092de9507cf9
Component: engine
2016-06-08 16:37:08 -04:00
79ea898035 Fix some typos
Signed-off-by: Jannick Fahlbusch <git@jf-projects.de>
Upstream-commit: e3490cdcc0e2b1e4c4da125626430016a3048128
Component: engine
2016-06-08 21:59:34 +02:00
6c2f2ddb74 Merge pull request #23343 from vdemeester/migrate-build-to-cobra
Use spf13/cobra for docker build
Upstream-commit: 3b08711bb75e30d850665312413a60f51114202f
Component: engine
2016-06-08 11:59:48 -07:00
2193b7f2c7 Use time.Duration for container restart/stop timeouts
Signed-off-by: Pierre Dal-Pra <dalpra.pierre@gmail.com>
Upstream-commit: b29e8ea412534a857d76bc716b79c7483e347f3a
Component: engine
2016-06-08 08:05:18 +02:00
81dc24449c Migrate stats and events command to cobra.
Signed-off-by: Zhang Wei <zhangwei555@huawei.com>
Upstream-commit: 04cdb8e6025d9c0eac0462f3ad3f1ab33204e615
Component: engine
2016-06-08 10:39:53 +08:00
ecda48bde7 Return remote API errors as JSON
Signed-off-by: Ben Firshman <ben@firshman.co.uk>
Upstream-commit: 322e2a7d059a81617b593cf6ece2cfd9f6d4ea03
Component: engine
2016-06-07 18:45:27 -07:00
0e982325b5 Merge pull request #23333 from yongtang/23211-spf13-cobra-version
Use spf13/cobra for docker version
Upstream-commit: 13d101d53ce820d920accd429528374b41bfab4e
Component: engine
2016-06-07 23:46:01 +02:00
65f4a3fb13 Merge pull request #23311 from WeiZhang555/cobra-rm
Migrate rm command to cobra
Upstream-commit: ce96ce9e05d9b312b5454237680abadc7aa51092
Component: engine
2016-06-07 17:05:21 -04:00
76013d83ba remove fallback for Go 1.4
Windows is now built using Go 1.6, so we no longer
need to have a fallback for Go 1.4.

This removes the fallback that was introduced in
6df3fc51759a6219e965a30c413cb43ddbc897c9 /
https://github.com/docker/docker/pull/18553

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 6b46a568656ac400830e170c4b1ad79455d63111
Component: engine
2016-06-07 22:38:02 +02:00
41742b0589 Merge pull request #23292 from yongtang/23211-spf13-cobra-images
Use spf13/cobra for docker images
Upstream-commit: 08419313ec51b4e9c7db9e12c01cc6eea6cb8f16
Component: engine
2016-06-07 21:56:42 +02:00
819862b983 Merge pull request #23278 from yongtang/23211-spf13-cobra-tag
Use spf13/cobra for docker tag
Upstream-commit: 55a8bfa0e863c6399021ac4bf0bb7ca130debe16
Component: engine
2016-06-07 21:55:29 +02:00
fbb8bd9e59 Merge pull request #23338 from vdemeester/23253-fix-create-run
Fix create command flags
Upstream-commit: 8cd6977f98f4f51ee110a9795d1d93b9ec4b166c
Component: engine
2016-06-07 10:46:45 -07:00
216073fd2b Migrate docker build to cobra
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: 60f447b655c960a48fa23e9eb86cc3bce4aeec37
Component: engine
2016-06-07 18:15:44 +02:00
298b0e2df9 Use spf13/cobra for docker tag
This fix is part of the effort to convert commands to spf13/cobra #23211.

Thif fix coverted command `docker tag` to use spf13/cobra

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
Upstream-commit: ba7324ffcb23ba314fbab335a816004c4af7f3f3
Component: engine
2016-06-07 08:12:49 -07:00
92b754eb6a Use spf13/cobra for docker version
This fix is part of the effort to convert commands to spf13/cobra #23211.

Thif fix coverted command `docker version` to use spf13/cobra

NOTE: Most of the commands like `run`, `images` etc. goes to packages of
`container`, `image`, `network`, etc. Didn't find a good place for
`docker version` so just use the package `client` for now.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
Upstream-commit: bc82e51d7755e54dc6d0dcb93e6250bbff0bbd59
Component: engine
2016-06-07 08:11:34 -07:00
bade101cf9 Use spf13/cobra for docker images
This fix is part of the effort to convert commands to spf13/cobra #23211.

Thif fix coverted command `docker images` to use spf13/cobra

NOTE: As part of this fix, a new function `RequiresMaxArgs()`
has been defined in `cli/required.go`. This func returns an
error if there is not at most max args

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
Upstream-commit: 65a0034c67dbcc9e7a2baf285fca7d2435b689a3
Component: engine
2016-06-07 08:10:49 -07:00
238e9facc6 Migrate rm command to cobra
Signed-off-by: Zhang Wei <zhangwei555@huawei.com>
Upstream-commit: 7702f39fe8e642dbaede34af09472f5aea66a795
Component: engine
2016-06-07 22:19:16 +08:00
593816f86f Merge pull request #23307 from WeiZhang555/cobra-restart
Migrate restart command to cobra
Upstream-commit: 88323c861a70f94b88870b7614bc91d2fdfd98e0
Component: engine
2016-06-07 15:28:35 +02:00
a25abf1b60 Fix create command flags
Any command that expects extra flags after positional args needs to set flags.SetInterspersed(false).

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: aa00520fc8bb4e04c37c2eb41f3bc3558deab533
Component: engine
2016-06-07 14:11:11 +02:00
8dabf407a1 Merge pull request #23297 from WeiZhang555/cobra-kill
Migrate kill command to cobra
Upstream-commit: 4f9e2f9fb4a3b6594a8ae094eeb3494d6b6ef2f9
Component: engine
2016-06-07 13:44:22 +02:00
08ad8f3172 Merge pull request #23269 from vdemeester/migrate-import-to-cobra
Use spf13/cobra for docker import
Upstream-commit: f061f556f2d3819f293e76a434c8212d613eca6b
Component: engine
2016-06-07 13:07:30 +02:00
54aa4a7bec Merge pull request #22149 from vdemeester/deprecated-copy-endpoint
Deprecate /containers/(id or name)/copy endpoint
Upstream-commit: 148d2b8e4a7e4f669ba9e8db2adc2413fde27a07
Component: engine
2016-06-07 12:50:04 +02:00
5680e33f57 Migrate kill command to cobra
Signed-off-by: Zhang Wei <zhangwei555@huawei.com>
Upstream-commit: 732f08a822567aedeb9c9b27a84d8028c9ebb365
Component: engine
2016-06-07 17:20:33 +08:00
118d1a775e Migrate restart command to cobra
Signed-off-by: Zhang Wei <zhangwei555@huawei.com>
Upstream-commit: 264462d601ecd5d5e0d9e063e3d380a1e47d470a
Component: engine
2016-06-07 17:13:53 +08:00
5879215fd4 Merge pull request #23226 from HackToday/fixnetinspectId
Fix the network inspect id
Upstream-commit: f9021838b61f17b2de6c42e459a732652ee2d207
Component: engine
2016-06-07 10:02:17 +02:00
9b4d5c68b5 Merge pull request #23285 from yongtang/23211-spf13-cobra-pause
Use spf13/cobra for docker pause
Upstream-commit: 6d4a7213e66145552af31fa0c88aebdd70eb5700
Component: engine
2016-06-07 10:01:42 +02:00
ec9cb4d4e9 Merge pull request #23291 from yongtang/23211-spf13-cobra-history
Use spf13/cobra for docker history
Upstream-commit: 804536df25fb8b3819a42e88da4fc94b3e449000
Component: engine
2016-06-07 10:00:39 +02:00
d313694ba9 Merge pull request #23290 from yongtang/23211-spf13-cobra-rename
Use spf13/cobra for docker rename
Upstream-commit: e83dad090a1e890ac870808d776fa584276bf7ab
Component: engine
2016-06-07 08:28:27 +02:00
69e243a9fc Merge pull request #23274 from WeiZhang555/cobra-attach
Move attach command to cobra
Upstream-commit: ab821f9f9bf15cb7d356c6e48729f706807488db
Component: engine
2016-06-06 21:16:45 -04:00
83ae608b78 Use spf13/cobra for docker rename
This fix is part of the effort to convert commands to spf13/cobra #23211.

Thif fix coverted command `docker rename` to use spf13/cobra

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
Upstream-commit: 70f7ccb304f9246bc9c2bfe0e30d3a2bd8fd42f8
Component: engine
2016-06-06 12:39:11 -07:00
13b554cbab Use spf13/cobra for docker pause
This fix is part of the effort to convert commands to spf13/cobra #23211.

Thif fix coverted command `docker pause` to use spf13/cobra

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
Upstream-commit: 91731706c2c7d7efba78045ff8080f2b38d07c4f
Component: engine
2016-06-06 12:37:18 -07:00
812d9d1e28 Merge pull request #23306 from yongtang/23211-spf13-cobra-top
Use spf13/cobra for docker top
Upstream-commit: 5ce2f14f9bd12f1a66ad8f6f75d82d8fa8adc5e0
Component: engine
2016-06-06 10:14:10 -07:00
92cdf5f459 Merge pull request #23286 from yongtang/23211-spf13-cobra-port
Use spf13/cobra for docker port
Upstream-commit: 52da20b839f0de34c107ca80f3be1df89dcd698c
Component: engine
2016-06-06 18:55:37 +02:00
cfcc9cde2b Fix the network inspect id
This fixes #22231

Signed-off-by: Kai Qiang Wu(Kennan) <wkqwu@cn.ibm.com>
Upstream-commit: 864e362aa05ed2207d71471780068e951fe9d02e
Component: engine
2016-06-06 15:26:07 +00:00
6a387aef09 Use spf13/cobra for docker history
This fix is part of the effort to convert commands to spf13/cobra #23211.

Thif fix coverted command `docker history` to use spf13/cobra

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
Upstream-commit: a76d387cdaa0b44d7d2b7550c2eb4c0fc53e7a47
Component: engine
2016-06-06 08:03:07 -07:00
9a954be4f2 Move attach command to cobra.
Signed-off-by: Zhang Wei <zhangwei555@huawei.com>
Upstream-commit: eceb8625a94e3504fca7b27d8156bcf11a93bf4f
Component: engine
2016-06-06 22:28:57 +08:00
0ca5072a60 Use spf13/cobra for docker top
This fix is part of the effort to convert commands to spf13/cobra #23211.

Thif fix coverted command `docker top` to use spf13/cobra

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
Upstream-commit: 0f3866926763447c247bb24268923b5e50c006e1
Component: engine
2016-06-06 06:38:43 -07:00
1f876c8511 Use spf13/cobra for docker port
This fix is part of the effort to convert commands to spf13/cobra #23211.

Thif fix coverted command `docker port` to use spf13/cobra

Note: As part of this fix, a new function `RequiresMinMaxArgs(min int, max int)`
has been added in cli/required.go. This function restrict the args
to be at least min and at most max.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
Upstream-commit: d5971c230dc91fa8764dd5e9bc4124346ad06e02
Component: engine
2016-06-06 05:32:34 -07:00
49b97bdc07 Use spf13/cobra for docker wait
This fix is part of the effort to convert commands to spf13/cobra #23211.

Thif fix coverted command `docker wait` to use spf13/cobra

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
Upstream-commit: 82f84a67d6d40d4a076927c618db475191f97da0
Component: engine
2016-06-06 05:09:41 -07:00
b9600bdf73 Fix TestDiffEmptyArgClientError O:)
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: 7878705dcc26804b5f6a562410aecdb8f3485b91
Component: engine
2016-06-06 13:58:29 +02:00