Commit Graph

4030 Commits

Author SHA1 Message Date
8fc0484b38 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: 084a028e84
Component: cli
2016-06-06 12:37:18 -07:00
bd7d99cb26 Fix a panic when the DOCKER_HOST was invalid using cobra commands.
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: 55d46e8352
Component: cli
2016-06-06 14:17:04 -04:00
2f724ecf5d Merge pull request #23306 from yongtang/23211-spf13-cobra-top
Use spf13/cobra for docker top
Upstream-commit: 8ad9f66953
Component: cli
2016-06-06 10:14:10 -07:00
c3c70cc91a Merge pull request #23286 from yongtang/23211-spf13-cobra-port
Use spf13/cobra for docker port
Upstream-commit: 2002063bf2
Component: cli
2016-06-06 18:55:37 +02:00
f8e3edcba2 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: 0090463cab
Component: cli
2016-06-06 08:03:07 -07:00
a3b1f76002 Move attach command to cobra.
Signed-off-by: Zhang Wei <zhangwei555@huawei.com>
Upstream-commit: 096f7f72bf
Component: cli
2016-06-06 22:28:57 +08:00
fb1223adc0 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: 6829d53a08
Component: cli
2016-06-06 06:38:43 -07:00
b6dfddf0e2 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: c289179c99
Component: cli
2016-06-06 05:32:34 -07:00
3075856642 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: b4421407a0
Component: cli
2016-06-06 05:09:41 -07:00
afe109a57d Migrate import command to cobra
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: bbf4cd7b56
Component: cli
2016-06-06 13:58:23 +02:00
231ae1a7df Migrate network command to cobra
- Migrates network command and subcommands (connect, create, disconnect,
  inspect, list and remove) to spf13/cobra
- Create a RequiredExactArgs helper function for command that require an
  exact number of arguments.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: fac425608a
Component: cli
2016-06-06 10:28:52 +02:00
795d56105b Merge pull request #23284 from yongtang/23211-spf13-cobra-logs
Use spf13/cobra for docker logs
Upstream-commit: c23f4c9b48
Component: cli
2016-06-06 09:06:51 +02:00
56191eeebf Merge pull request #23283 from yongtang/23211-spf13-cobra-diff
Use spf13/cobra for docker diff
Upstream-commit: 168b0d7f98
Component: cli
2016-06-06 09:05:18 +02:00
a8c6900c5e Merge pull request #23268 from WeiZhang555/cobra-start
Migrate start command to cobra
Upstream-commit: dd2c65392f
Component: cli
2016-06-06 08:59:42 +02:00
91b39330c0 Migrate start command to cobra
Signed-off-by: Zhang Wei <zhangwei555@huawei.com>
Upstream-commit: 217e98c710
Component: cli
2016-06-06 09:53:18 +08:00
3b0881ed77 Use spf13/cobra for docker unpause
This fix is part of the effort to convert commands to spf13/cobra #23211.

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

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
Upstream-commit: 316ab12eed
Component: cli
2016-06-05 17:29:52 -07:00
fd4182f4a4 Use spf13/cobra for docker logs
This fix is part of the effort to convert commands to spf13/cobra #23211.

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

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
Upstream-commit: a5c6af94b1
Component: cli
2016-06-05 15:51:35 -07:00
c16e4d5a76 Use spf13/cobra for docker diff
This fix is part of the effort to convert commands to spf13/cobra #23211.

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

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
Upstream-commit: 65fed1bca2
Component: cli
2016-06-05 15:13:55 -07:00
f615c6e69d Use spf13/cobra for docker rmi
Moves image command rmi to `api/client/image/remove.go` and use cobra :)

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: 894cc1f201
Component: cli
2016-06-05 22:40:35 +02:00
9f5ba149d1 Merge pull request #23276 from yongtang/23211-spf13-cobra-stop
Use spf13/cobra for docker stop
Upstream-commit: 713f88ec6f
Component: cli
2016-06-05 22:37:15 +02:00
2c18ee5cf6 Use spf13/cobra for docker stop
This fix is part of the effort to convert commands to spf13/cobra #23211.

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

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
Upstream-commit: 4770a4ba82
Component: cli
2016-06-05 10:25:21 -07:00
036d47c325 Migrate export command to cobra
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: 6ee903eea0
Component: cli
2016-06-05 16:42:19 +02:00
be19ee5f31 Merge pull request #23253 from vdemeester/carry-pr-23159
Carry #23159 : Use spf13/cobra for `docker run` and `docker create`
Upstream-commit: 8ad0a0ff95
Component: cli
2016-06-04 18:55:23 +02:00
53aae17014 Display "See 'docker cmd --help'." in error cases
This brings back this message in case missing arguments.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: 4a7a5f3a57
Component: cli
2016-06-04 16:19:54 +02:00
50bfe19924 Convert 'docker create' to use cobra and pflag
Return the correct status code on flag parsins errors.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: aee3578520
Component: cli
2016-06-04 13:57:30 +02:00
ed3db9e52f Convert 'docker create' to use cobra and pflag
Return the correct status code on flag parsins errors.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: 69d3037635
Component: cli
2016-06-04 13:57:30 +02:00
b31d040a09 Convert 'docker run' to a cobra command and to use pflags
Move container options into a struct so that tests should pass.
Remove unused FlagSet arg from Parse
Disable interspersed args on docker run

Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: 396c0660ab
Component: cli
2016-06-04 13:55:35 +02:00
c67e8b1f27 Use spf13/cobra for docker search
- Move image command search to `api/client/image/search.go`
- Use cobra :)

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: bbefa88a8c
Component: cli
2016-06-03 19:50:01 +02:00
c79c171774 Make the -h flag deprecated.
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: 82c85e1e83
Component: cli
2016-05-31 15:43:16 -07:00
625794a555 Use Args in cobra.Command to validate args.
Also re-use context.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: 25892d27be
Component: cli
2016-05-31 15:43:16 -07:00
83e2fbd2b2 Support usage messages on bad flags.
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: 11ede59379
Component: cli
2016-05-31 15:43:16 -07:00
64201068c6 Migrate volume commands to cobra.
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: ad83c422f2
Component: cli
2016-05-31 14:41:37 -07:00
a0e9eab464 Update usage and help to (almost) match the existing docker behaviour
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: 13cea4e58d
Component: cli
2016-05-31 14:41:37 -07:00
5848cf4f34 Migrate volume commands to cobra.
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: 4786ccd05c
Component: cli
2016-05-31 14:41:37 -07:00
4b0173813a Windows: work around Go 1.6.2/Nano Server TP5 issue
This works around golang/go#15286 by explicitly loading shell32.dll at
load time, ensuring that syscall can load it dynamically during process
startup.

