p4u1/docker-cli
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
23,724 Commits 2 Branches 295 Tags
c6ef103dcf6fce25035c510cc7dc35b492d2d9ba
Commit Graph

32 Commits

Author SHA1 Message Date
Zhang Wei
97016757fb Let client print error when speicify wrong detach keys 
Fix #21064

Let client print error message explicitly when user specifies wrong
detach keys.

Signed-off-by: Zhang Wei <zhangwei555@huawei.com>
Upstream-commit: 91e5bb954131904af150b06bd22b007559a8ce27
Component: engine
 2016-04-04 15:35:55 +08:00
Lei Jitang
eeff19f114 cli: move setRawTerminal and restoreTerminal to holdHijackedConnection 
In this way, we can restore the Terminal as soon as possible once the hijacked
connection end. This not only fix weird output if cli enable -D, but also
remove duplicate code.

Signed-off-by: Lei Jitang <leijitang@huawei.com>
Upstream-commit: 66d3dcc6f7648ab5af3c7f876c2b9c63ab2899ac
Component: engine
 2016-03-24 21:25:50 -04:00
Brian Goff
c955c9e289 Don't forward SIGPIPE from client to container 
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Upstream-commit: 81707de23ff6d0b03bd8d5cda87efac7939d9d46
Component: engine
 2016-03-18 16:50:18 -04:00
Vincent Demeester
44ad0dbdfd Update api/client file to use context 
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: 8567286ed65c8aca180b4590acf7d9ef61e15955
Component: engine
 2016-03-16 20:25:09 +01:00
Michael Crosby
31eb5171fa Move tty set and restore to caller 
Fixes #19506

This fixes the issue of errors on create and the tty not being able to
be restored to its previous state because of a race where it was
in the hijack goroutine.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
Upstream-commit: a1eb6029cc4e4ccd820b0aac147a6121f1967ba2
Component: engine
 2016-01-20 13:32:19 -08:00
David Calavera
4ec2693c9e Modify import paths to point to the new engine-api package. 
Signed-off-by: David Calavera <david.calavera@gmail.com>
Upstream-commit: 907407d0b2e5863f0e1b40b93a356bbf03c7b9fb
Component: engine
 2016-01-06 19:48:59 -05:00
