From bc04a8d5808ded7108845d6bc8932522eb6ab544 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Ellensohn?= Date: Thu, 17 Aug 2023 09:49:03 +0200 Subject: [PATCH] update: bring rmp_middleware into base image --- dependencies.amd64.repos | 5 +++++ dependencies.arm64.repos | 5 +++++ docker/Dockerfile | 2 +- overlay.repos | 5 ----- 4 files changed, 11 insertions(+), 6 deletions(-) diff --git a/dependencies.amd64.repos b/dependencies.amd64.repos index 988fd9c..6c8b7ad 100644 --- a/dependencies.amd64.repos +++ b/dependencies.amd64.repos @@ -20,4 +20,9 @@ repositories: rmp220_teleop: type: git url: https://github.com/bjoernellens1/rmp220_teleop.git + version: main + + rmp220_middleware: + type: git + url: https://github.com/bjoernellens1/rmp220_middleware.git version: main \ No newline at end of file diff --git a/dependencies.arm64.repos b/dependencies.arm64.repos index 4c66ee5..d763652 100644 --- a/dependencies.arm64.repos +++ b/dependencies.arm64.repos @@ -20,4 +20,9 @@ repositories: rmp220_teleop: type: git url: https://github.com/bjoernellens1/rmp220_teleop.git + version: main + + rmp220_middleware: + type: git + url: https://github.com/bjoernellens1/rmp220_middleware.git version: main \ No newline at end of file diff --git a/docker/Dockerfile b/docker/Dockerfile index 6043dc1..a03e701 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -72,7 +72,7 @@ RUN vcs import < overlay.repos WORKDIR /overlay_ws -RUN echo "update overlay 10.08.2023-1" +RUN echo "update overlay 17.08.2023" RUN source /rmp_ws/install/setup.bash \ && apt-get update \ diff --git a/overlay.repos b/overlay.repos index 5ad29a5..22fcc92 100644 --- a/overlay.repos +++ b/overlay.repos @@ -5,11 +5,6 @@ repositories: url: https://github.com/bjoernellens1/cps_rmp220_support.git version: main - rmp220_middleware: - type: git - url: https://github.com/bjoernellens1/rmp220_middleware.git - version: main - cam_openCV: type: git url: https://github.com/bjoernellens1/ros2_cam_openCV.git