deep-stack/kompose
7
0
Fork 0
forked from LaconicNetwork/kompose
Code Pull Requests Activity

Merge pull request #702 from containscafeine/remove_unused_parameter

Browse Source 
remove unused parameter from ValidateComposeFile()
This commit is contained in:
Charlie Drage 2017-07-12 09:28:40 -04:00 committed by GitHub
commit 0143deee8b
4 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmd/convert.go
View File

@ -88,7 +88,7 @@ var convertCmd = &cobra.Command{
// Validate before doing anything else. Use "bundle" if passed in. // Validate before doing anything else. Use "bundle" if passed in.
app.ValidateFlags(GlobalBundle, args, cmd, &ConvertOpt) app.ValidateFlags(GlobalBundle, args, cmd, &ConvertOpt)
app.ValidateComposeFile(cmd, &ConvertOpt) app.ValidateComposeFile(&ConvertOpt)
}, },
Run: func(cmd *cobra.Command, args []string) { Run: func(cmd *cobra.Command, args []string) {

2
cmd/down.go
View File

@ -45,7 +45,7 @@ var downCmd = &cobra.Command{
} }
// Validate before doing anything else. // Validate before doing anything else.
app.ValidateComposeFile(cmd, &DownOpt) app.ValidateComposeFile(&DownOpt)
}, },
Run: func(cmd *cobra.Command, args []string) { Run: func(cmd *cobra.Command, args []string) {
app.Down(DownOpt) app.Down(DownOpt)

2
cmd/up.go
View File

@ -60,7 +60,7 @@ var upCmd = &cobra.Command{
} }
// Validate before doing anything else. // Validate before doing anything else.
app.ValidateComposeFile(cmd, &UpOpt) app.ValidateComposeFile(&UpOpt)
}, },
Run: func(cmd *cobra.Command, args []string) { Run: func(cmd *cobra.Command, args []string) {
app.Up(UpOpt) app.Up(UpOpt)

2
pkg/app/app.go
View File

@ -136,7 +136,7 @@ func ValidateFlags(bundle string, args []string, cmd *cobra.Command, opt *kobjec
} }
// ValidateComposeFile validated the compose file provided for conversion // ValidateComposeFile validated the compose file provided for conversion
func ValidateComposeFile(cmd *cobra.Command, opt *kobject.ConvertOptions) { func ValidateComposeFile(opt *kobject.ConvertOptions) {
if len(opt.InputFiles) == 0 { if len(opt.InputFiles) == 0 {
// Here docker-compose is the input // Here docker-compose is the input
opt.InputFiles = []string{"docker-compose.yml"} opt.InputFiles = []string{"docker-compose.yml"}