diff --git a/cmd/build.go b/cmd/build.go index 2d2c4f53e6b4fa0e1c505d534d0895ef82c0d55c..4a46fb3ce94566aa9dbef165b6ebbad17ebb1a15 100644 --- a/cmd/build.go +++ b/cmd/build.go @@ -132,6 +132,8 @@ func build(config config.Config) error { color.Blue("Building Application") switch lang := config.Language; lang { + case "none": + return nil case "java": args := []string{"clean", "install", "-Ddependency-check.skip=true"} if !viper.GetBool("build.runTests") { diff --git a/cmd/ci_build.go b/cmd/ci_build.go index 420c49299d34afc314a0fdde9d878fc8018fda41..6a99deb3cc221004f67eb20afefeb62655b88f84 100644 --- a/cmd/ci_build.go +++ b/cmd/ci_build.go @@ -74,6 +74,14 @@ func init() { if err != nil { panic("invalid arg") } + + ciBuildCmd.Flags().Bool("push-only", false, "skip the build step and just push") + viper.SetDefault("push.only", false) + err = viper.BindPFlag("push.only", ciBuildCmd.Flags().Lookup("push-only")) + if err != nil { + panic("invalid arg") + } + } func buildCiDocker(config config.Config) error { @@ -97,10 +105,12 @@ func buildCiDocker(config config.Config) error { fmt.Println(dockerRootDir) } - color.New(color.FgGreen).Printf("Building: %s\n", dockerTag) - err := environment.Run(true, "docker", "build", "-t", dockerTag, "-f", dockerfile, dockerRootDir) - if err != nil { - return err + if !viper.GetBool("push.only") { + color.New(color.FgGreen).Printf("Building: %s\n", dockerTag) + err := environment.Run(true, "docker", "build", "-t", dockerTag, "-f", dockerfile, dockerRootDir) + if err != nil { + return err + } } if viper.GetBool("tag.latest") { @@ -112,7 +122,7 @@ func buildCiDocker(config config.Config) error { } color.New(color.FgGreen).Printf("Pushing Docker image: %s\n", dockerTag) - err = environment.Run(true, "docker", "push", dockerImage) + err := environment.Run(true, "docker", "push", dockerImage) if err != nil { return err } diff --git a/cmd/root.go b/cmd/root.go index 6f8e3fe33f866edfa06be0737a5b7bede4ed57f6..ce851208b5afe473bc661c43996e1b9db62e1234 100644 --- a/cmd/root.go +++ b/cmd/root.go @@ -92,9 +92,9 @@ func initConfig() { // If a config file is found, read it in. if err := viper.ReadInConfig(); err == nil { - fmt.Println("Using config file:", viper.ConfigFileUsed()) + // fmt.Println("Using config file:", viper.ConfigFileUsed()) } else { - color.Red(err.Error()) + // color.Red(err.Error()) } } diff --git a/cmd/start.go b/cmd/start.go index 76565cea07f60b5de00276790a2251a7a859cd83..7787ccec9ff068e3aa0a5823449021300a42d106 100644 --- a/cmd/start.go +++ b/cmd/start.go @@ -79,6 +79,7 @@ func start(memory, cpu string) { return } + environment.RunRequired(true, "helm", "init", "--client-only") environment.RunRequired(true, "helm", "repo", "add", "cm", "https://cm.qa.k8s.psu.edu") color.Blue("Setting up Minikube environment.")