tyler.durden/compose
1
0
Fork 0
mirror of https://github.com/docker/compose.git synced 2025-07-23 13:45:00 +02:00
Code Issues Packages Projects Releases Wiki Activity

Add missing f shorthand for version command

Browse Source
This commit is contained in:
Guillaume Tardif 2020-06-26 12:35:51 +02:00
parent 4fb039164d
commit d97f9d68fd
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cli/cmd/version.go
View File

@ -38,7 +38,7 @@ func VersionCommand(version string) *cobra.Command {
} }
// define flags for backward compatibility with com.docker.cli // define flags for backward compatibility with com.docker.cli
flags := cmd.Flags() flags := cmd.Flags()
flags.String("format", "", "Format the output using the given Go template") flags.StringP("format", "f", "", "Format the output using the given Go template")
flags.String("kubeconfig", "", "Kubernetes config file") flags.String("kubeconfig", "", "Kubernetes config file")
mobyflags.AddMobyFlagsForRetrocompatibility(flags) mobyflags.AddMobyFlagsForRetrocompatibility(flags)

5
tests/e2e/e2e_test.go
View File

@ -239,6 +239,11 @@ func (s *E2eSuite) TestDisplaysAdditionalLineInDockerVersion() {
Expect(output).To(ContainSubstring("Azure integration")) Expect(output).To(ContainSubstring("Azure integration"))
} }
func (s *E2eSuite) TestAllowsFormatFlagInVersion() {
s.NewDockerCommand("version", "-f", "{{ json . }}").ExecOrDie()
s.NewDockerCommand("version", "--format", "{{ json . }}").ExecOrDie()
}
func (s *E2eSuite) TestMockBackend() { func (s *E2eSuite) TestMockBackend() {
It("creates a new test context to hardcoded example backend", func() { It("creates a new test context to hardcoded example backend", func() {
s.NewDockerCommand("context", "create", "example", "test-example").ExecOrDie() s.NewDockerCommand("context", "create", "example", "test-example").ExecOrDie()