chore(webfuse): add debugging configurations and launch support (#21)

* fixes verbosity option when set through command line * adds support for build type and allows to run gdb in container * adds missing toolchain headers to project * renames container macros * adds gdbserver * fixes verbosity option when set through command line * adds support for build type and allows to run gdb in container * adds missing toolchain headers to project * renames container macros * adds gdbserver * removes language settings, which contains alternating values * adds wrapper script to launch gdbserver * fix docker command in wrapper script * fixes run in dind setup * replaces docker's init through dump-init
2026-03-02 04:09:18 +00:00 · 2019-04-02 22:21:02 +02:00
parent 87f34fa768
commit b1527d5581
8 changed files with 203 additions and 79 deletions
--- a/91
+++ b/91
@@ -15,6 +15,7 @@ DOCKER_BUILDKIT ?=
 VERBOSE ?= 
 BUILDVERBOSE ?= 
 BUILDTARGET ?= 
+BUILDTYPE ?= Debug
 MARCH ?= $(call march,$(BUILDTARGET))

 PROJECT_NAME ?= webfuse
@@ -24,8 +25,8 @@ OUT ?= $(PROJECT_ROOT)/.build

 UID ?= $(shell id -u)

-CONTAINER_USER ?= $(UID)
-CONTAINER_GROUP ?= $(shell id -g)
+CONTAINER_USER ?= user
+CONTAINER_GROUP ?= user
 CONTAINER_CGROUP_PARENT ?= 

 HOST_CONTAINER ?= $(shell $(PROJECT_ROOT)/build/get_container_id.sh)
@@ -41,6 +42,11 @@ UBUNTU_CODENAME ?= bionic

 # Dependencies

+DUMB_INIT_VERISON ?= 1.2.2
+DOCKER_BUILDARGS += DUMB_INIT_VERISON=$(DUMB_INIT_VERISON)
+FETCH_TARGETS += $(OUT)/dumb-init-$(DUMB_INIT_VERISON).tar.gz
+$(OUT)/dumb-init-$(DUMB_INIT_VERISON).tar.gz: URL := https://github.com/Yelp/dumb-init/archive/v${DUMB_INIT_VERISON}.tar.gz
+
 GTEST_VERSION ?= 1.8.1
 DOCKER_BUILDARGS += GTEST_VERSION=$(GTEST_VERSION)
 FETCH_TARGETS += $(OUT)/googletest-release-$(GTEST_VERSION).tar.gz
@@ -93,21 +99,24 @@ $(addprefix $(OUT)/docker/,$(UBUNTU_TARGETS)): CODENAME := $(UBUNTU_CODENAME)
 # Common rule target configuration

 CMAKEFLAGS += '-GNinja'
+CMAKEFLAGS += '-DCMAKE_BUILD_TYPE=$(BUILDTYPE)'

 BUILDSILENT := $(if $(BUILDVERBOSE),,1)
 $(BUILDSILENT)NINJAFLAGS += -v

-DOCKER_RUNFLAGS += --device /dev/fuse --cap-add SYS_ADMIN --security-opt apparmor:unconfined
+DOCKER_RUNFLAGS += --device /dev/fuse
+DOCKER_RUNFLAGS += --cap-add SYS_ADMIN
+DOCKER_RUNFLAGS += --security-opt apparmor:unconfined
+
+DOCKER_RUNFLAGS += --cap-add SYS_PTRACE
+DOCKER_RUNFLAGS += --security-opt seccomp=unconfined

 DOCKER_RUNFLAGS += --interactive
 DOCKER_RUNFLAGS += --rm
-DOCKER_RUNFLAGS += --init
 DOCKER_RUNFLAGS += --user $(CONTAINER_USER):$(CONTAINER_GROUP)
 DOCKER_RUNFLAGS += --env SOURCE_DATE_EPOCH
 DOCKER_RUNFLAGS += --env BUILDTIME
 DOCKER_RUNFLAGS += --env NINJA_STATUS
-DOCKER_RUNFLAGS += $(addprefix --volumes-from ,$(HOST_CONTAINER))
-DOCKER_RUNFLAGS += $(addprefix --cgroup-parent ,$(CONTAINER_CGROUP_PARENT))

 DOCKER_BUILDARGS += CODENAME=$(CODENAME)
 DOCKER_BUILDARGS += PARALLELMFLAGS=$(PARALLELMFLAGS)
@@ -118,10 +127,12 @@ DOCKER_BUILDARGS += OUT=$(CONTAINER_OUT)
 DOCKER_BUILDFLAGS += --rm
 DOCKER_BUILDFLAGS += $(addprefix --build-arg ,$(DOCKER_BUILDARGS))

+OUT_TARGETS += $(addprefix $(OUT)/,$(TARGETS))
+
 OUT_DIRS += $(OUT)
 OUT_DIRS += $(OUT)/docker
 OUT_DIRS += $(OUT)/src
-OUT_DIRS += $(addprefix $(OUT)/,$(TARGETS))
+OUT_DIRS += $(addsuffix /$(BUILDTYPE),$(OUT_TARGETS))

 BUILD_TARGETS += $(addprefix build-,$(TARGETS))
 CHECK_TARGETS += $(addprefix check-,$(TARGETS))
@@ -129,7 +140,7 @@ CLEAN_TARGETS += $(addprefix clean-,$(TARGETS))
 RUN_TARGETS += $(addprefix run-,$(firstword $(TARGETS)))
 EXTRACT_TARGETS += $(patsubst $(OUT)/%.tar.gz,$(OUT)/src/%,$(FETCH_TARGETS))
 DISCOVER_CC_TARGETS += $(addprefix discover-cc-,$(firstword $(TARGETS)))
-RULE_TARGETS = $(addprefix $(OUT)/,$(addsuffix /rules.mk,$(TARGETS)))
+RULE_TARGETS += $(addsuffix /rules.mk,$(OUT_TARGETS))

 TARGETS := $(sort $(TARGETS))

@@ -139,33 +150,36 @@ echo_if_silent = VERBOSE=1
 $(VERBOSE)echo_if_silent = echo $1
 $(VERBOSE)SILENT := @

-$(HOST_CONTAINER)container_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 += --volume '$(realpath $(PROJECT_ROOT)):$(CONTAINER_PROJECT_ROOT):cached'
+$(HOST_CONTAINER)image_run_volumes += --volume '$(realpath $(OUT)/$1):$(CONTAINER_OUT)/$1:delegated'
+image_run_volumes += $(addprefix --volumes-from ,$2)

-container_name = $(REGISTRY_PREFIX)$(subst -,/,$1)/$(PROJECT_NAME):$(VERSION)
-container_run = $(DOCKER) run $(DOCKER_RUNFLAGS) $3 \
-  $(addprefix --volume ,$(call container_run_volumes,$1)) \
-  --workdir '$(CONTAINER_OUT)/$1' \
-  $(call container_name,$1) \
+image_name = $(REGISTRY_PREFIX)$(subst -,/,$1)/$(PROJECT_NAME):$(VERSION)
+image_run = $(DOCKER) run $(DOCKER_RUNFLAGS) \
+  $(call image_run_volumes,$1,$(HOST_CONTAINER)) \
+  $(addprefix --cgroup-parent ,$(CONTAINER_CGROUP_PARENT)) \
+  --workdir '$(CONTAINER_OUT)/$1/$(BUILDTYPE)' \
+  $3 \
+  $(call image_name,$1) \
  $2

 image_rule = \
  $$(OUT)/docker/$1: $$(OUT)/docker/$1.dockerfile $$(EXTRACT_TARGETS) $$(PROJECT_ROOT)/Makefile; \
-    $(SILENT)$$(call image,$1)
+    $$(SILENT)$$(call image,$1)
 image = \
-     $(call echo_if_silent,docker build $(call container_name,$1) $(OUT)) \
-  && $(DOCKER) build $(DOCKER_BUILDFLAGS) --iidfile $@ --file $< --tag $(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 image_name,$1) $(OUT)

 configure_rule = \
-  $$(OUT)/$1/CMakeCache.txt: $$(PROJECT_ROOT)/CMakeLists.txt $$(OUT)/docker/$1; \
-    $(SILENT)$$(call configure,$1)
+  $$(OUT)/$1/$$(BUILDTYPE)/CMakeCache.txt: $$(PROJECT_ROOT)/CMakeLists.txt $$(OUT)/docker/$1 | $$(OUT)/$1/$$(BUILDTYPE)/gdbserver; \
+    $$(SILENT)$$(call configure,$1)
 configure = \
     $(call run,$1,sh -c 'cmake $(CMAKEFLAGS) $(CONTAINER_PROJECT_ROOT) && $(CONTAINER_PROJECT_ROOT)/build/discover_cc_settings.sh $(notdir $@) $(realpath $(dir $@))') \
  && touch $(addprefix $(dir $@)/,include_dirs.txt) $@

 build_rule = \
-  build-$1: $$(OUT)/$1/CMakeCache.txt; \
-    $(SILENT)$$(call build,$1)
+  build-$1: $$(OUT)/$1/$$(BUILDTYPE)/CMakeCache.txt; \
+    $$(SILENT)$$(call build,$1)
 build = $(call run,$1,ninja $(PARALLELMFLAGS) $(NINJAFLAGS) $(GOALS))

 check_rule = \
@@ -173,30 +187,44 @@ check_rule = \

 memcheck_rule = \
  memcheck-$1: build-$1; \
-    $(SILENT)$$(call memcheck,$1)
+    $$(SILENT)$$(call memcheck,$1)
 memcheck = $(call run,$1,ctest -T memcheck $(CTESTFLAGS))

 run_rule = \
  run-$1: $$(OUT)/docker/$1; \
-    $(SILENT)$$(call run,$1,/bin/bash,--tty) || true
-run = $(call echo_if_silent,TARGET=$1 $2) && $(call container_run,$1,$2,$3)
+    $$(SILENT)$$(call run,$1,bash,--tty) || true
+run = $(call echo_if_silent,TARGET=$1 BUILDTYPE=$(BUILDTYPE) $2) && $(call image_run,$1,$2,$3)

 clean_rule = \
  clean-$1: ; \
-    $(SILENT)-$$(call clean,$1)
+    $$(SILENT)-$$(call clean,$1)
 clean = rm -rf $(OUT)/$1

 discover_cc_settings_rule = \
-  $$(OUT)/$1/include_dirs.txt: $$(OUT)/$1/CMakeCache.txt; \
-    $(SILENT)$$(call discover_cc_settings,$1)
+  $$(OUT)/$1/$$(BUILDTYPE)/include_dirs.txt: $$(OUT)/$1/$$(BUILDTYPE)/CMakeCache.txt; \
+    $$(SILENT)$$(call discover_cc_settings,$1)
 discover_cc_settings = \
  $(call run,$1,$(CONTAINER_PROJECT_ROOT)/build/discover_cc_settings.sh $(notdir $<) $(realpath $(dir $<)))

 discover_cc_rule = \
-  discover-cc-$1: $$(OUT)/$1/include_dirs.txt; \
-    $(SILENT)$$(call discover_cc,$1)
+  discover-cc-$1: $$(OUT)/$1/$$(BUILDTYPE)/include_dirs.txt; \
+    $$(SILENT)$$(call discover_cc,$1)
 discover_cc = cat $<

+wrapper_rule = \
+  $$(OUT)/$1/$$(BUILDTYPE)/gdbserver: $$(PROJECT_ROOT)/build/run_image.template $$(OUT)/docker/$1; \
+    $$(SILENT)$$(call wrapper,$1)
+wrapper = \
+     $(call echo_if_silent,generating $@) \
+  && sed \
+       -e 's@%PROJECT_ROOT%@$(abspath $(PROJECT_ROOT))@g' \
+       -e 's@%DOCKER%@$(DOCKER)@g' \
+       -e 's@%RUNFLAGS%@$(DOCKER_RUNFLAGS) $(call image_run_volumes,$1)@g' \
+       -e 's@%IMAGE%@$(call image_name,$1)@g' \
+       -e 's@%RUNCMD%@$(notdir $@)@g' \
+       $< > $@ \
+  && chmod +x $@
+
 # Rules

 ifneq ($(MAKECMDGOALS),distclean)
@@ -224,6 +252,8 @@ $(RULE_TARGETS): $(PROJECT_ROOT)/Makefile | $(OUT_DIRS)
 		echo '$(call discover_cc_settings_rule,$(TARGET))'; \
 		echo; \
 		echo '$(call discover_cc_rule,$(TARGET))'; \
+		echo; \
+		echo '$(call wrapper_rule,$(TARGET))'; \
 	} > $@

 .PHONY: all build-%
@@ -259,7 +289,6 @@ debug-print-%:
 	@printf '%s\n' '$*:' $($*)

 $(CHECK_TARGETS): GOALS := test
-$(CHECK_TARGETS) $(MEMCHECK_TARGETS): CONTAINER_USER := user

 $(OUT)/docker/qemu-arm-static-$(QEMU_VERSION):
 	$(SILENT) \