From 13c62e126d9d1fdfab24865cc7300e19b43a922b Mon Sep 17 00:00:00 2001
From: Nicolas Pope <nwpope@utu.fi>
Date: Fri, 13 Aug 2021 10:33:51 +0100
Subject: [PATCH] Fix docker user
---
.../operators/src/analysis/tracking/nvopticalflow.cpp | 2 +-
docker/CI/container-script.sh | 6 ++----
docker/CI/pipeline-script.sh | 2 +-
3 files changed, 4 insertions(+), 6 deletions(-)
diff --git a/components/operators/src/analysis/tracking/nvopticalflow.cpp b/components/operators/src/analysis/tracking/nvopticalflow.cpp
index 8c0d38a69..e0d3ca44b 100644
--- a/components/operators/src/analysis/tracking/nvopticalflow.cpp
+++ b/components/operators/src/analysis/tracking/nvopticalflow.cpp
@@ -43,7 +43,7 @@ bool NVOpticalFlow::init() {
return false;
}
nvof_ = cv::cuda::NvidiaOpticalFlow_1_0::create(
- size_.width, size_.height,
+ size_,
cv::cuda::NvidiaOpticalFlow_1_0::NV_OF_PERF_LEVEL_SLOW,
true, false, false, 0);
diff --git a/docker/CI/container-script.sh b/docker/CI/container-script.sh
index 28443dede..61d46ee14 100755
--- a/docker/CI/container-script.sh
+++ b/docker/CI/container-script.sh
@@ -3,8 +3,6 @@
cd /opt/ftl
mkdir build
cd build
-apt update && apt install -y ninja-build
-cmake .. -GNinja -DCMAKE_CXX_FLAGS="-fdiagnostics-color" -DWITH_OPTFLOW=TRUE -DUSE_CPPCHECK=FALSE -DBUILD_CALIBRATION=TRUE -DWITH_CERES=TRUE -DCMAKE_BUILD_TYPE=Release -DCPACK_GENERATOR=DEB &&
-ninja &&
-ninja package &&
+cmake .. -DCMAKE_CXX_FLAGS="-fdiagnostics-color" -DWITH_OPTFLOW=TRUE -DUSE_CPPCHECK=FALSE -DBUILD_CALIBRATION=TRUE -DWITH_CERES=TRUE -DCMAKE_BUILD_TYPE=Release -DCPACK_GENERATOR=DEB &&
+make -j4 &&
ctest --output-on-failure
diff --git a/docker/CI/pipeline-script.sh b/docker/CI/pipeline-script.sh
index 16e9c04e0..1fe21694e 100755
--- a/docker/CI/pipeline-script.sh
+++ b/docker/CI/pipeline-script.sh
@@ -6,7 +6,7 @@ docker run \
--device=/dev/bus/usb \
-e NVIDIA_DRIVER_CAPABILITIES=graphics,compute,utility,video \
-v "${PWD}:/opt/ftl" \
- -it \
+ -u $(id -u ${USER}):$(id -g ${USER}) \
ftlab/base:1.0-dev \
/opt/ftl/docker/CI/container-script.sh
\ No newline at end of file
--
GitLab