Archives/falk-werner_webfuse
1
0
Fork 0
mirror of https://github.com/falk-werner/webfuse synced 2024-10-27 20:34:10 +00:00
Code Issues Releases Wiki Activity

renames container macros

Browse Source
This commit is contained in:
nosamad 2019-04-01 00:25:40 +02:00 committed by Falk Werner
parent a86d45e450
commit c7ab6bb1b1
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
Makefile
View File

@ -148,22 +148,22 @@ echo_if_silent = VERBOSE=1
$(VERBOSE)echo_if_silent = echo $1 $(VERBOSE)echo_if_silent = echo $1
$(VERBOSE)SILENT := @ $(VERBOSE)SILENT := @
$(HOST_CONTAINER)container_run_volumes += '$(realpath $(PROJECT_ROOT)):$(CONTAINER_PROJECT_ROOT):cached' $(HOST_CONTAINER)image_run_volumes += '$(realpath $(PROJECT_ROOT)):$(CONTAINER_PROJECT_ROOT):cached'
$(HOST_CONTAINER)container_run_volumes += '$(realpath $(OUT)/$1):$(CONTAINER_OUT)/$1:delegated' $(HOST_CONTAINER)image_run_volumes += '$(realpath $(OUT)/$1):$(CONTAINER_OUT)/$1:delegated'
container_name = $(REGISTRY_PREFIX)$(subst -,/,$1)/$(PROJECT_NAME):$(VERSION) image_name = $(REGISTRY_PREFIX)$(subst -,/,$1)/$(PROJECT_NAME):$(VERSION)
container_run = $(DOCKER) run $(DOCKER_RUNFLAGS) $3 \ image_run = $(DOCKER) run $(DOCKER_RUNFLAGS) $3 \
$(addprefix --volume ,$(call container_run_volumes,$1)) \ $(addprefix --volume ,$(call image_run_volumes,$1)) \
--workdir '$(CONTAINER_OUT)/$1/$(BUILDTYPE)' \ --workdir '$(CONTAINER_OUT)/$1/$(BUILDTYPE)' \
$(call container_name,$1) \ $(call image_name,$1) \
$2 $2
image_rule = \ image_rule = \
$$(OUT)/docker/$1: $$(OUT)/docker/$1.dockerfile $$(EXTRACT_TARGETS) $$(PROJECT_ROOT)/Makefile; \ $$(OUT)/docker/$1: $$(OUT)/docker/$1.dockerfile $$(EXTRACT_TARGETS) $$(PROJECT_ROOT)/Makefile; \
$$(SILENT)$$(call image,$1) $$(SILENT)$$(call image,$1)
image = \ image = \
$(call echo_if_silent,TARGET=$1 docker build $(call container_name,$1) $(OUT)) \ $(call echo_if_silent,TARGET=$1 docker build $(call image_name,$1) $(OUT)) \
&& $(DOCKER) build $(DOCKER_BUILDFLAGS) --iidfile $@ --file $< --tag $(call container_name,$1) $(OUT) && $(DOCKER) build $(DOCKER_BUILDFLAGS) --iidfile $@ --file $< --tag $(call image_name,$1) $(OUT)
configure_rule = \ configure_rule = \
$$(OUT)/$1/$$(BUILDTYPE)/CMakeCache.txt: $$(PROJECT_ROOT)/CMakeLists.txt $$(OUT)/docker/$1; \ $$(OUT)/$1/$$(BUILDTYPE)/CMakeCache.txt: $$(PROJECT_ROOT)/CMakeLists.txt $$(OUT)/docker/$1; \
@ -188,7 +188,7 @@ memcheck = $(call run,$1,ctest -T memcheck $(CTESTFLAGS))
run_rule = \ run_rule = \
run-$1: $$(OUT)/docker/$1; \ run-$1: $$(OUT)/docker/$1; \
$$(SILENT)$$(call run,$1,bash,--tty) || true $$(SILENT)$$(call run,$1,bash,--tty) || true
run = $(call echo_if_silent,TARGET=$1 BUILDTYPE=$(BUILDTYPE) $2) && $(call container_run,$1,$2,$3) run = $(call echo_if_silent,TARGET=$1 BUILDTYPE=$(BUILDTYPE) $2) && $(call image_run,$1,$2,$3)
clean_rule = \ clean_rule = \
clean-$1: ; \ clean-$1: ; \