Fixed kompose build failure

While `local` build, kompose was not recognizing `dockerfile` key
Hence it was breaking the build as mentioned in issue #832.
This PR will fix the issue.
This commit is contained in:
Suraj Narwade 2017-09-28 14:01:52 +05:30
parent 8a5692b070
commit 286fbd1203
3 changed files with 11 additions and 2 deletions

View File

@ -233,7 +233,7 @@ func BuildDockerImage(service kobject.ServiceConfig, name string, relativePath s
// Use the build struct function to build the image
// Build the image!
build := docker.Build{Client: *client}
err = build.BuildImage(imagePath, imageName)
err = build.BuildImage(imagePath, imageName, service.Dockerfile)
if err != nil {
return err

View File

@ -38,7 +38,7 @@ BuildImage builds a Docker image via the Docker API. Takes the source directory
and image name and then builds the appropriate image. Tarball is utilized
in order to make building easier.
*/
func (c *Build) BuildImage(source string, image string) error {
func (c *Build) BuildImage(source string, image string, dockerfile string) error {
log.Infof("Building image '%s' from directory '%s'", image, path.Base(source))
@ -67,6 +67,7 @@ func (c *Build) BuildImage(source string, image string) error {
Name: image,
InputStream: tarballSource,
OutputStream: outputBuffer,
Dockerfile: dockerfile,
}
// Build it!

View File

@ -0,0 +1,8 @@
version: "2"
services:
foo:
build:
context: .
dockerfile: build/Dockerfile
image: docker.io/cdrage/foobar