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

Fixed typos in openshift buildconfig

Browse Source 
- spelling mistake
- pass compose file dir instead of compose file to initBuildConfig call
- Use as default value for cli --build-branch option
- Pass current build branch to buildconfig related functions instead of opt.BuildBranch
- Fix printing buildconfig source branch in logs.
This commit is contained in:
Ratnadeep Debnath 2016-12-27 20:07:03 +05:30
parent 4d3347d300
commit 7c959b65d4
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmd/convert.go
View File

@ -88,7 +88,7 @@ func init() {
convertCmd.Flags().MarkHidden("deployment-config") convertCmd.Flags().MarkHidden("deployment-config")
convertCmd.Flags().StringVar(&ConvertBuildRepo, "build-repo", "", "Specify source repository for buildconfig (default remote origin)") convertCmd.Flags().StringVar(&ConvertBuildRepo, "build-repo", "", "Specify source repository for buildconfig (default remote origin)")
convertCmd.Flags().MarkHidden("build-repo") convertCmd.Flags().MarkHidden("build-repo")
convertCmd.Flags().StringVar(&ConvertBuildBranch, "build-branch", "master", "Specify repository branch to use for buildconfig (default master)") convertCmd.Flags().StringVar(&ConvertBuildBranch, "build-branch", "", "Specify repository branch to use for buildconfig (default master)")
convertCmd.Flags().MarkHidden("build-branch") convertCmd.Flags().MarkHidden("build-branch")
// Standard between the two // Standard between the two

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

@ -170,7 +170,7 @@ func (o *OpenShift) initImageStream(name string, service kobject.ServiceConfig)
func initBuildConfig(name string, service kobject.ServiceConfig, composeFileDir string, repo string, branch string) *buildapi.BuildConfig { func initBuildConfig(name string, service kobject.ServiceConfig, composeFileDir string, repo string, branch string) *buildapi.BuildConfig {
contextDir, err := getAbsBuildContext(service.Build, composeFileDir) contextDir, err := getAbsBuildContext(service.Build, composeFileDir)
if err != nil { if err != nil {
logrus.Fatalf("[%s] Buildconfig cannote be created due to error in creating build context.", name) logrus.Fatalf("[%s] Buildconfig cannot be created due to error in creating build context.", name)
} }
bc := &buildapi.BuildConfig{ bc := &buildapi.BuildConfig{
@ -356,7 +356,7 @@ func (o *OpenShift) Transform(komposeObject kobject.KomposeObject, opt kobject.C
} }
hasBuild = true hasBuild = true
} }
objects = append(objects, initBuildConfig(name, service, opt.InputFile, buildRepo, opt.BuildBranch)) // Openshift BuildConfigs objects = append(objects, initBuildConfig(name, service, composeFileDir, buildRepo, buildBranch)) // Openshift BuildConfigs
} }
// If ports not provided in configuration we will not make service // If ports not provided in configuration we will not make service
@ -375,7 +375,7 @@ func (o *OpenShift) Transform(komposeObject kobject.KomposeObject, opt kobject.C
} }
if hasBuild { if hasBuild {
logrus.Infof("Buildconfig using %s::%s as source.", buildRepo, opt.BuildBranch) logrus.Infof("Buildconfig using %s::%s as source.", buildRepo, buildBranch)
} }
// If docker-compose has a volumes_from directive it will be handled here // If docker-compose has a volumes_from directive it will be handled here
o.VolumesFrom(&allobjects, komposeObject) o.VolumesFrom(&allobjects, komposeObject)