Commit Graph

29 Commits

Author SHA1 Message Date
86e291ef5c flag: fix the comments
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
Upstream-commit: 9cc73c62e6779bf2c8eefc4192c017a2c73daf40
Component: engine
2014-11-30 01:58:16 +08:00
5dbc13abb8 Add missing unit testcase for new IsSet() func in mflag
Forgot to add this when I did PR #9259

Signed-off-by: Doug Davis <dug@us.ibm.com>
Upstream-commit: 88afbc4d94c4a803e936d602c620b8ab08e24acd
Component: engine
2014-11-22 05:37:36 -08:00
f7e2fcdfb9 Make --tlsverify enable tls regardless of value specified
I also needed to add a mflag.IsSet() function that allows you to check
to see if a certain flag was actually specified on the cmd line.

Per #9221 - also tweaked the docs to fix a typo.

Closes #9221

Signed-off-by: Doug Davis <dug@us.ibm.com>
Upstream-commit: ae9bd580af55992974fcb94f73f72cc3b2257fec
Component: engine
2014-11-20 16:09:06 -08:00
5867aa701f fs.Visit() returns nil flag
Signed-off-by: Sven Dowideit <SvenDowideit@docker.com>
Upstream-commit: f1934e59790c9af6466075d3d050386627ad1a9a
Component: engine
2014-08-29 15:38:03 +10:00
3cca8404b4 add the [OPTIONS] string automatically if there are flags defined
Signed-off-by: SvenDowideit <SvenDowideit@home.org.au>

Docker-DCO-1.1-Signed-off-by: SvenDowideit <SvenDowideit@home.org.au> (github: SvenDowideit)
Upstream-commit: 8c6c4a12b7bd53c01998988593789aa16a6d9ac8
Component: engine
2014-08-28 08:50:50 +10:00
676eea0fcd Revert "--help option and help command should print to stdout not stderr"
This reverts commit 61b129d81802e3c988cc0e67e488b24968dd748a.

Signed-off-by: Victor Vieux <vieux@docker.com>
Upstream-commit: 2e489073d94a7e2a5df115704a484c34f0b59f29
Component: engine
2014-08-27 18:59:13 +00:00
f13f1856df --help option and help command should print to stdout not stderr
--help and help are successful commands so output should not go to error.

QE teams have requested this change, also users doing docker help | less
or docker run --help | less would expect this to work.

Usage statement should only be printed when the user asks for it.
Errors should print error message and then suggest the docker COMMAND --help
command to see usage information.

The current behaviour causes the user to have to search for the error message
and sometimes scrolls right off the screen.  For example a error on a
"docker run" command is very difficult to diagnose.

Finally erros should always exit with a non 0 exit code, if the user
makes a CLI error.

Docker-DCO-1.1-Signed-off-by: Dan Walsh <dwalsh@redhat.com> (github: rhatdan)
Upstream-commit: 61b129d81802e3c988cc0e67e488b24968dd748a
Component: engine
2014-08-21 15:35:20 -04:00
6ae4c9014c update go import path and libcontainer
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com> (github: vieux)
Upstream-commit: b3ee9ac74e171e00f14027e39278013629e681b8
Component: engine
2014-07-24 22:19:50 +00:00
f94025a466 sort flags with the same name in a consistent order
Docker-DCO-1.1-Signed-off-by: Jonathan Boulle <jonathanboulle@gmail.com> (github: jonboulle)
Upstream-commit: d14cfc8d435dbef0d70b6444b275a025e60ac171
Component: engine
2014-06-27 01:46:59 +00:00
9a4ed6541e Merge pull request #6218 from vieux/update_maintainers
Upstream-commit: c9e647e42f3019b619b0ef47ff944831c226624c
Component: engine
2014-06-25 17:00:32 -07:00
172faefd3c Fix go vet errors
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com> (github: LK4D4)

Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com> (github: vieux)
Upstream-commit: f08cd445b0d2e44a4977a3bd0dca0a1cd4e76d2f
Component: engine
2014-06-18 17:39:57 +00:00
2883b4234a prevent panic when empty flag
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com> (github: vieux)
Upstream-commit: 661a1e90263cc348c17620cf0b250bf552dd4056
Component: engine
2014-06-17 20:45:57 +00:00
86a79a73e0 update MAINTAINERS files
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com> (github: vieux)
Upstream-commit: 06248d745a6a69b14595a699e0e5b3e883d8ea3a
Component: engine
2014-06-16 22:20:07 +00:00
af5c1612d8 pkg: mflag: flag: added tests for quote-stripped flags
This patch adds some tests to ensure that quoted flags are properly
handled by the mflag package.

