Skip to content

Commit

Permalink
Fix Dockerfile to correctly copy repository files with wildcard pattern
Browse files Browse the repository at this point in the history
  • Loading branch information
marc-hanheide committed Dec 15, 2024
1 parent d64982d commit 43e60cb
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ COPY ./src/*/package.xml /tmp/src/_workspace/src/_pkgs_xmls
COPY ./src/*/*/package.xml /tmp/src/_workspace/src/_pkgs_xmls
COPY ./src/*/*/*/package.xml /tmp/src/_workspace/src/_pkgs_xmls
COPY ./src/*/*/*/*/package.xml /tmp/src/_workspace/src/_pkgs_xmls
COPY ./.docker/*repos /tmp/.docker/
COPY ./.docker/*.repos* /tmp/.docker/
RUN cd /tmp/src && for r in /tmp/.docker/*.repos; do vcs import < $r ; done
RUN if [ "${TARGETARCH}" = "arm64" ]; then \
cd /tmp/src; \
Expand All @@ -58,7 +58,7 @@ RUN rosdep update --rosdistro=${ROS_DISTRO} && apt-get update
RUN rosdep install --from-paths /tmp/src --ignore-src -r -y && rm -rf /tmp/src && apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/src

FROM depinstaller as depbuilder
COPY .docker/*repos .docker/*.sh /tmp/.docker/
COPY .docker/*.repos* .docker/*.sh /tmp/.docker/

# get the source tree and build it (include gazebo only for arm64 platform as it is not available for arm64)
# see https://github.com/gazebosim/gazebo-classic/issues/3236
Expand Down

0 comments on commit 43e60cb

Please sign in to comment.