1
0
mirror of https://github.com/falk-werner/webfuse-provider synced 2024-10-27 20:44:10 +00:00

Merge commit '0f8846a3145171a7f9a528603748d5ea18ef5edb'

This commit is contained in:
nosamad 2020-05-26 02:05:57 +02:00
commit 3c7eb8b111

View File

@ -344,11 +344,10 @@ ifeq ($(docker_portable_workspace),)
container_destdir = $(abspath $(DESTDIR))
endif
container_cpus = $(INTERNPARALLEL)
container_cpus = $(call min,$(INTERNPARALLEL) $(JOBSLOTS_DEFAULT))
container_cpuperiod = 100000
container_quota = $(call bc,($(container_cpus)*$(container_cpuperiod)))
# allow twice as much parallel executions, while container are already limited by cgroup
container_nproc = $(call bc,(2*$(container_cpus)))
container_nproc = $(INTERNPARALLEL)
docker_runflags += $(DOCKER_RUNFLAGS)
docker_runflags += $(addprefix --cpus ,$(container_cpus))