From 17940cf0c7647193b31d7abea25e56454d8b5bb7 Mon Sep 17 00:00:00 2001 From: Levi Armstrong Date: Sat, 18 Jan 2025 08:03:31 -0600 Subject: [PATCH] Fix dockerfile to use correct rosinstall file based on distro (#1109) --- docker/Dockerfile | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/docker/Dockerfile b/docker/Dockerfile index c1d0a0d79ad..f9ae9957d17 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -1,5 +1,6 @@ ARG TAG FROM ubuntu:${TAG} +ARG TAG # Redeclare to use in this stage SHELL ["/bin/bash", "-c"] @@ -27,7 +28,11 @@ RUN apt update \ ARG WORKSPACE_DIR=/opt/tesseract RUN --mount=type=bind,target=${WORKSPACE_DIR}/src/tesseract \ cd ${WORKSPACE_DIR} \ - && vcs import src < src/tesseract/dependencies.repos --shallow \ + && if [ "$TAG" = "focal" ]; then \ + vcs import src < src/tesseract/dependencies_focal.repos --shallow; \ + else \ + vcs import src < src/tesseract/dependencies.repos --shallow; \ + fi \ && rosdep install \ --from-paths ${WORKSPACE_DIR}/src \ -iry