mirror of
https://github.com/introlab/rtabmap.git
synced 2026-10-12 21:09:50 +08:00
docker: focal-foxy-deps, switched opengv and opencv
This commit is contained in:
@@ -154,6 +154,17 @@ RUN if [ "$TARGETPLATFORM" = "linux/amd64" ]; then git clone https://github.com/
|
|||||||
cd && \
|
cd && \
|
||||||
rm -r AliceVision; fi
|
rm -r AliceVision; fi
|
||||||
|
|
||||||
|
RUN git clone --branch 4.2.0 https://github.com/opencv/opencv.git && \
|
||||||
|
git clone --branch 4.2.0 https://github.com/opencv/opencv_contrib.git && \
|
||||||
|
cd opencv && \
|
||||||
|
mkdir build && \
|
||||||
|
cd build && \
|
||||||
|
cmake -DBUILD_opencv_python3=OFF -DBUILD_opencv_python_bindings_generator=OFF -DBUILD_opencv_python_tests=OFF -DBUILD_PERF_TESTS=OFF -DBUILD_TESTS=OFF -DOPENCV_ENABLE_NONFREE=ON -DOPENCV_EXTRA_MODULES_PATH=/root/opencv_contrib/modules .. && \
|
||||||
|
make -j$(nproc) && \
|
||||||
|
make install && \
|
||||||
|
cd ../.. && \
|
||||||
|
rm -rf opencv opencv_contrib
|
||||||
|
|
||||||
#commit Aug 6 2020
|
#commit Aug 6 2020
|
||||||
RUN apt-get update && apt install -y wget && \
|
RUN apt-get update && apt install -y wget && \
|
||||||
apt-get clean && rm -rf /var/lib/apt/lists/
|
apt-get clean && rm -rf /var/lib/apt/lists/
|
||||||
@@ -170,17 +181,6 @@ RUN git clone https://github.com/laurentkneip/opengv.git && \
|
|||||||
cd && \
|
cd && \
|
||||||
rm -r opengv
|
rm -r opengv
|
||||||
|
|
||||||
RUN git clone --branch 4.2.0 https://github.com/opencv/opencv.git && \
|
|
||||||
git clone --branch 4.2.0 https://github.com/opencv/opencv_contrib.git && \
|
|
||||||
cd opencv && \
|
|
||||||
mkdir build && \
|
|
||||||
cd build && \
|
|
||||||
cmake -DBUILD_opencv_python3=OFF -DBUILD_opencv_python_bindings_generator=OFF -DBUILD_opencv_python_tests=OFF -DBUILD_PERF_TESTS=OFF -DBUILD_TESTS=OFF -DOPENCV_ENABLE_NONFREE=ON -DOPENCV_EXTRA_MODULES_PATH=/root/opencv_contrib/modules .. && \
|
|
||||||
make -j$(nproc) && \
|
|
||||||
make install && \
|
|
||||||
cd ../.. && \
|
|
||||||
rm -rf opencv opencv_contrib
|
|
||||||
|
|
||||||
RUN rm /bin/sh && ln -s /bin/bash /bin/sh
|
RUN rm /bin/sh && ln -s /bin/bash /bin/sh
|
||||||
|
|
||||||
COPY ./docker/focal-foxy/deps/ros_entrypoint.sh /ros_entrypoint.sh
|
COPY ./docker/focal-foxy/deps/ros_entrypoint.sh /ros_entrypoint.sh
|
||||||
|
|||||||
Reference in New Issue
Block a user