fix Dockerfile not relative to build path

Author: foosinn

main.go

@@ -220,13 +220,14 @@ func handleMatrix(name string, builds chan *build) {
 		if tag == "" {
 			tag = "latest"
 		}
+		dockerfile := filepath.Join(path, "Dockerfile")
 		matrixWg.Add(1)
 		b := build{
 			ID:              id,
 			Namespace:       c.DefaultNamespace,
 			Name:            name,
 			Path:            path,
-			Dockerfile:      "Dockerfile",
+			Dockerfile:      dockerfile,
 			Tag:             tag,
 			Scenario:        make(map[string]string),
 			AdditionalNames: []string{},
@@ -251,6 +252,14 @@ func handleMatrix(name string, builds chan *build) {
 		path = m.CustomPath
 	}
 
+	// add directory to dockerfiles
+	if m.CustomDockerfile == "" {
+		m.CustomDockerfile = "Dockerfile"
+	}
+	if !strings.Contains(path, "://") {
+		m.CustomDockerfile = filepath.Join(path, m.CustomDockerfile)
+	}
+
 	// multiply options
 	keyOrder := []string{}
 	scenariosMatrix := []map[string]string{map[string]string{}}
@@ -416,11 +425,11 @@ func (b *build) tags() (combined []string) {
 
 // build command argument
 func (b *build) args() []string {
-	if b.Dockerfile == "" {
-		b.Dockerfile = "Dockerfile"
+	log.Warnf("%s Building       %s from %s dockerfile:%s", b.ID, b.prettyName(), b.Path, b.Dockerfile)
+	args := []string{"build", b.Path}
+	if b.Dockerfile != "" {
+		args = append(args, "-f", b.Dockerfile)
 	}
-	log.Warnf("%s Building       %s from %s/%s", b.ID, b.prettyName(), b.Path, b.Dockerfile)
-	args := []string{"build", b.Path, "-f", b.Dockerfile}
 	for _, k := range b.KeyOrder {
 		if b.Scenario[k] == "" {
 			log.Infof("skipping empty build arg %s", k)

main_test.go

@@ -40,18 +40,18 @@ func TestBuild(t *testing.T) {
 	})
 
 	want := `
-build alpine -f Dockerfile --build-arg MESSAGE=multiply -t localhost:5000/images/alpine:multiply -t localhost:5000/images/alpine:multiply-7
-build alpine -f Dockerfile -t localhost:5000/images/alpine:latest -t localhost:5000/images/alpine:7
-build busybox -f Dockerfile -t localhost:5000/images/busybox:latest -t localhost:5000/images/busybox:7
+build alpine -f alpine/Dockerfile --build-arg MESSAGE=multiply -t localhost:5000/images/alpine:multiply -t localhost:5000/images/alpine:multiply-7
+build alpine -f alpine/Dockerfile -t localhost:5000/images/alpine:latest -t localhost:5000/images/alpine:7
+build busybox -f busybox/Dockerfile -t localhost:5000/images/busybox:latest -t localhost:5000/images/busybox:7
 build https://github.com/openshift/origin-aggregated-logging.git#release-3.11:fluentd -f Dockerfile.centos7 -t localhost:5000/images/remote:latest -t localhost:5000/images/remote:7
-build php -f Dockerfile --build-arg VERSION=7.2 --build-arg OS=alpine --build-arg NAME=test -t docker.io/bitsbeats/image1:7.2-alpine-test -t docker.io/bitsbeats/image1:7.2-alpine-test-7 -t docker.io/bitsbeats/image2:7.2-alpine-test -t docker.io/bitsbeats/image2:7.2-alpine-test-7 -t localhost:5000/images/php:7.2-alpine-test -t localhost:5000/images/php:7.2-alpine-test-7
-build php -f Dockerfile --build-arg VERSION=7.2 --build-arg OS=debian --build-arg NAME=test -t docker.io/bitsbeats/image1:7.2-debian-test -t docker.io/bitsbeats/image1:7.2-debian-test-7 -t docker.io/bitsbeats/image2:7.2-debian-test -t docker.io/bitsbeats/image2:7.2-debian-test-7 -t localhost:5000/images/php:7.2-debian-test -t localhost:5000/images/php:7.2-debian-test-7
-build php -f Dockerfile --build-arg VERSION=7.3 --build-arg OS=alpine --build-arg NAME=test -t docker.io/bitsbeats/image1:7.3-alpine-test -t docker.io/bitsbeats/image1:7.3-alpine-test-7 -t docker.io/bitsbeats/image2:7.3-alpine-test -t docker.io/bitsbeats/image2:7.3-alpine-test-7 -t localhost:5000/images/php:7.3-alpine-test -t localhost:5000/images/php:7.3-alpine-test-7
-build php -f Dockerfile --build-arg VERSION=7.3 --build-arg OS=debian --build-arg NAME=test -t docker.io/bitsbeats/image1:7.3-debian-test -t docker.io/bitsbeats/image1:7.3-debian-test-7 -t docker.io/bitsbeats/image2:7.3-debian-test -t docker.io/bitsbeats/image2:7.3-debian-test-7 -t localhost:5000/images/php:7.3-debian-test -t localhost:5000/images/php:7.3-debian-test-7
-build python -f Dockerfile --build-arg VERSION=2.7 --build-arg OS=alpine -t localhost:5000/images/python:2.7-alpine -t localhost:5000/images/python:2.7-alpine-7
-build python -f Dockerfile --build-arg VERSION=2.7 --build-arg OS=stretch -t localhost:5000/images/python:2.7-stretch -t localhost:5000/images/python:2.7-stretch-7
-build python -f Dockerfile --build-arg VERSION=3.6 --build-arg OS=alpine -t localhost:5000/images/python:latest -t localhost:5000/images/python:3.6-alpine -t localhost:5000/images/python:3.6-alpine-7
-build python -f Dockerfile --build-arg VERSION=3.6 --build-arg OS=stretch -t localhost:5000/images/python:3.6-stretch -t localhost:5000/images/python:3.6-stretch-7
+build php -f php/Dockerfile --build-arg VERSION=7.2 --build-arg OS=alpine --build-arg NAME=test -t docker.io/bitsbeats/image1:7.2-alpine-test -t docker.io/bitsbeats/image1:7.2-alpine-test-7 -t docker.io/bitsbeats/image2:7.2-alpine-test -t docker.io/bitsbeats/image2:7.2-alpine-test-7 -t localhost:5000/images/php:7.2-alpine-test -t localhost:5000/images/php:7.2-alpine-test-7
+build php -f php/Dockerfile --build-arg VERSION=7.2 --build-arg OS=debian --build-arg NAME=test -t docker.io/bitsbeats/image1:7.2-debian-test -t docker.io/bitsbeats/image1:7.2-debian-test-7 -t docker.io/bitsbeats/image2:7.2-debian-test -t docker.io/bitsbeats/image2:7.2-debian-test-7 -t localhost:5000/images/php:7.2-debian-test -t localhost:5000/images/php:7.2-debian-test-7
+build php -f php/Dockerfile --build-arg VERSION=7.3 --build-arg OS=alpine --build-arg NAME=test -t docker.io/bitsbeats/image1:7.3-alpine-test -t docker.io/bitsbeats/image1:7.3-alpine-test-7 -t docker.io/bitsbeats/image2:7.3-alpine-test -t docker.io/bitsbeats/image2:7.3-alpine-test-7 -t localhost:5000/images/php:7.3-alpine-test -t localhost:5000/images/php:7.3-alpine-test-7
+build php -f php/Dockerfile --build-arg VERSION=7.3 --build-arg OS=debian --build-arg NAME=test -t docker.io/bitsbeats/image1:7.3-debian-test -t docker.io/bitsbeats/image1:7.3-debian-test-7 -t docker.io/bitsbeats/image2:7.3-debian-test -t docker.io/bitsbeats/image2:7.3-debian-test-7 -t localhost:5000/images/php:7.3-debian-test -t localhost:5000/images/php:7.3-debian-test-7
+build python -f python/Dockerfile --build-arg VERSION=2.7 --build-arg OS=alpine -t localhost:5000/images/python:2.7-alpine -t localhost:5000/images/python:2.7-alpine-7
+build python -f python/Dockerfile --build-arg VERSION=2.7 --build-arg OS=stretch -t localhost:5000/images/python:2.7-stretch -t localhost:5000/images/python:2.7-stretch-7
+build python -f python/Dockerfile --build-arg VERSION=3.6 --build-arg OS=alpine -t localhost:5000/images/python:latest -t localhost:5000/images/python:3.6-alpine -t localhost:5000/images/python:3.6-alpine-7
+build python -f python/Dockerfile --build-arg VERSION=3.6 --build-arg OS=stretch -t localhost:5000/images/python:3.6-stretch -t localhost:5000/images/python:3.6-stretch-7
 push docker.io/bitsbeats/image1:7.2-alpine-test
 push docker.io/bitsbeats/image1:7.2-alpine-test-7
 push docker.io/bitsbeats/image1:7.2-debian-test

testdata/python/docker-matrix.yml

@@ -2,9 +2,10 @@ multiply:
   VERSION:
     - 2.7
     - 3.6
-  
+
   OS:
     - alpine
     - stretch
 
 as_latest: 3.6-alpine
+custom_dockerfile: Dockerfile