Checkout to branch on init, if any provided

cmd/docs.go

@@ -39,6 +39,12 @@ var serviceItems = []CorgiComposeItems{
 		itemType:    "string",
 		description: "Git url to target repo. By default nothing is cloned.",
 	},
+	{
+		item:        "branch",
+		example:     "some/feature/branch",
+		itemType:    "string",
+		description: "Branch to use for git checkout. By default default branch for repo is used.",
+	},
 	{
 		item:        "environment",
 		example:     "- YOUR_ENV=dev\n\t- YOUR__ANTOHER_ENV=abcdef",

cmd/init.go

@@ -4,7 +4,6 @@ import (
 	"errors"
 	"fmt"
 	"os"
-	"os/exec"
 	"strings"
 	"text/template"
 
@@ -141,14 +140,37 @@ func CloneServices(services []utils.Service) {
 				continue
 			}
 
-			cmd := exec.Command("git", "clone", service.CloneFrom)
-			cmd.Dir = pathWithoutLastFolder
-			cmd.Stdout = os.Stdout
-			cmd.Stderr = os.Stderr
-			err = cmd.Run()
+			err = utils.RunServiceCmd(
+				service.ServiceName,
+				fmt.Sprintf("git clone %s", service.CloneFrom),
+				pathWithoutLastFolder,
+			)
 			if err != nil {
 				fmt.Printf(`output error: %s, in path %s with git clone %s
 					`, err, pathWithoutLastFolder, service.CloneFrom)
+				continue
+			}
+			if service.Branch != "" {
+				err = utils.RunServiceCmd(
+					service.ServiceName,
+					fmt.Sprintf("git checkout %s", service.Branch),
+					service.Path,
+				)
+				if err != nil {
+					fmt.Printf(`output error: %s, in path %s with git checkout %s
+					`, err, service.Path, service.Branch)
+					continue
+				}
+				err = utils.RunServiceCmd(
+					service.ServiceName,
+					"git pull",
+					service.Path,
+				)
+				if err != nil {
+					fmt.Printf(`output error: %s, in path %s with git pull %s
+					`, err, service.Path, service.Branch)
+					continue
+				}
 			}
 		}
 	}

resources/readme/corgi_compose_items.md

@@ -9,6 +9,7 @@ Corgi compose `service` can contain the following items (properties):
 | Item        | Example           | itemType  |  Description
 | ------------| :-------------    | -         | --
 | cloneFrom             | `[email protected]:Andriiklymiuk/corgi.git` | `string` | Git url to target repo. By default nothing is cloned.
+| branch                | `some/feature/branch` | `string` | Branch to use for git checkout. By default default branch for repo is used.
 | environment           | - YOUR_ENV=dev<br>- YOUR__ANTOHER_ENV=abcdef  | `[]string` | List of environment variables to copy and put into your env file.<br>By default no environments are added.
 | envPath               | ./path/to/.env | `string` | Path to .env file in target repo. By default .env file is used
 | ignoreEnv             | false | `string` | Should service ignore env and don't change env file or not. By default is false (env is not ignored)

utils/config.go

@@ -56,6 +56,7 @@ type Service struct {
 	IgnoreEnv           bool               `yaml:"ignore_env"`
 	ManualRun           bool               `yaml:"manualRun"`
 	CloneFrom           string             `yaml:"cloneFrom"`
+	Branch              string             `yaml:"branch"`
 	Environment         []string           `yaml:"environment"`
 	EnvPath             string             `yaml:"envPath"`
 	CopyEnvFromFilePath string             `yaml:"copyEnvFromFilePath"`
@@ -176,6 +177,7 @@ func GetCorgiServices(cobra *cobra.Command) (*CorgiCompose, error) {
 				IgnoreEnv:           service.IgnoreEnv,
 				ManualRun:           service.ManualRun,
 				CloneFrom:           service.CloneFrom,
+				Branch:              service.Branch,
 				DependsOnServices:   service.DependsOnServices,
 				DependsOnDb:         service.DependsOnDb,
 				Environment:         service.Environment,