Skip to content
Snippets Groups Projects
Commit 09a71c94 authored by Nicolas Pope's avatar Nicolas Pope
Browse files

Use new docker base image

parent 9d85a6fd
No related branches found
No related tags found
1 merge request!363Use new docker base image
Pipeline #42524 passed
......@@ -3,6 +3,6 @@
cd /opt/ftl
mkdir build
cd build
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 &&
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 &&
ctest --output-on-failure
......@@ -7,6 +7,6 @@ docker run \
-e NVIDIA_DRIVER_CAPABILITIES=graphics,compute,utility,video \
-v "${PWD}:/opt/ftl" \
-u $(id -u ${USER}):$(id -g ${USER}) \
ftlab/base:1.0-dev \
ftlab/base:1.1-dev \
/opt/ftl/docker/CI/container-script.sh
\ No newline at end of file
......@@ -9,7 +9,7 @@ RUN apt-get update &&\
# Install build tools, build dependencies and python
apt-get install --no-install-recommends -y \
build-essential \
cmake \
ninja-build \
git \
openssh-client \
wget \
......@@ -51,6 +51,11 @@ RUN apt-get update &&\
COPY ./libnvcuvid.so ./libnvidia-encode.so /usr/lib/x86_64-linux-gnu/
RUN cd /opt/ &&\
# CMake
wget https://github.com/Kitware/CMake/releases/download/v3.20.5/cmake-3.20.5-linux-x86_64.sh && \
chmod a+x ././cmake-3.20.5-linux-x86_64.sh && \
./cmake-3.20.5-linux-x86_64.sh --skip-license --prefix=/usr/local && \
rm ./cmake-3.20.5-linux-x86_64.sh && \
# Pylon
wget -O pylon.deb https://seafile.utu.fi/f/b4585f6c84f0462fac04/?dl=1 &&\
apt-get install ./pylon.deb &&\
......
FROM ftlab/base:1.0-dev
FROM ftlab/base:1.1-dev
ARG USER_ID
ARG GROUP_ID
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment