Archives/falk-werner_webfuse
1
0
Fork 0
mirror of https://github.com/falk-werner/webfuse synced 2025-06-13 12:54:15 +00:00
Code Issues Releases Wiki Activity

fixes docker error: unable to prepare context

Browse Source 
copies dockerfile to build context, in order to remove dependency to
unsupported/new docker feature
This commit is contained in:
nosamad 2019-04-15 22:06:03 +02:00
parent ab495bbe74
commit f3eec47986
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Makefile
View File

@ -99,8 +99,6 @@ DEBIAN_TARGETS = $(addprefix $(OUTDIR)/docker/,$(call filter_targets,$(DEBIAN_FI
####################################################################################################################### #######################################################################################################################
# Common rule target configuration # Common rule target configuration
VPATH = $(PROJECTDIR)/build
CURLFLAGS += -s CURLFLAGS += -s
DOCKER_RUNFLAGS += --device /dev/fuse DOCKER_RUNFLAGS += --device /dev/fuse
@ -145,6 +143,9 @@ $(DEBIAN_TARGETS): CODENAME := $(DEBIAN_CODENAME)
$(FETCH_TARGETS): | $(FETCHDIR) $(FETCH_TARGETS): | $(FETCHDIR)
$(SILENT)$(call curl,$@,$(URL),$(MD5)) $(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) $(OUTDIR)/docker/qemu-arm-static-$(QEMU_VERSION) : $(FETCHDIR)/qemu-arm-static-$(QEMU_VERSION) | $(OUTDIRS)
$(SILENT) \ $(SILENT) \
$(call echo_if_silent,cp $< $@) \ $(call echo_if_silent,cp $< $@) \

2
build/mkdocker/docker.mk
View File

@ -30,7 +30,7 @@ image_run = $(DOCKER) run --rm --interactive $(DOCKER_RUNFLAGS) \
$2 $2
image_rule = \ 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) $$(SILENT)$$(call image,$1)
image = \ image = \
$(call echo_if_silent,TARGET=$1 docker build --file $< --tag $(call image_name,$1) $(OUTDIR)) \ $(call echo_if_silent,TARGET=$1 docker build --file $< --tag $(call image_name,$1) $(OUTDIR)) \