From 8a2a2b7eff951f39eaf1d71e0c40d529e61e75bd Mon Sep 17 00:00:00 2001
From: Cole Mickens <cole.mickens@gmail.com>
Date: Wed, 25 Feb 2015 17:14:52 -0800
Subject: [PATCH] Support multiple Dockerfiles with custom-docker-builder

---
 images/builder/docker/custom-docker-builder/build.sh | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/images/builder/docker/custom-docker-builder/build.sh b/images/builder/docker/custom-docker-builder/build.sh
index 69a177d0cc3e..a6d30a8653a2 100755
--- a/images/builder/docker/custom-docker-builder/build.sh
+++ b/images/builder/docker/custom-docker-builder/build.sh
@@ -25,6 +25,8 @@ if [[ "${SOURCE_REPOSITORY}" != "git://"* ]] && [[ "${SOURCE_REPOSITORY}" != "gi
   fi
 fi
 
+[ -n "${DOCKERFILE_PATH}" ] && DOCKERFILE_PATH=Dockerfile
+
 if [ -n "${SOURCE_REF}" ]; then
   BUILD_DIR=$(mktemp --directory --suffix=docker-build)
   git clone --recursive "${SOURCE_REPOSITORY}" "${BUILD_DIR}"
@@ -41,9 +43,9 @@ if [ -n "${SOURCE_REF}" ]; then
     fi
   fi
   popd
-  docker build --rm -t "${TAG}" "${BUILD_DIR}"
+  docker build --rm -f "${DOCKERFILE_PATH}" -t "${TAG}" "${BUILD_DIR}"
 else
-  docker build --rm -t "${TAG}" "${SOURCE_REPOSITORY}"
+  docker build --rm -f "${DOCKERFILE_PATH}" -t "${TAG}" "${SOURCE_REPOSITORY}"
 fi
 
 if [ -n "${OUTPUT_IMAGE}" ] || [ -s "/root/.dockercfg" ]; then