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

adds run target to simplify entering container

Browse Source
This commit is contained in:
nosamad 2019-03-23 17:18:33 +01:00
parent 25590695f3
commit 7d1632df25
1 changed files with 16 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
Makefile
View File

@ -7,7 +7,7 @@ export SOURCE_DATE_EPOCH ?= $(shell $(PROJECT_ROOT)/build/get_source_date_epoch.
export BUILDTIME ?= $(shell date -u -d '@$(SOURCE_DATE_EPOCH)' --rfc-3339 ns 2>/dev/null | sed -e 's/ /T/') export BUILDTIME ?= $(shell date -u -d '@$(SOURCE_DATE_EPOCH)' --rfc-3339 ns 2>/dev/null | sed -e 's/ /T/')
VERBOSE ?= VERBOSE ?=
MARCH ?= amd64 MARCH ?=
PROJECT_NAME ?= webfs PROJECT_NAME ?= webfs
PROJECT_ROOT ?= . PROJECT_ROOT ?= .
@ -78,7 +78,6 @@ CMAKEFLAGS += -GNinja
DOCKER_RUNFLAGS += --interactive DOCKER_RUNFLAGS += --interactive
DOCKER_RUNFLAGS += --rm DOCKER_RUNFLAGS += --rm
#DOCKER_RUNFLAGS += --tty
DOCKER_RUNFLAGS += --init DOCKER_RUNFLAGS += --init
DOCKER_RUNFLAGS += --user $(CONTAINER_USER):$(CONTAINER_GROUP) DOCKER_RUNFLAGS += --user $(CONTAINER_USER):$(CONTAINER_GROUP)
DOCKER_RUNFLAGS += --device /dev/fuse --cap-add SYS_ADMIN --security-opt apparmor:unconfined DOCKER_RUNFLAGS += --device /dev/fuse --cap-add SYS_ADMIN --security-opt apparmor:unconfined
@ -117,41 +116,36 @@ $(VERBOSE)echo_if_silent = echo $1
$(VERBOSE)SILENT := @ $(VERBOSE)SILENT := @
image_rule = $$(OUT)/docker/$1: $$(OUT)/docker/$1.dockerfile $$(EXTRACT_TARGETS) $$(PROJECT_ROOT)/Makefile; $$(call image,$1) image_rule = $$(OUT)/docker/$1: $$(OUT)/docker/$1.dockerfile $$(EXTRACT_TARGETS) $$(PROJECT_ROOT)/Makefile; $$(call image,$1)
image = $(SILENT) \ image = $(SILENT) \
$(call echo_if_silent,docker build $(PROJECT_NAME)-$1:$(VERSION) $(OUT)) \ $(call echo_if_silent,docker build $(PROJECT_NAME)-$1:$(VERSION) $(OUT)) \
&& $(DOCKER) build $(DOCKER_BUILDFLAGS) --iidfile $@ --file $< --tag $(PROJECT_NAME)-$1:$(VERSION) $(OUT) && $(DOCKER) build $(DOCKER_BUILDFLAGS) --iidfile $@ --file $< --tag $(PROJECT_NAME)-$1:$(VERSION) $(OUT)
configure_rule = $$(OUT)/$1/CMakeCache.txt: $$(PROJECT_ROOT)/CMakeLists.txt $$(OUT)/docker/$1; $$(call configure,$1) run_rule = run-$1: $$(OUT)/docker/$1; $$(call run,$1,/bin/bash,--tty)
run = $(SILENT) \
configure = $(SILENT) \ $(call echo_if_silent,TARGET=$1 $2) \
$(call echo_if_silent,TARGET=$1 cmake $(CMAKEFLAGS) ..) \ && $(DOCKER) run $(DOCKER_RUNFLAGS) $3 \
&& $(DOCKER) run $(DOCKER_RUNFLAGS) \
--volume '$(realpath $(PROJECT_ROOT)):$(CONTAINER_WORKSPACE)' \ --volume '$(realpath $(PROJECT_ROOT)):$(CONTAINER_WORKSPACE)' \
--volume '$(realpath $(dir $@)):$(CONTAINER_WORKSPACE)/$(notdir $(OUT))' \ --volume '$(realpath $(OUT)/$1):$(CONTAINER_WORKSPACE)/$(notdir $(OUT))' \
--workdir '$(CONTAINER_WORKSPACE)/$(notdir $(OUT))' \ --workdir '$(CONTAINER_WORKSPACE)/$(notdir $(OUT))' \
$(PROJECT_NAME)-$1:$(VERSION) \ $(PROJECT_NAME)-$1:$(VERSION) \
cmake $(CMAKEFLAGS) .. \ $2
&& touch $@
configure_rule = $$(OUT)/$1/CMakeCache.txt: $$(PROJECT_ROOT)/CMakeLists.txt $$(OUT)/docker/$1; $$(call configure,$1)
configure = $(call run,$1,cmake $(CMAKEFLAGS) ..) && touch $@
build_rule = build-$1: $$(OUT)/$1/CMakeCache.txt; $$(call build,$1) build_rule = build-$1: $$(OUT)/$1/CMakeCache.txt; $$(call build,$1)
build = $(call run,$1,ninja $(PARALLELMFLAGS) $(GLOAS))
build = $(SILENT) \
$(call echo_if_silent,TARGET=$1 ninja $(PARALLELMFLAGS) $(GLOAS)) \
&& $(DOCKER) run $(DOCKER_RUNFLAGS) \
--volume '$(realpath $(PROJECT_ROOT)):$(CONTAINER_WORKSPACE)' \
--volume '$(realpath $(dir $<)):$(CONTAINER_WORKSPACE)/$(notdir $(OUT))' \
--workdir '$(CONTAINER_WORKSPACE)/$(notdir $(OUT))' \
$(PROJECT_NAME)-$1:$(VERSION) \
ninja $(PARALLELMFLAGS) $(GLOAS)
check_rule = check-$1: build-$1; check_rule = check-$1: build-$1;
# Rules # Rules
ifneq ($(MAKECMDGOALS),clean)
-include $(RULE_TARGETS) -include $(RULE_TARGETS)
endif
$(RULE_TARGETS): $(PROJECT_ROOT)/Makefile | $(OUT_DIRS) $(RULE_TARGETS): $(PROJECT_ROOT)/Makefile | $(OUT_DIRS)
$(SILENT) \
{ \ { \
echo; \ echo; \
echo '$(call image_rule,$(TARGET))'; \ echo '$(call image_rule,$(TARGET))'; \
@ -161,6 +155,8 @@ $(RULE_TARGETS): $(PROJECT_ROOT)/Makefile | $(OUT_DIRS)
echo '$(call build_rule,$(TARGET))'; \ echo '$(call build_rule,$(TARGET))'; \
echo; \ echo; \
echo '$(call check_rule,$(TARGET))'; \ echo '$(call check_rule,$(TARGET))'; \
echo; \
echo '$(call run_rule,$(TARGET))'; \
} > $@ } > $@
.PHONY: all .PHONY: all