diff --git a/cmd/compose/convert.go b/cmd/compose/convert.go index 59eb31780..3e4b2dea9 100644 --- a/cmd/compose/convert.go +++ b/cmd/compose/convert.go @@ -50,8 +50,6 @@ type convertOptions struct { hash string } -var addFlagsFuncs []func(cmd *cobra.Command, opts *convertOptions) - func convertCommand(p *projectOptions, backend api.Service) *cobra.Command { opts := convertOptions{ projectOptions: p, @@ -98,11 +96,8 @@ func convertCommand(p *projectOptions, backend api.Service) *cobra.Command { flags.BoolVar(&opts.volumes, "volumes", false, "Print the volume names, one per line.") flags.BoolVar(&opts.profiles, "profiles", false, "Print the profile names, one per line.") flags.StringVar(&opts.hash, "hash", "", "Print the service config hash, one per line.") + flags.StringVarP(&opts.Output, "output", "o", "", "Save to file (default to stdout)") - // add flags for hidden backends - for _, f := range addFlagsFuncs { - f(cmd, &opts) - } return cmd } diff --git a/cmd/compose/convert_kube.go b/cmd/compose/convert_kube.go deleted file mode 100644 index 776800321..000000000 --- a/cmd/compose/convert_kube.go +++ /dev/null @@ -1,31 +0,0 @@ -// +build kube - -/* - Copyright 2020 Docker Compose CLI authors - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. -*/ - -package compose - -import ( - "github.com/spf13/cobra" -) - -func init() { - addFlagsFuncs = append(addFlagsFuncs, func(cmd *cobra.Command, opts *convertOptions) { - flags := cmd.Flags() - flags.StringVar(&opts.Output, "output", "", "Save to directory") - }) - -}