From e422337ed7360027694a7d89a1afb8ef1c2e9146 Mon Sep 17 00:00:00 2001 From: Leonardo Di Donato Date: Thu, 18 Jul 2019 10:47:09 +0000 Subject: [PATCH] fix(hack): strip ^M from current falco version and call test command of falco-tester Signed-off-by: Leonardo Di Donato --- hack/build.sh | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/hack/build.sh b/hack/build.sh index 6c3f55cd..9f18e031 100755 --- a/hack/build.sh +++ b/hack/build.sh @@ -12,9 +12,7 @@ docker run --user "$(id -u)":"$(id -g)" -v /etc/passwd:/etc/passwd:ro -e BUILD_T docker run --user "$(id -u)":"$(id -g)" -v /etc/passwd:/etc/passwd:ro -e BUILD_TYPE="$BUILD_TYPE" -v "$SOURCE_DIR":/source -v "$BUILD_DIR":/build "$FALCOBUILDER_IMAGE" tests # Deduct currently built version -CURRENT_FALCO_VERSION=$(docker run -v "$BUILD_DIR":/build -ti "$FALCOBUILDER_IMAGE" bash -c "./build/$BUILD_TYPE/userspace/falco/falco --version" | cut -d' ' -f3) -# CURRENT_FALCO_VERSION="${CURRENT_FALCO_VERSION#"${CURRENT_FALCO_VERSION%%[![:space:]]*}"}" -# CURRENT_FALCO_VERSION="${CURRENT_FALCO_VERSION%"${CURRENT_FALCO_VERSION##*[![:space:]]}"}" +CURRENT_FALCO_VERSION=$(docker run -v "$BUILD_DIR":/build "$FALCOBUILDER_IMAGE" bash -c "./build/$BUILD_TYPE/userspace/falco/falco --version" | cut -d' ' -f3 | tr -d '\r') # Execute regression tests docker run \ @@ -25,4 +23,4 @@ docker run \ -v "$BUILD_DIR":/build \ -e BUILD_TYPE="$BUILD_TYPE" \ -e FALCO_VERSION="$CURRENT_FALCO_VERSION" \ - "$FALCOTESTER_IMAGE" \ No newline at end of file + "$FALCOTESTER_IMAGE" test \ No newline at end of file