docker: focal-foxy-deps, switched opengv and opencv

This commit is contained in:
matlabbe
2023-06-17 12:30:55 -07:00
parent f75839294a
commit 36c0054070
+11 -11
View File
@@ -154,6 +154,17 @@ RUN if [ "$TARGETPLATFORM" = "linux/amd64" ]; then git clone https://github.com/
cd && \
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
RUN apt-get update && apt install -y wget && \
apt-get clean && rm -rf /var/lib/apt/lists/
@@ -170,17 +181,6 @@ RUN git clone https://github.com/laurentkneip/opengv.git && \
cd && \
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
COPY ./docker/focal-foxy/deps/ros_entrypoint.sh /ros_entrypoint.sh