From 122384b9f0f703acd149edba4e2814f2b16d4939 Mon Sep 17 00:00:00 2001 From: Hang Yan Date: Sun, 1 Nov 2020 21:32:25 +0800 Subject: [PATCH] Support podman compose file (#1335) --- pkg/app/app.go | 27 ++++++++++++++++----------- 1 file changed, 16 insertions(+), 11 deletions(-) diff --git a/pkg/app/app.go b/pkg/app/app.go index 042c38e0..84a726db 100644 --- a/pkg/app/app.go +++ b/pkg/app/app.go @@ -31,9 +31,14 @@ import ( "github.com/kubernetes/kompose/pkg/transformer/openshift" ) -const ( - // DefaultComposeFile name of the file that kompose will use if no file is explicitly set - DefaultComposeFile = "docker-compose.yml" +var ( + // DefaultComposeFiles is a list of filenames that kompose will use if no file is explicitly set + DefaultComposeFiles = []string{ + "docker-compose.yml", + "docker-compose.yaml", + "container-compose.yml", + "container-compose.yaml", + } ) const ( @@ -149,17 +154,17 @@ func ValidateFlags(bundle string, args []string, cmd *cobra.Command, opt *kobjec // ValidateComposeFile validates the compose file provided for conversion func ValidateComposeFile(opt *kobject.ConvertOptions) { if len(opt.InputFiles) == 0 { - // Here docker-compose is the input - opt.InputFiles = []string{DefaultComposeFile} - _, err := os.Stat(DefaultComposeFile) - if err != nil { - log.Debugf("'%s' not found: %v", DefaultComposeFile, err) - opt.InputFiles = []string{"docker-compose.yaml"} - _, err = os.Stat("docker-compose.yaml") + for _, name := range DefaultComposeFiles { + _, err := os.Stat(name) if err != nil { - log.Fatalf("No 'docker-compose' file found: %v", err) + log.Debugf("'%s' not found: %v", name, err) + } else { + opt.InputFiles = []string{name} + return } } + + log.Fatal("No 'docker-compose' file found") } }