From f3eec4798641413b89a6426687e5d35d48fe97cf Mon Sep 17 00:00:00 2001
From: nosamad <nosamad@users.noreply.github.com>
Date: Mon, 15 Apr 2019 22:06:03 +0200
Subject: [PATCH] fixes docker error: unable to prepare context

copies dockerfile to build context, in order to remove dependency to
unsupported/new docker feature
---
 Makefile                 | 5 +++--
 build/mkdocker/docker.mk | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/Makefile b/Makefile
index b9b420f..b0982c5 100644
--- a/Makefile
+++ b/Makefile
@@ -99,8 +99,6 @@ DEBIAN_TARGETS = $(addprefix $(OUTDIR)/docker/,$(call filter_targets,$(DEBIAN_FI
 #######################################################################################################################
 # Common rule target configuration
 
-VPATH = $(PROJECTDIR)/build
-
 CURLFLAGS += -s
 
 DOCKER_RUNFLAGS += --device /dev/fuse
@@ -145,6 +143,9 @@ $(DEBIAN_TARGETS): CODENAME := $(DEBIAN_CODENAME)
 $(FETCH_TARGETS): | $(FETCHDIR)
 	$(SILENT)$(call curl,$@,$(URL),$(MD5))
 
+$(OUTDIR)/docker/%.dockerfile : $(PROJECTDIR)/build/%.dockerfile | $(OUTDIRS)
+	cp $< $@
+
 $(OUTDIR)/docker/qemu-arm-static-$(QEMU_VERSION) : $(FETCHDIR)/qemu-arm-static-$(QEMU_VERSION) | $(OUTDIRS)
 	$(SILENT) \
 	     $(call echo_if_silent,cp $< $@) \
diff --git a/build/mkdocker/docker.mk b/build/mkdocker/docker.mk
index bf5546a..f686ac9 100644
--- a/build/mkdocker/docker.mk
+++ b/build/mkdocker/docker.mk
@@ -30,7 +30,7 @@ image_run = $(DOCKER) run --rm --interactive $(DOCKER_RUNFLAGS) \
   $2
 
 image_rule = \
-  $$(OUTDIR)/docker/$1: $1.dockerfile $$(EXTRACT_TARGETS) $$(MAKEFILE_LIST); \
+  $$(OUTDIR)/docker/$1: $$(OUTDIR)/docker/$1.dockerfile $$(EXTRACT_TARGETS) $$(MAKEFILE_LIST); \
     $$(SILENT)$$(call image,$1)
 image = \
      $(call echo_if_silent,TARGET=$1 docker build --file $< --tag $(call image_name,$1) $(OUTDIR)) \