diff --git a/pkg/transformer/openshift/openshift.go b/pkg/transformer/openshift/openshift.go index 47b3000a..10ff71ee 100644 --- a/pkg/transformer/openshift/openshift.go +++ b/pkg/transformer/openshift/openshift.go @@ -108,7 +108,6 @@ func getAbsBuildContext(context string, inputFile string) string { if err != nil { return "" } - prefix := strings.Trim(string(out), "\n") return filepath.Join(prefix, context) } @@ -117,6 +116,20 @@ func getAbsBuildContext(context string, inputFile string) string { func (o *OpenShift) initImageStream(name string, service kobject.ServiceConfig) *imageapi.ImageStream { tag := getImageTag(service.Image) + var tags map[string]imageapi.TagReference + if service.Build != "" { + tags = map[string]imageapi.TagReference{} + } else { + tags = map[string]imageapi.TagReference{ + tag: imageapi.TagReference{ + From: &api.ObjectReference{ + Kind: "DockerImage", + Name: service.Image, + }, + }, + } + } + is := &imageapi.ImageStream{ TypeMeta: unversioned.TypeMeta{ Kind: "ImageStream", @@ -126,14 +139,7 @@ func (o *OpenShift) initImageStream(name string, service kobject.ServiceConfig) Name: name, }, Spec: imageapi.ImageStreamSpec{ - Tags: map[string]imageapi.TagReference{ - tag: imageapi.TagReference{ - From: &api.ObjectReference{ - Kind: "DockerImage", - Name: service.Image, - }, - }, - }, + Tags: tags, }, } return is