Merge pull request #1147 from hangyan/push-image-flag

Add flag to turn off push image when kompose up
This commit is contained in:
Kubernetes Prow Robot
2019-10-31 06:31:37 -07:00
committed by GitHub
4 changed files with 17 additions and 8 deletions
+7 -5
View File
@@ -846,7 +846,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)
@@ -861,11 +861,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