mirror of
https://github.com/introlab/rtabmap.git
synced 2026-09-02 01:20:25 +08:00
docker: remove some COPY to avoid invalidating cache
This commit is contained in:
@@ -92,12 +92,11 @@ RUN if [ "$TARGETPLATFORM" = "linux/amd64" ]; then echo "Installing zed-open-cap
|
||||
rm -r zed-open-capture; fi
|
||||
|
||||
# OpenCV with all modules (same version than distro version to avoid conflicts with cv_bridge ros package)
|
||||
COPY ./docker/noble/deps/opencv_4_6_0_ffmpeg.patch .
|
||||
RUN git clone --branch 4.6.0 https://github.com/opencv/opencv.git && \
|
||||
git clone --branch 4.6.0 https://github.com/opencv/opencv_contrib.git && \
|
||||
mv opencv_4_6_0_ffmpeg.patch opencv/. && \
|
||||
cd opencv && \
|
||||
git apply opencv_4_6_0_ffmpeg.patch && \
|
||||
sed -i '/#include <libavformat\/avformat.h>/i #include <libavcodec/version.h>' modules/videoio/src/ffmpeg_codecs.hpp && \
|
||||
mkdir build && \
|
||||
cd build && \
|
||||
cmake -DCMAKE_BUILD_TYPE=Release -DWITH_TBB=ON -DWITH_ADE=OFF -DWITH_OPENMP=ON -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 .. && \
|
||||
@@ -108,7 +107,7 @@ RUN git clone --branch 4.6.0 https://github.com/opencv/opencv.git && \
|
||||
|
||||
RUN rm /bin/sh && ln -s /bin/bash /bin/sh
|
||||
|
||||
COPY ./docker/noble/deps/ros_entrypoint.sh /ros_entrypoint.sh
|
||||
RUN echo -e '#!/bin/bash\nset -e\n\n# setup ros2 environment\nsource "/opt/ros/jazzy/setup.bash" --\nexec "$@"' > /ros_entrypoint.sh
|
||||
RUN chmod +x /ros_entrypoint.sh
|
||||
ENTRYPOINT [ "/ros_entrypoint.sh" ]
|
||||
|
||||
|
||||
@@ -1,12 +0,0 @@
|
||||
diff --git a/modules/videoio/src/ffmpeg_codecs.hpp b/modules/videoio/src/ffmpeg_codecs.hpp
|
||||
index 61788e0345..faad2596ed 100644
|
||||
--- a/modules/videoio/src/ffmpeg_codecs.hpp
|
||||
+++ b/modules/videoio/src/ffmpeg_codecs.hpp
|
||||
@@ -60,6 +60,7 @@ extern "C" {
|
||||
#include <errno.h>
|
||||
#endif
|
||||
|
||||
+#include <libavcodec/version.h>
|
||||
#include <libavformat/avformat.h>
|
||||
|
||||
#ifdef __cplusplus
|
||||
@@ -1,6 +0,0 @@
|
||||
#!/bin/bash
|
||||
set -e
|
||||
|
||||
# setup ros2 environment
|
||||
source "/opt/ros/jazzy/setup.bash" --
|
||||
exec "$@"
|
||||
Reference in New Issue
Block a user