Docker-DCO-1.1-Signed-off-by: Aleksa Sarai <cyphar@cyphar.com> (github: cyphar)
Upstream-commit: e4497feaba31dd33bad790f77f783afc0c695020
Component: engine
2014-06-02 15:25:38 +10:00
460cf60260 pkg: mflag: flag: make mflag strip quotes in -flag="var" forms
This patch improves the mflag package to ensure that things arguments
to mflag such as `-flag="var"` or `-flag='var'` have the quotes
stripped from the value (to mirror the getopt functionality for similar
flags).

Docker-DCO-1.1-Signed-off-by: Aleksa Sarai <cyphar@cyphar.com> (github: cyphar)
Upstream-commit: 0e9c40eb8243fa437bc6c3e93aaff64a10cb856e
Component: engine
2014-06-02 15:25:33 +10:00
29bfaa0d20 use tabwriter to display usage in mflag
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com> (github: vieux)
Upstream-commit: 77098d5b5bf8840a1179380b34aedb26139b9d65
Component: engine
2014-05-06 21:31:21 +00:00
2fa4f2c621 update godoc and add MAINTAINERS for mflags
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com> (github: vieux)
Upstream-commit: a41f6d936754f66d1786fa5b840278443da8d93c
Component: engine
2014-03-14 17:35:41 +00:00
8980d7490c improve deprecation message
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com> (github: vieux)
Upstream-commit: f0eb227548427f6fc829f2b270ad83d22bd90c69
Component: engine
2014-03-12 00:51:46 +00:00
ddfc798df3 handle capital
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com> (github: vieux)
Upstream-commit: 7da37fec13a0097284ffbbe05514de477cd98677
Component: engine
2014-03-07 23:40:45 +00:00
3398dcb261 improve alpha sort in mflag
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com> (github: vieux)
Upstream-commit: 3729ece2ea1c4aad286b7535a7c137045a9da107
Component: engine
2014-03-07 02:20:59 +00:00
ceba53329c fix panic with only long flags or only one deprecatd
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com> (github: vieux)
Upstream-commit: 069dc7f8c7bc3eaf61ddd926636aacce5f1ed1ee
Component: engine
2014-03-05 19:45:57 +00:00
fdbd555f75 fix usage for completly deprecated flag
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com> (github: vieux)
Upstream-commit: 089bf5e11e4284a6ed07dc165098bb269dfddf46
Component: engine
2014-03-05 19:27:39 +00:00
b49fc1301e add warning for deprecatd flags
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com> (github: vieux)
Upstream-commit: bb5ed452241c37ee9f2f3ebd02a2a5e1764334ad
Component: engine
2014-03-03 19:57:05 +00:00
5f84dbf6b9 prevent flag grouping with --
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com> (github: vieux)
Upstream-commit: cb3d27d01bbf696929b4d77d10e47eca2693e3fa
Component: engine
2014-03-03 19:17:28 +00:00
66f4744981 enable docker run -it
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com> (github: vieux)
Upstream-commit: 3839e3a0f63c8acc4cb11a87b862f159e5b2aedc
Component: engine
2014-02-24 22:53:00 +00:00
282ae4468c fix panic in mflag
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com> (github: vieux)
Upstream-commit: 65794a2c4960f9065ee439d6823ffe670610dbb6
Component: engine
2014-01-31 11:39:29 -08:00
a9728be13d fix mflag import
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com> (github: vieux)
Upstream-commit: c4e7b0e4d539c66f095d726856562c65f25eac0b
Component: engine
2014-01-27 23:29:56 +00:00
f68d62aa35 Fix mflag test issue with "ResetForTesting" (which only showed up under dyntest for some odd reason)
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
Upstream-commit: f60eee4894cfa07e8a969425c72d291f80f3053a
Component: engine
2014-01-23 13:03:17 -07:00
7822beced6 update commands.go
update docker.go

move to pkg

update docs

update name and copyright

change --sinceId to --since-id, update completion and docs

Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor@docker.com> (github: vieux)
Upstream-commit: e71dbf4ee5add5736f595948fc20bd01af56a744
Component: engine
2014-01-17 17:33:15 -08:00