Commit Graph
4261 Commits
Author SHA1 Message Date
Vincent Demeester 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
Sebastiaan van Stijn 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
Vincent Demeester 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
Daniel Nephin 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
Daniel Nephin 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
Daniel Nephin 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
Vincent Demeester 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
Daniel Nephin 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
Daniel Nephin 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
Daniel Nephin 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
Daniel Nephin 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
Daniel Nephin 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
Daniel Nephin 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
John Starks 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
muge 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
Daniel Nephin 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
Daniel Nephin 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
David Calavera 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
David Calavera 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
John Howard 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
Brian Goff 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
Brian Goff 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
Daniel Nephin 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
Daniel Nephin 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
Daniel Nephin 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
Daniel Nephin 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
John Starks 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
John Howard 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
John Howard 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
John Starks 1eb8e79404 Windows: Add file version information
This change adds file version information to docker.exe and dockerd.exe by
adding a Windows version resource with the windres tool.

This change adds a dependency to binutils-mingw-w64 on Linux, but removes
a dependency on rsrc. Most Windows build environments should already have
windres if they have gcc (which is necessary to build dockerd).

Signed-off-by: John Starks <jostarks@microsoft.com>
Upstream-commit: 5c252a7914
Component: cli
2016-04-24 10:55:51 -07:00
Daniel Nephin 8becd69255 Cleanup from CR.
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: ef9ad85429
Component: cli
2016-04-23 15:05:15 -04:00
Daniel Nephin c8402be431 Build two binaries client and daemon.
Add a proxy to support 'docker daemon'
Fix configFile option, and remove a test that is no longer relevant.
Remove daemon build tag.
Remove DOCKER_CLIENTONLY from build scripts.

Signed-off-by: Daniel Nephin <dnephin@docker.com>

Change docker-daemon to dockerd.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: 0c4f21fee3
Component: cli
2016-04-22 11:26:01 -04:00
Daniel Nephin fb521be467 Build two binaries client and daemon.
Add a proxy to support 'docker daemon'
Fix configFile option, and remove a test that is no longer relevant.
Remove daemon build tag.
Remove DOCKER_CLIENTONLY from build scripts.

Signed-off-by: Daniel Nephin <dnephin@docker.com>

Change docker-daemon to dockerd.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: 91dd0c0c69
Component: cli
2016-04-22 11:26:01 -04:00
allencloud c5f866738c fix typos
Signed-off-by: allencloud <allen.sun@daocloud.io>
Upstream-commit: 57171ee83c
Component: cli
2016-03-26 22:06:45 +08:00
Martin Mosegaard Amdisen 8892876943 Update 'save' command help
Based on review feedback.

Signed-off-by: Martin Mosegaard Amdisen <martin.amdisen@praqma.com>
Upstream-commit: bcd0ac71ae
Component: cli
2016-03-22 08:16:52 +01:00
Martin Mosegaard Amdisen aebcbe8e0a Fix plural typo in 'save' command help
The form "Save an images" is not correct.
Either "Save an image" or "Save images" work, but since
the save commands accepts multiple images, I chose the
latter.

Fixed in all places where I could grep "Save an image(s)".

Signed-off-by: Martin Mosegaard Amdisen <martin.amdisen@praqma.com>
Upstream-commit: 54e7de9b12
Component: cli
2016-03-21 15:15:40 +01:00
Sebastiaan van Stijn c903000eea Remove some references to "register" through login
These were left-overs from the now deprecated
and removed functionality to registrer a new account
through "docker login"

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 38f2513340
Component: cli
2016-03-01 17:33:23 +01:00
Zhang Wei c1018a0d0f Update RestartPolicy of container
Add `--restart` flag for `update` command, so we can change restart
policy for a container no matter it's running or stopped.

Signed-off-by: Zhang Wei <zhangwei555@huawei.com>
Upstream-commit: 7a30e41b84
Component: cli
2016-02-20 17:06:32 +08:00
huqun 763bb430ef fix grammar error
it is not very important,but I think the modification makes the coders read more conviently!

Signed-off-by: huqun  <huqun@zju.edu.cn>
Upstream-commit: c73cd919b4
Component: cli
2016-02-12 16:11:31 +08:00
David Calavera f8da06917e Remove usage of pkg sockets and tlsconfig.
- Use the ones provided by docker/go-connections, they are a drop in replacement.
- Remove pkg/sockets from docker.
- Keep pkg/tlsconfig because libnetwork still needs it and there is a
  circular dependency issue.

Signed-off-by: David Calavera <david.calavera@gmail.com>
Upstream-commit: 9683297348
Component: cli
2015-12-29 19:27:12 -05:00
Qiang Huang 5d3e431b12 Implemet docker update command
It's used for updating properties of one or more containers, we only
support resource configs for now. It can be extended in the future.

Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
Upstream-commit: c9a59eb644
Component: cli
2015-12-28 19:19:26 +08:00
Madhu Venugopal 280ba2ad3c Added network to docker --help and help cleanup
Fixes https://github.com/docker/docker/issues/16909

Signed-off-by: Madhu Venugopal <madhu@docker.com>
Upstream-commit: 22e3fabb45
Component: cli
2015-10-15 03:10:39 -07:00
Lei Jitang 6aa852474e Use consistent command description
Signed-off-by: Lei Jitang <leijitang@huawei.com>
Upstream-commit: 2734a5821c
Component: cli
2015-10-08 08:46:21 -04:00
Tibor Vass 5f31535973 cli: new daemon command and new cli package
This patch creates a new cli package that allows to combine both client
and daemon commands (there is only one daemon command: docker daemon).

The `-d` and `--daemon` top-level flags are deprecated and a special
message is added to prompt the user to use `docker daemon`.

Providing top-level daemon-specific flags for client commands result
in an error message prompting the user to use `docker daemon`.

This patch does not break any old but correct usages.

This also makes `-d` and `--daemon` flags, as well as the `daemon`
command illegal in client-only binaries.

Signed-off-by: Tibor Vass <tibor@docker.com>
Upstream-commit: c023f818aa
Component: cli
2015-07-23 19:44:46 -04:00
Solomon Hykes b5dcd430d5 Merge dockerd into docker. 'docker -d' runs in daemon mode. For all other commands, docker auto-detects whether to run standalone or to remote-control the daemon
Upstream-commit: 7f13a9cf3a
Component: cli
2013-03-13 00:29:40 -07:00
Solomon Hykes a59a03bb59 Merged master
Upstream-commit: a790f96feb
Component: cli
2013-03-12 21:53:34 -07:00
Solomon Hykes ab2846c881 Removed interactive mode ('docker -i'). Cool UI experiment but seems more trouble than it's worth
Upstream-commit: ae5f2d9a56
Component: cli
2013-03-12 15:05:41 -07:00
creack f9945bccac Put back the github.com path for the import
Upstream-commit: 20c2c684b2
Component: cli
2013-03-12 11:59:27 -07:00
creack ddc08abc64 Merge master within fs
Upstream-commit: c4a0001d99
Component: cli
2013-03-12 08:33:21 -07:00
Louis Opter cf4a1a8ac7 Automatically remove the rcfile generated by docker -i from /tmp
Upstream-commit: d895b3a7f8
Component: cli
2013-03-12 12:12:40 -07:00