Merge pull request #368 from procrypt/yaml_and_yml

added support for docker-compose.yaml besides docker-compose.yml
This commit is contained in:
Charlie Drage
2017-01-30 09:21:33 -05:00
committed by GitHub
12 changed files with 810 additions and 4 deletions
+1
View File
@@ -78,6 +78,7 @@ var convertCmd = &cobra.Command{
// Validate before doing anything else. Use "bundle" if passed in.
app.ValidateFlags(GlobalBundle, args, cmd, &ConvertOpt)
app.ValidateComposeFile(cmd, &ConvertOpt)
},
Run: func(cmd *cobra.Command, args []string) {
+3
View File
@@ -44,6 +44,9 @@ var downCmd = &cobra.Command{
Provider: strings.ToLower(GlobalProvider),
EmptyVols: DownEmptyVols,
}
// Validate before doing anything else.
app.ValidateComposeFile(cmd, &DownOpt)
},
Run: func(cmd *cobra.Command, args []string) {
app.Down(DownOpt)
+3
View File
@@ -44,6 +44,9 @@ var upCmd = &cobra.Command{
Provider: strings.ToLower(GlobalProvider),
EmptyVols: UpEmptyVols,
}
// Validate before doing anything else.
app.ValidateComposeFile(cmd, &UpOpt)
},
Run: func(cmd *cobra.Command, args []string) {
app.Up(UpOpt)