Signed-off-by: John Starks <jostarks@microsoft.com>
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
Upstream-commit: 9b1a322d9e
Component: cli
2016-05-25 11:59:28 +02:00
c70421e0ad cli: remove unnecessary initErr type
Signed-off-by: ZhangHang <stevezhang2014@gmail.com>
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
Upstream-commit: 79b8543b54
Component: cli
2016-05-23 13:04:10 -07:00
3773be609d Raise a more relevant error when dockerd is not available on the platform.
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: 765ab2b692
Component: cli
2016-05-02 11:59:25 -04:00
55cad02477 When exec'ing dockerd, look for it in the same directory as the docker binary first, before checking path.
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: 625263e2c7
Component: cli
2016-05-02 11:52:50 -04:00
996d076870 Merge pull request #22372 from dnephin/cli_cleanup
Reorganize client and cli packages
Upstream-commit: 3d58ff580f
Component: cli
2016-04-29 17:31:39 -07:00
ea37da58de Merge pull request #22372 from dnephin/cli_cleanup
Reorganize client and cli packages
Upstream-commit: 5de3b105a8
Component: cli
2016-04-29 17:31:39 -07:00
5df7e1fa55 Merge pull request #22340 from Microsoft/jstarks/split-service
Windows: Support running dockerd as a service
Upstream-commit: 320dbb2c30
Component: cli
2016-04-29 10:47:20 -07:00
2007fb140d Remove reflection on CLI init
before:
```
$ time docker --help
real  0m0.177s
user  0m0.000s
sys 0m0.040s
```

after:
```
$ time docker --help
real  0m0.010s
user  0m0.000s
sys 0m0.000s
```

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Upstream-commit: 89d78abcdc
Component: cli
2016-04-29 11:57:46 -04:00
a190e4c730 Remove reflection on CLI init
before:
```
$ time docker --help
real  0m0.177s
user  0m0.000s
sys 0m0.040s
```

after:
```
$ time docker --help
real  0m0.010s
user  0m0.000s
sys 0m0.000s
```

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Upstream-commit: eb35552fb3
Component: cli
2016-04-29 11:57:46 -04:00
63c0c343f9 Consolidate the files in client/
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: 2bc929b019
Component: cli
2016-04-27 14:53:36 -04:00
9d807c4424 Consolidate the files in client/
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: ec6cc96fa1
Component: cli
2016-04-27 14:53:36 -04:00
c15182b1a0 Cleanup the structure of the cli package.
Move all flags into cli/flags
Move usage help into cli/usage.go

Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: a5c08fdbf0
Component: cli
2016-04-27 14:25:47 -04:00
9e49ad8267 Cleanup the structure of the cli package.
Move all flags into cli/flags
Move usage help into cli/usage.go

Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: 315e242b9c
Component: cli
2016-04-27 14:25:47 -04:00
73fd4d25b9 Windows: Support running dockerd as a service
This adds support for Windows dockerd to run as a Windows service, managed
by the service control manager. The log is written to the Windows event
log (and can be viewed in the event viewer or in PowerShell). If there is
a Go panic, the stack is written to a file panic.log in the Docker root.

Signed-off-by: John Starks <jostarks@microsoft.com>
Upstream-commit: 421e366d8d
Component: cli
2016-04-26 14:04:47 -07:00
858af44a04 Make dockerd debuggable
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: 969302c169
Component: cli
2016-04-26 09:35:22 -07:00
977a19e21d Make dockerd debuggable
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: c6919a6e79
Component: cli
2016-04-26 09:35:22 -07:00