diff --git a/docker-image-build-task.sh b/docker-image-build-task.sh
index 0f6e0f729cc..96149cc0056 100755
--- a/docker-image-build-task.sh
+++ b/docker-image-build-task.sh
@@ -1,8 +1,8 @@
 #!/bin/sh
 
-image=$1
+image="$1"
 
 apt-get update
 apt-get install -y --no-install-recommends docker.io
 docker version
-docker build -t "$image" "./docker/$image/"
+./docker/build.sh "$image"
diff --git a/docker/build.sh b/docker/build.sh
new file mode 100644
index 00000000000..032a836d18e
--- /dev/null
+++ b/docker/build.sh
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+image="$1"
+cd $(dirname $0)
+docker build . -f "$image/Dockerfile" -t "$image"