adds support for build type and allows to run gdb in container

.travis.yml

@@ -15,9 +15,11 @@ env:
     - PARALLELMFLAGS="-j2"
     - PORTABLE_WORSPACE=1
   matrix:
-    - MARCH=amd64   CHECK_TARGET=memcheck
-    - MARCH=arm32v7 CHECK_TARGET=check
+    - BUILDTYPE=Debug      MARCH=amd64   CHECK_TARGET=memcheck
+    - BUILDTYPE=Release    MARCH=amd64   CHECK_TARGET=memcheck
+    - BUILDTYPE=Debug      MARCH=arm32v7 CHECK_TARGET=check
+    - BUILDTYPE=MinSizeRel MARCH=arm32v7 CHECK_TARGET=check
 before_script:
-- make MARCH=$MARCH
+- make BUILDTYPE=$BUILDTYPE MARCH=$MARCH
 script:
-- make MARCH=$MARCH $CHECK_TARGET
+- make BUILDTYPE=$BUILDTYPE MARCH=$MARCH $CHECK_TARGET

Makefile

@@ -15,6 +15,7 @@ DOCKER_BUILDKIT ?=
 VERBOSE ?= 
 BUILDVERBOSE ?= 
 BUILDTARGET ?= 
+BUILDTYPE ?= Debug
 MARCH ?= $(call march,$(BUILDTARGET))
 
 PROJECT_NAME ?= webfuse
@@ -93,12 +94,17 @@ $(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
-DOCKER_RUNFLAGS += --cap-add SYS_ADMIN --security-opt apparmor:unconfined
+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
@@ -124,7 +130,7 @@ OUT_TARGETS += $(addprefix $(OUT)/,$(TARGETS))
 OUT_DIRS += $(OUT)
 OUT_DIRS += $(OUT)/docker
 OUT_DIRS += $(OUT)/src
-OUT_DIRS += $(addsuffix /usr/bin,$(OUT_TARGETS))
+OUT_DIRS += $(addsuffix /$(BUILDTYPE),$(OUT_TARGETS))
 
 BUILD_TARGETS += $(addprefix build-,$(TARGETS))
 CHECK_TARGETS += $(addprefix check-,$(TARGETS))
@@ -148,7 +154,7 @@ $(HOST_CONTAINER)container_run_volumes += '$(realpath $(OUT)/$1):$(CONTAINER_OUT
 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' \
+  --workdir '$(CONTAINER_OUT)/$1/$(BUILDTYPE)' \
   $(call container_name,$1) \
   $2
 
@@ -156,18 +162,18 @@ image_rule = \
   $$(OUT)/docker/$1: $$(OUT)/docker/$1.dockerfile $$(EXTRACT_TARGETS) $$(PROJECT_ROOT)/Makefile; \
     $$(SILENT)$$(call image,$1)
 image = \
-     $(call echo_if_silent,docker build $(call container_name,$1) $(OUT)) \
+     $(call echo_if_silent,TARGET=$1 docker build $(call container_name,$1) $(OUT)) \
   && $(DOCKER) build $(DOCKER_BUILDFLAGS) --iidfile $@ --file $< --tag $(call container_name,$1) $(OUT)
 
 configure_rule = \
-  $$(OUT)/$1/CMakeCache.txt: $$(PROJECT_ROOT)/CMakeLists.txt $$(OUT)/docker/$1 | $$(OUT)/$1/usr/bin/gdb; \
+  $$(OUT)/$1/$$(BUILDTYPE)/CMakeCache.txt: $$(PROJECT_ROOT)/CMakeLists.txt $$(OUT)/docker/$1; \
     $$(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; \
+  build-$1: $$(OUT)/$1/$$(BUILDTYPE)/CMakeCache.txt; \
     $$(SILENT)$$(call build,$1)
 build = $(call run,$1,ninja $(PARALLELMFLAGS) $(NINJAFLAGS) $(GOALS))
 
@@ -182,7 +188,7 @@ memcheck = $(call run,$1,ctest -T memcheck $(CTESTFLAGS))
 run_rule = \
   run-$1: $$(OUT)/docker/$1; \
     $$(SILENT)$$(call run,$1,bash,--tty) || true
-run = $(call echo_if_silent,TARGET=$1 $2) && $(call container_run,$1,$2,$3)
+run = $(call echo_if_silent,TARGET=$1 BUILDTYPE=$(BUILDTYPE) $2) && $(call container_run,$1,$2,$3)
 
 clean_rule = \
   clean-$1: ; \
@@ -190,13 +196,13 @@ clean_rule = \
 clean = rm -rf $(OUT)/$1
 
 discover_cc_settings_rule = \
-  $$(OUT)/$1/include_dirs.txt: $$(OUT)/$1/CMakeCache.txt; \
+  $$(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; \
+  discover-cc-$1: $$(OUT)/$1/$$(BUILDTYPE)/include_dirs.txt; \
     $$(SILENT)$$(call discover_cc,$1)
 discover_cc = cat $<
 

build/amd64-ubuntu-builder.dockerfile

@@ -11,6 +11,7 @@ RUN set -x \
        ninja-build \
        pkg-config \
        rsync \
+       gdb \
        valgrind \
   && rm -rf /var/lib/apt/lists/*
 

build/arm32v7-ubuntu-builder.dockerfile

@@ -13,6 +13,7 @@ RUN set -x \
        ninja-build \
        pkg-config \
        rsync \
+       gdb \
   && rm -rf /var/lib/apt/lists/*
 
 COPY src /usr/local/src