.

Signed-off-by: Oguz Ozturk <[email protected]>
autowarefoundation · Jan 30, 2025 · 64db9e1 · 64db9e1
1 parent 3ced52a
commit 64db9e1
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 5 deletions.
diff --git a/.github/actions/docker-build-and-push-tools/action.yaml b/.github/actions/docker-build-and-push-tools/action.yaml
@@ -26,6 +26,7 @@ runs:
       run: |
         mkdir src
         vcs import src < autoware.repos
+        vcs import src < simulator.repos
       shell: bash
 
     - name: Setup Docker Buildx

diff --git a/docker/tools/Dockerfile.simulator b/docker/tools/Dockerfile.simulator
@@ -7,14 +7,12 @@ ARG LIB_DIR
 ENV CCACHE_DIR="/root/.ccache"
 WORKDIR /autoware
 COPY src /autoware/src
-COPY simulator.repos /autoware/simulator.repos
 COPY docker/scripts/resolve_rosdep_keys.sh /autoware/resolve_rosdep_keys.sh
 RUN chmod +x /autoware/resolve_rosdep_keys.sh
 
 # Install dependencies and build the simulator
 RUN --mount=type=ssh \
     --mount=type=cache,target=/var/cache/apt,sharing=locked \
-    vcs import src < simulator.repos \
     && apt-get update \
     && rosdep update && rosdep install -y --from-paths src --ignore-src --rosdistro $ROS_DISTRO \
     && source /opt/ros/"$ROS_DISTRO"/setup.bash && source /opt/autoware/setup.bash \

diff --git a/docker/tools/Dockerfile.visualizer b/docker/tools/Dockerfile.visualizer
@@ -5,15 +5,13 @@ SHELL ["/bin/bash", "-o", "pipefail", "-c"]
 ENV CCACHE_DIR="/root/.ccache"
 ARG ROS_DISTRO
 WORKDIR /autoware
-COPY simulator.repos /autoware/simulator.repos
+COPY src/simulator /autoware/src/simulator
 COPY docker/scripts/resolve_rosdep_keys.sh /autoware/resolve_rosdep_keys.sh
 RUN chmod +x /autoware/resolve_rosdep_keys.sh
 
 # Build simulator messages and rviz plugins ONLY
 RUN --mount=type=ssh \
     --mount=type=cache,target=/var/cache/apt,sharing=locked \
-    mkdir -p src \
-    && vcs import src < simulator.repos \
     && apt-get update \
     && source /opt/ros/"$ROS_DISTRO"/setup.bash && source /opt/autoware/setup.bash \
     && rosdep update && rosdep install -y --from-paths src --ignore-src --rosdistro $ROS_DISTRO \