code reformat, init fixes

This commit is contained in:
2021-11-28 01:04:20 +01:00
parent da41b5820b
commit 1071695e87
37 changed files with 559 additions and 162 deletions

View File

@ -34,4 +34,3 @@ var CmdDocker = cli.Command{
func runDockerDefault(ctx *cli.Context) error {
return docker.RunComposePs(ctx)
}

View File

@ -19,5 +19,3 @@ func RunComposeBuild(cmd *cli.Context) error {
compose.ExecComposerBuild(ctx)
return nil
}

View File

@ -18,4 +18,3 @@ func RunComposeDebug(cmd *cli.Context) error {
compose.ExecComposerDebug(ctx)
return nil
}

View File

@ -18,4 +18,3 @@ func RunComposeDown(cmd *cli.Context) error {
compose.ExecComposerDown(ctx)
return nil
}

View File

@ -8,7 +8,7 @@ import (
var CmdComposeLogs = cli.Command{
Name: "logs",
Aliases: []string{"l"},
Aliases: []string{"l"},
Usage: "logs from containers",
Description: `Get fqn docker image defined as main service in config file`,
Action: RunComposeLogs,
@ -19,4 +19,3 @@ func RunComposeLogs(cmd *cli.Context) error {
compose.ExecComposerLogs(ctx, cmd.Args())
return nil
}

View File

@ -18,4 +18,3 @@ func RunComposePull(cmd *cli.Context) error {
compose.ExecComposerPull(ctx)
return nil
}

View File

@ -18,4 +18,3 @@ func RunComposeRestart(cmd *cli.Context) error {
compose.ExecComposerRestart(ctx)
return nil
}

View File

@ -23,4 +23,3 @@ func RunComposeRun(cmd *cli.Context) error {
}
return nil
}

View File

@ -19,4 +19,3 @@ func RunComposeShell(cmd *cli.Context) error {
compose.ExecComposerShell(ctx)
return nil
}

View File

@ -18,5 +18,3 @@ func RunComposeStop(cmd *cli.Context) error {
compose.ExecComposerStop(ctx)
return nil
}

View File

@ -20,4 +20,3 @@ func RunComposeUp(cmd *cli.Context) error {
compose.ExecComposerLogs(ctx, cmd.Args())
return nil
}

View File

@ -18,4 +18,3 @@ func RunComposeUpOnce(cmd *cli.Context) error {
compose.ExecComposerUpOnce(ctx)
return nil
}

View File

@ -1,10 +1,12 @@
package cmd
import (
"fmt"
"github.com/urfave/cli/v2"
"html/template"
"ledo/app/helper"
"ledo/app/modules/compose"
"ledo/app/modules/context"
"ledo/app/modules/dockerfile"
"ledo/app/modules/interact"
"ledo/app/templates"
"log"
@ -21,20 +23,88 @@ var CmdInit = cli.Command{
}
func runInitLedo(cmd *cli.Context) error {
config, _ := context.LoadConfigFile()
var advRun bool
config, err := context.LoadConfigFile()
if err != nil {
return err
}
data, err := interact.InitLedoProject(config.Docker)
if err != nil {
return err
}
tpl, err := template.New("tpl").Parse(templates.LedoConfigurationFileTemplate)
if err != nil {
return err
}
if err != nil {
log.Fatalln(err)
}
err = tpl.Execute(os.Stdout, data)
f, err := os.Create("./.ledo.yml")
if err != nil {
panic(err)
return err
}
advRun := interact.InitAdvancedConfigurationAsk()
fmt.Printf("%v", advRun)
err = tpl.Execute(f, data)
if err != nil {
return err
}
advRun = false
// advRun := interact.InitAdvancedConfigurationAsk("Run advanced docker mode configuration?")
if advRun == true {
ctx := context.InitCommand(cmd)
dConf, _ := interact.InitDocker()
err = dockerfile.CreateDockerFile(dConf)
if err != nil {
return err
}
projectComposeConfig := helper.DockerProjectCfg{}
projectComposeConfig.DockerBaseImage = dConf.DockerBaseImage
var dockerComposeServices []helper.DockerProjectAdditionalServiceCfg
var dockerComposeModeConfig []helper.DockerComposeModeCfg
for _, composeMode := range interact.PredefinedDockerComposeModes {
var configMode bool
if composeMode == "base" {
configMode = true
} else {
configMode = interact.InitAdvancedConfigurationAsk("Configure "+composeMode+" stack?")
}
if configMode == true {
for {
serviceCfg, _ := interact.CreateDockerService()
serviceCfg.DockerServiceMode = composeMode
dockerComposeServices = append(dockerComposeServices, serviceCfg)
addAnother := interact.InitAdvancedConfigurationAsk("Add another service do " + composeMode + " stack?")
if addAnother == false {
break
}
}
composeFilename := "./docker/docker-compose.yml"
if composeMode != "base" {
composeFilename = "./docker/docker-compose."+composeMode+".yml"
}
mdCfg := helper.DockerComposeModeCfg{
DockerComposeName: composeFilename,
DockerComposeServices: dockerComposeServices,
}
dockerComposeModeConfig = append(dockerComposeModeConfig, mdCfg)
}
}
projectComposeConfig.DockerComposeModes = dockerComposeModeConfig
err = compose.CreateComposeFile(ctx, projectComposeConfig, "base")
if err != nil {
return err
}
}
return err
}

View File

@ -21,4 +21,3 @@ var CmdMode = cli.Command{
func runModeDefault(cmd *cli.Context) error {
return mode.RunSelectMode(cmd)
}

View File

@ -17,6 +17,3 @@ func RunModeList(cmd *cli.Context) error {
ctx.Mode.PrintListModes()
return nil
}

View File

@ -24,5 +24,3 @@ func RunSelectMode(cmd *cli.Context) error {
interact.SelectMode(ctx, "")
return nil
}