fix typo

Signed-off-by: Oguz Ozturk <oguzkaganozt@gmail.com>
autowarefoundation · Jan 30, 2025 · 64ca686 · 64ca686
1 parent eb43954
commit 64ca686
Show file tree

Hide file tree

Showing 4 changed files with 35 additions and 35 deletions.
diff --git a/.github/workflows/docker-build-and-push-arm64.yaml b/.github/workflows/docker-build-and-push-arm64.yaml
@@ -72,7 +72,7 @@ jobs:
       #   uses: ./.github/actions/docker-build-and-push-tools
       #   with:
       #     platform: arm64
-      #     target-image: autoware
+      #     target-image: autoware-tools
       #     build-args: |
       #       *.platform=linux/arm64
       #       *.args.ROS_DISTRO=${{ needs.load-env.outputs.rosdistro }}

diff --git a/.github/workflows/docker-build-and-push.yaml b/.github/workflows/docker-build-and-push.yaml
@@ -66,7 +66,7 @@ jobs:
         uses: ./.github/actions/docker-build-and-push-tools
         with:
           platform: amd64
-          target-image: autoware
+          target-image: autoware-tools
           build-args: |
             *.platform=linux/amd64
             *.args.ROS_DISTRO=${{ needs.load-env.outputs.rosdistro }}

diff --git a/docker/tools/Dockerfile.simulator b/docker/tools/Dockerfile.simulator
@@ -13,16 +13,16 @@ 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 \
-    && apt-get update \
+    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 \
     && colcon build --cmake-args \
-      "-Wno-dev" \
-      "--no-warn-unused-cli" \
-      --install-base /opt/autoware \
-      --merge-install \
-      --mixin release compile-commands ccache \
-      --base-paths /autoware/src/simulator \
+        "-Wno-dev" \
+        "--no-warn-unused-cli" \
+        --install-base /opt/autoware \
+        --merge-install \
+        --mixin release compile-commands ccache \
+        --base-paths /autoware/src/simulator \
     && find /opt/autoware/lib -type f -name "*.py" -exec chmod +x {} \; \
     && find /opt/autoware/share -type f -name "*.py" -exec chmod +x {} \; \
     && apt-get clean \

diff --git a/docker/tools/Dockerfile.visualizer b/docker/tools/Dockerfile.visualizer
@@ -11,20 +11,20 @@ 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 \
-    && 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 \
-    && colcon build --cmake-args \
-      "-Wno-dev" \
-      "--no-warn-unused-cli" \
-      --install-base /opt/autoware \
-      --merge-install \
-      --mixin release compile-commands ccache \
-      --base-paths /autoware/src \
-      --packages-up-to-regex ".*_msgs$" ".*rviz_plugin$" \
-    && apt-get clean \
-    && rm -rf /var/lib/apt/lists/* "$HOME"/.cache
+  --mount=type=cache,target=/var/cache/apt,sharing=locked \
+  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 \
+  && colcon build --cmake-args \
+    "-Wno-dev" \
+    "--no-warn-unused-cli" \
+    --install-base /opt/autoware \
+    --merge-install \
+    --mixin release compile-commands ccache \
+    --base-paths /autoware/src \
+    --packages-up-to-regex ".*_msgs$" ".*rviz_plugin$" \
+  && apt-get clean \
+  && rm -rf /var/lib/apt/lists/* "$HOME"/.cache
 
 # Extract rosdep dependencies for visualizer
 RUN source /opt/ros/"$ROS_DISTRO"/setup.bash && source /opt/autoware/setup.bash \
@@ -48,18 +48,18 @@ COPY --from=builder /rosdep-visualizer-depend-packages.txt /tmp/rosdep-visualize
 
 # Install openbox, VNC, ngrok, and simulator dependencies
 RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y \
-    curl unzip openbox tigervnc-standalone-server tigervnc-common \
-    novnc websockify python3-numpy python3-xdg \
-    && curl -sSL https://ngrok-agent.s3.amazonaws.com/ngrok.asc \
-    | tee /etc/apt/trusted.gpg.d/ngrok.asc >/dev/null && \
-    echo "deb https://ngrok-agent.s3.amazonaws.com buster main" \
-    | tee /etc/apt/sources.list.d/ngrok.list && \
-    apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y ngrok \
-    # Remove xmlschema and yamale from rosdep packages since we install via pip
-    && sed -i '/\(xmlschema\|yamale\)/d' /tmp/rosdep-visualizer-depend-packages.txt \
-    && pip install yamale xmlschema \
-    && cat /tmp/rosdep-visualizer-depend-packages.txt | xargs apt-get install -y --no-install-recommends \
-    && /autoware/cleanup_system.sh $LIB_DIR $ROS_DISTRO
+  curl unzip openbox tigervnc-standalone-server tigervnc-common \
+  novnc websockify python3-numpy python3-xdg \
+  && curl -sSL https://ngrok-agent.s3.amazonaws.com/ngrok.asc \
+  | tee /etc/apt/trusted.gpg.d/ngrok.asc >/dev/null \
+  && echo "deb https://ngrok-agent.s3.amazonaws.com buster main" \
+  | tee /etc/apt/sources.list.d/ngrok.list \
+  && apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y ngrok \
+  # Remove xmlschema and yamale from rosdep packages since we install via pip
+  && sed -i '/\(xmlschema\|yamale\)/d' /tmp/rosdep-visualizer-depend-packages.txt \
+  && pip install yamale xmlschema \
+  && cat /tmp/rosdep-visualizer-depend-packages.txt | xargs apt-get install -y --no-install-recommends \
+  && /autoware/cleanup_system.sh $LIB_DIR $ROS_DISTRO
 
 # Set up VNC password
 RUN mkdir -p ~/.vnc && \