From 548bc1d1740b23e5590310cab149319141305805 Mon Sep 17 00:00:00 2001 From: Nikita Vanyasin Date: Thu, 17 Mar 2022 15:39:57 +0300 Subject: [PATCH] Fix running test cluster under cgroups v2 (#380) --- MAINTAINERS.md | 2 +- test/cluster.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/MAINTAINERS.md b/MAINTAINERS.md index 554da388..5677dab0 100644 --- a/MAINTAINERS.md +++ b/MAINTAINERS.md @@ -2,7 +2,7 @@ - Always preserve backward compatibility - Build using `make clean && make` -- After merging PR, alway run `make changelog` and commit changes +- After merging PR, always run `make changelog` and commit changes - Set ArangoDB docker container (used for testing) using `export ARANGODB=` - Run tests using: - `make run-tests-single` diff --git a/test/cluster.sh b/test/cluster.sh index 2dd06f88..f130f8b6 100755 --- a/test/cluster.sh +++ b/test/cluster.sh @@ -54,8 +54,8 @@ if [ "$CMD" == "start" ]; then if [[ "$OSTYPE" == "darwin"* ]]; then DOCKERPLATFORMARG="--platform linux/x86_64" DOCKERARGS="$DOCKERARGS $DOCKERPLATFORMARG" - STARTERARGS="--docker.container=$STARTERCONTAINER" fi + STARTERARGS="$STARTERARGS --docker.container=$STARTERCONTAINER" if [ -z "$STARTERPORT" ]; then STARTERPORT=7000