Add flag to turn off push image when kompose up

This commit is contained in:
Hang Yan
2019-06-25 13:38:00 +08:00
parent cd7c8a3d9a
commit 302e918093
4 changed files with 17 additions and 8 deletions
+1
View File
@@ -41,6 +41,7 @@ type ConvertOptions struct {
BuildRepo string
BuildBranch string
Build string
PushImage bool
CreateChart bool
GenerateYaml bool
GenerateJSON bool
+7 -5
View File
@@ -842,7 +842,7 @@ func (k *Kubernetes) Transform(komposeObject kobject.KomposeObject, opt kobject.
return nil, fmt.Errorf("image key required within build parameters in order to build and push service '%s'", name)
}
log.Infof("Build key detected. Attempting to build and push image '%s'", service.Image)
log.Infof("Build key detected. Attempting to build image '%s'", service.Image)
// Get the directory where the compose file is
composeFileDir, err := transformer.GetComposeFileDir(opt.InputFiles)
@@ -857,11 +857,13 @@ func (k *Kubernetes) Transform(komposeObject kobject.KomposeObject, opt kobject.
}
// Push the built image to the repo!
err = transformer.PushDockerImage(service, name)
if err != nil {
return nil, errors.Wrapf(err, "Unable to push Docker image for service %v", name)
if opt.PushImage {
log.Infof("Push image enabled. Attempting to push image '%s'", service.Image)
err = transformer.PushDockerImage(service, name)
if err != nil {
return nil, errors.Wrapf(err, "Unable to push Docker image for service %v", name)
}
}
}
// If there's no "image" key, use the name of the container that's built
+5 -3
View File
@@ -316,9 +316,11 @@ func (o *OpenShift) Transform(komposeObject kobject.KomposeObject, opt kobject.C
}
// Push the built container to the repo!
err = transformer.PushDockerImage(service, name)
if err != nil {
log.Fatalf("Unable to push Docker image for service %v: %v", name, err)
if opt.PushImage {
err = transformer.PushDockerImage(service, name)
if err != nil {
log.Fatalf("Unable to push Docker image for service %v: %v", name, err)
}
}
}