deep-stack/kompose
7
0
Fork 0
forked from LaconicNetwork/kompose
Code Pull Requests Activity

Update command to fetch current git remote for buildconfig.

Browse Source
This commit is contained in:
Ratnadeep Debnath 2016-12-02 15:37:50 +05:30
parent a1797a8d07
commit bbbd4037b4
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pkg/transformer/openshift/openshift.go
View File

@ -112,15 +112,19 @@ func getGitCurrentBranch(composeFileDir string) (string, error) {
} }
// getGitRemoteForBranch gets git remote for a branch // getGitRemoteForBranch gets git remote for a branch
func getGitRemoteForBranch(composeFileDir string, branch string) (string, error) { func getGitRemoteForCurrentBranch(composeFileDir string) (string, error) {
cmd := exec.Command("sh", "-c", fmt.Sprintf("git branch -r | grep %s", branch)) cmd := exec.Command("sh", "-c", "git for-each-ref --format='%(upstream:short)' $(git symbolic-ref -q HEAD)")
cmd.Dir = composeFileDir cmd.Dir = composeFileDir
out, err := cmd.Output() out, err := cmd.Output()
if err != nil { if err != nil {
return "", err return "", err
} }
return strings.Split(strings.Trim(string(out), "\n "), "/")[0], nil output := strings.Trim(string(out), "\n ")
if output == "" {
return "", errors.New("Remote missing for current branch.")
}
return strings.Split(output, "/")[0], nil
} }
// getComposeFileDir returns compose file directory // getComposeFileDir returns compose file directory
@ -361,7 +365,7 @@ func (o *OpenShift) Transform(komposeObject kobject.KomposeObject, opt kobject.C
} }
if opt.BuildRepo == "" { if opt.BuildRepo == "" {
var buildRemote string var buildRemote string
buildRemote, err = getGitRemoteForBranch(composeFileDir, buildBranch) buildRemote, err = getGitRemoteForCurrentBranch(composeFileDir)
if err != nil { if err != nil {
logrus.Fatalf("Buildconfig cannot be created because remote for current git branch couldn't be detected.") logrus.Fatalf("Buildconfig cannot be created because remote for current git branch couldn't be detected.")
} }