File tree Expand file tree Collapse file tree 1 file changed +6
-1
lines changed Expand file tree Collapse file tree 1 file changed +6
-1
lines changed Original file line number Diff line number Diff line change @@ -20,6 +20,11 @@ ifeq ($(DOCKERFILE), Dockerfile.alpine)
2020 ADD_LIBUNWIND_DEPENDENCY_BUILD_ARG_OPT: =--build-arg ADD_LIBUNWIND_DEPENDENCY=${ADD_LIBUNWIND_DEPENDENCY}
2121endif
2222
23+ MAP_CONAN_HOME_TO_DOCKER_HOST_CMD_LINE_ARG: =
24+ ifdef MAP_CONAN_HOME_TO_DOCKER_HOST
25+ MAP_CONAN_HOME_TO_DOCKER_HOST_CMD_LINE_ARG: =-v "${MAP_CONAN_HOME_TO_DOCKER_HOST}:/home/build/.conan"
26+ endif
27+
2328CURRENT_UID := $(shell id -u)
2429CURRENT_GID := $(shell id -g)
2530CURRENT_USER_HOME := $(shell echo ~)
4651 docker run --rm -t \
4752 -u $(CURRENT_UID ) :$(CURRENT_GID ) \
4853 -v $(PWD ) :/source \
54+ ${MAP_CONAN_HOME_TO_DOCKER_HOST_CMD_LINE_ARG} \
4955 -w /source/agent/native \
50- -e CONAN_USER_HOME=/tmp/conan \
5156 elasticobservability/apm-agent-php-dev:native-build-gcc-12.2.0-$(BUILD_ARCHITECTURE ) -0.0.2 \
5257 sh -c " cmake --preset $( BUILD_ARCHITECTURE) -release && cmake --build --preset $( BUILD_ARCHITECTURE) -release && /source/agent/native/_build/$( BUILD_ARCHITECTURE) -release/ext/unit_tests/unit_tests"
5358 @echo " ::endgroup::"
You can’t perform that action at this time.
0 commit comments