Update imagebuild depdency to support heading ARGs in Dockerfile

Signed-off-by: Vincent Demeester <vdemeest@redhat.com>

Closes: #1128
Approved by: TomSweeneyRedHat

imagebuildah/build.go

@@ -1342,7 +1342,10 @@ func BuildDockerfiles(ctx context.Context, store storage.Store, options BuildOpt
 		return "", nil, errors.Wrapf(err, "error creating build executor")
 	}
 	b := imagebuilder.NewBuilder(options.Args)
-	stages := imagebuilder.NewStages(mainNode, b)
+	stages, err := imagebuilder.NewStages(mainNode, b)
+	if err != nil {
+		return "", nil, errors.Wrap(err, "error reading multiple stages")
+	}
 	return exec.Build(ctx, stages)
 }
 

tests/bud.bats

@@ -1006,3 +1006,15 @@ load helpers
   [ "$status" -ne 0 ]
 }
 
+@test "bud with ARG before FROM default value" {
+  target=leading-args-default
+  run buildah bud --signature-policy ${TESTSDIR}/policy.json -t ${target} -f ${TESTSDIR}/bud/leading-args/Dockerfile ${TESTSDIR}/bud/leading-args
+  [ "$status" -eq 0 ]
+}
+
+@test "bud with ARG before FROM" {
+  target=leading-args
+  run buildah bud --signature-policy ${TESTSDIR}/policy.json -t ${target} --build-arg=VERSION=musl -f ${TESTSDIR}/bud/leading-args/Dockerfile ${TESTSDIR}/bud/leading-args
+  [ "$status" -eq 0 ]
+}
+

tests/bud/leading-args/Dockerfile

@@ -0,0 +1,5 @@
+ARG VERSION=latest
+ARG FOO=bar
+FROM busybox:$VERSION
+ENV FOO $FOO
+RUN echo $FOO $VERSION