Skip to content

Commit

Permalink
Fix dockerfile to use correct rosinstall file based on distro (#1109)
Browse files Browse the repository at this point in the history
  • Loading branch information
Levi-Armstrong authored Jan 18, 2025
1 parent 4c18eb1 commit 17940cf
Showing 1 changed file with 6 additions and 1 deletion.
7 changes: 6 additions & 1 deletion docker/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
ARG TAG
FROM ubuntu:${TAG}
ARG TAG # Redeclare to use in this stage

SHELL ["/bin/bash", "-c"]

Expand Down Expand Up @@ -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
Expand Down

0 comments on commit 17940cf

Please sign in to comment.