diff --git a/.github/workflows/publish-container.yaml b/.github/workflows/publish-container.yaml index 8c5149e..6bf3a53 100644 --- a/.github/workflows/publish-container.yaml +++ b/.github/workflows/publish-container.yaml @@ -27,7 +27,7 @@ jobs: - name: Extract metadata (tags, labels) for Docker id: meta - uses: docker/metadata-action@60a0d343a0d8a18aedee9d34e62251f752153bdb + uses: docker/metadata-action@70b2cdc6480c1a8b86edf1777157f8f437de2166 with: images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }} diff --git a/Dockerfile b/Dockerfile index 92124a9..3a809a4 100644 --- a/Dockerfile +++ b/Dockerfile @@ -23,20 +23,13 @@ RUN apt-get install -y \ iputils-ping \ net-tools \ python3-catkin-tools \ + python3-pip \ python3-vcstool RUN vcs import src < src/biodigitalmatter_ros/dependencies.repos RUN vcs import src < src/abb_robot_driver/pkgs.repos -RUN rosdep install -y --from-paths . --ignore-src --rosdistro ${ROS_DISTRO} \ - --skip-keys=depthai - -# https://github.com/luxonis/depthai-ros/issues/540 -RUN cd /tmp \ - && git clone --recursive https://github.com/luxonis/depthai-core.git --branch v2.24.0 \ - && cmake -Hdepthai-core -Bdepthai-core/build -DBUILD_SHARED_LIBS=ON -DCMAKE_INSTALL_PREFIX=/usr/local \ - && cmake --build depthai-core/build --target install \ - && rm -r depthai-core +RUN rosdep install -y --from-paths . --ignore-src --rosdistro ${ROS_DISTRO} RUN source /opt/ros/${ROS_DISTRO}/setup.bash && catkin build