Vincent Demeester
5582f5eb83 Implement configurable detach key 
Implement configurable detach keys (for `attach`, exec`, `run` and
`start`) using the client-side configuration

- Adds a `--detach-keys` flag to `attach`, `exec`, `run` and `start`
  commands.
- Adds a new configuration field (in `~/.docker/config.json`) to
  configure the default escape keys for docker client.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: 15aa2a663b47b6126a66efefcadb64edfbffb9f5
Component: engine
 2016-01-03 23:03:39 +01:00
Justas Brazauskas
3c4fcf6b7a Fix typos found across repository 
Signed-off-by: Justas Brazauskas <brazauskasjustas@gmail.com>
Upstream-commit: 927b334ebfc786276a039e45ec097e71bf9a104c
Component: engine
 2015-12-13 18:04:12 +02:00
David Calavera
00c6b1ffcd Implement docker run with standalone client lib. 
Signed-off-by: David Calavera <david.calavera@gmail.com>
Upstream-commit: bcb848c87f496fe2b946530521a0d262a489c019
Component: engine
 2015-12-09 12:04:59 -05:00
David Calavera
ab1194c8fb Implement docker start with standalone client lib. 
Signed-off-by: David Calavera <david.calavera@gmail.com>
Upstream-commit: 962b2d8b9b0201db2132ec17f06513e33ad419d0
Component: engine
 2015-12-09 12:04:59 -05:00
David Calavera
8f23851d4e Implement docker kill with standalone client lib. 
Signed-off-by: David Calavera <david.calavera@gmail.com>
Upstream-commit: c57e62d00e209288e4f2734d32a3184b4abf4248
Component: engine
 2015-12-09 12:04:55 -05:00
Jess Frazelle
6c294ed6e9 Merge pull request #16544 from Mashimiao/fix-bug-client-start-signal-discarded 
client/start: fix logic for discarded signal
Upstream-commit: 4796b5c2f84c38960bb1147dff59d7946172b598
Component: engine
 2015-10-08 12:54:31 -07:00
Lei Jitang
262c5c28a2 Use consistent command description 
Signed-off-by: Lei Jitang <leijitang@huawei.com>
Upstream-commit: 2b0927c9ac23b66d8a05761801d1c5f882ba8dfb
Component: engine
 2015-10-08 08:46:21 -04:00
Antonio Murdaca
b51b5af287 Fix man and commandline docs 
- missing help option in `docs/reference/commandline/*.md` (some files
  have it, the other I fixed didn't)
- missing `[OPTIONS]` in Usage description
- missing options
- formatting
- start/stop idempotence

Signed-off-by: Antonio Murdaca <amurdaca@redhat.com>
Upstream-commit: 14e8898648909379f37049828e103ba1c97f253b
Component: engine
 2015-10-04 21:22:27 +02:00
Ma Shimiao
17b0c78384 client/start: fix logic for discarded signal 
Signed-off-by: Ma Shimiao <mashimiao.fnst@cn.fujitsu.com>
Upstream-commit: 6d25eb6e7c599bd569af02cf08fe0fbc9af7e1d8
Component: engine
 2015-09-25 11:25:29 +08:00
Tibor Vass
12234c67d4 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: 96ce3a194aab2807fdd638825b9ea7cb9ba55c36
Component: engine
 2015-07-23 19:44:46 -04:00
John Howard
c8344b3dc3 Windows: Remove meaningless warnings on docker info 
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: 615681f5177cef974d516d5814195c768e773dd2
Component: engine
 2015-07-10 10:06:20 -07:00
Ma Shimiao
03b04678dd api/client: unify format of args check 
Signed-off-by: Ma Shimiao <mashimiao.fnst@cn.fujitsu.com>
Upstream-commit: 9a4cbb358d7b839611b86856c73683e0499d681d
Component: engine
 2015-07-08 17:29:47 +08:00
Ma Shimiao
a462e56268 api/client: close the returned io.ReadCloser 
Signed-off-by: Ma Shimiao <mashimiao.fnst@cn.fujitsu.com>
Upstream-commit: 91a496055c3e45ab3fba8e643475adb618581e1f
Component: engine
 2015-07-08 10:06:25 +08:00
Josh Hawn
4cf65f9e74 Merge pull request #13869 from jlhawn/multi_line_help_usage 
api/client: Allow for multi-line usage help
Upstream-commit: 86d6a5b11f74e7cc302dc8ccc7ec82119763cb5a
Component: engine
 2015-06-15 14:50:17 -07:00
Josh Hawn
1f7c141bcf api/client: have cli.call() return headers 
Docker-DCO-1.1-Signed-off-by: Josh Hawn <josh.hawn@docker.com> (github: jlhawn)
Upstream-commit: 0cdc3b7539b618778becf233157604698b4e8281
Component: engine
 2015-06-10 16:20:13 -07:00
Josh Hawn
8f5fcaf455 api/client: Allow for multi-line usage help 
Subcommands can provide multiple usage synopses.

Docker-DCO-1.1-Signed-off-by: Josh Hawn <josh.hawn@docker.com> (github: jlhawn)
Upstream-commit: 4cb0c93f9287d29934894c871d156801122516cd
Component: engine
 2015-06-10 16:14:45 -07:00
Doug Davis
2e83148ffd Use stderr instead of logrus for CLI error messages 
Signed-off-by: Doug Davis <dug@us.ibm.com>
Upstream-commit: 0024935f641ab596732f9162d3eab795bbc2ae06
Component: engine
 2015-05-12 17:22:41 -07:00
Qiang Huang
50a36ca638 a few cleanups for client output 
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
Upstream-commit: 5a6db4fd44c0e05c8b185174a9aa380c9cc4f719
Component: engine
 2015-05-05 15:59:17 +08:00
Antonio Murdaca
016ac4bf61 Remove engine mechanism 
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
Upstream-commit: 531f4122bdcd4de289f613a5ef010f4c1989f098
Component: engine
 2015-04-30 01:35:16 +02:00
Deshi Xiao
1931a4d310 client.StatusError don't be returned as a pointer 
closes #12373

1. remove & from client.StatusError
2. remove * from Error method

Signed-off-by: Deshi Xiao <xiaods@gmail.com>
Upstream-commit: bae3023eef0ed8e0eb517ca53f6f97f1bf6786d3
Component: engine
 2015-04-16 01:27:07 +08:00
Antonio Murdaca
a4111cba55 Refactor utils/utils, fixes #11923 
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
Upstream-commit: c30a55f14dbbe3971ba0ac716ba69a60868f4490
Component: engine
 2015-04-14 01:37:36 +02:00
Antonio Murdaca
0f80e9e5da Refactor utils/flags.go, fixes #11892 
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
Upstream-commit: 5670c6c6954e08575a6c821137a7ea6d9084af93
Component: engine
 2015-03-29 03:22:46 +02:00
Antonio Murdaca
e5b36a723c Replace aliased imports of logrus, fixes #11762 
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
Upstream-commit: 6f4d847046cb4e072de61d042c0266190d73a8c9
Component: engine
 2015-03-26 23:22:04 +01:00
Don Kjer
04f472f007 Fix for issue 9922: private registry search with auth returns 401 
Signed-off-by: Don Kjer <don.kjer@gmail.com>
Upstream-commit: 6b2eeaf8965bac07022752c411b1f8a0f35f9571
Component: engine
 2015-03-26 18:59:16 +00:00
Peggy Li
ef0a4fa398 Add godoc-style docstrings to Cmd... methods 
Signed-off-by: Peggy Li <peggyli.224@gmail.com>
Upstream-commit: b5d0380108dde9e96d51bb01821860a0799dee0d
Component: engine
 2015-03-25 14:17:11 -07:00
Joey Gibson
ff6913868d api/client - The code for all cli commands are in one file #11610 
Signed-off-by: Joey Gibson <joey@joeygibson.com>
Upstream-commit: 58690c9cca5995035b721ed6f1337b0ddb932d7a
Component: engine
 2015-03-24 23:57:23 -04:00