tyler.durden
/
compose
mirror of https://github.com/docker/compose.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #293 from docker/version_f_shorthand 

Add missing f shorthand for version command
This commit is contained in:
Djordje Lukic 2020-06-26 15:38:50 +02:00 committed by GitHub
parent bd33101a96 d97f9d68fd
commit e3b6a470fa
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
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
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")
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"))
}
func (s *E2eSuite) TestAllowsFormatFlagInVersion() {
s.NewDockerCommand("version", "-f", "{{ json . }}").ExecOrDie()
s.NewDockerCommand("version", "--format", "{{ json . }}").ExecOrDie()
}
func (s *E2eSuite) TestMockBackend() {
It("creates a new test context to hardcoded example backend", func() {
s.NewDockerCommand("context", "create", "example", "test-example").ExecOrDie()