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

In Openshift, don't create imagestream tags for a service with build diretive.

Browse Source
This commit is contained in:
Ratnadeep Debnath 2016-10-29 15:34:21 +05:30
parent 6156d144f2
commit 9e2849addf
1 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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