From 4d1ab72669c369108f212a096eb91ddf19fead8e Mon Sep 17 00:00:00 2001 From: woensug-choi Date: Wed, 11 Mar 2026 20:02:51 +0900 Subject: [PATCH 1/2] wrong source fix --- .docker/jazzy.amd64.dockerfile | 2 +- .docker/jazzy.arm64v8.dockerfile | 6 ++---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/.docker/jazzy.amd64.dockerfile b/.docker/jazzy.amd64.dockerfile index 136353bc..a1902ab6 100644 --- a/.docker/jazzy.amd64.dockerfile +++ b/.docker/jazzy.amd64.dockerfile @@ -54,7 +54,7 @@ RUN bash install.sh RUN apt-get update && \ apt-get -y install --no-install-recommends ros-jazzy-mavros* \ && rm -rf /tmp/* -WORKDIR /opt/mavros_ws +WORKDIR /tmp RUN wget https://raw.githubusercontent.com/mavlink/mavros/master/mavros/scripts/install_geographiclib_datasets.sh && \ bash ./install_geographiclib_datasets.sh diff --git a/.docker/jazzy.arm64v8.dockerfile b/.docker/jazzy.arm64v8.dockerfile index bc33b884..bc81020e 100644 --- a/.docker/jazzy.arm64v8.dockerfile +++ b/.docker/jazzy.arm64v8.dockerfile @@ -111,7 +111,7 @@ RUN wget https://packages.osrfoundation.org/gazebo.gpg -O /usr/share/keyrings/pk RUN apt-get update && \ apt-get -y install --no-install-recommends ros-jazzy-mavros* \ && rm -rf /tmp/* -WORKDIR /opt/mavros_ws +WORKDIR /tmp RUN wget https://raw.githubusercontent.com/mavlink/mavros/master/mavros/scripts/install_geographiclib_datasets.sh && \ bash ./install_geographiclib_datasets.sh @@ -129,7 +129,7 @@ extras/background.png && \ # Install Ardupilot - Ardusub USER docker -RUN wget -O /tmp/install.sh https://raw.githubusercontent.com/IOES-Lab/dave/$BRANCH/extras/ardusub-ubuntu-install-local.sh +RUN wget -O /tmp/install.sh https://raw.githubusercontent.com/IOES-Lab/dave/$BRANCH/extras/ardusub-ubuntu-install.sh RUN chmod +x /tmp/install.sh && bash /tmp/install.sh # Set up Dave workspace @@ -154,8 +154,6 @@ RUN . "/opt/ros/${ROS_DISTRO}/setup.sh" && colcon build # Set User as user USER docker RUN echo "source /opt/ros/jazzy/setup.bash" >> ~/.bashrc && \ - echo "source /opt/gazebo/install/setup.bash" >> ~/.bashrc && \ - echo "source /opt/mavros/install/setup.bash" >> ~/.bashrc && \ echo "source $DAVE_UNDERLAY/install/setup.bash" >> ~/.bashrc && \ echo "export GEOGRAPHICLIB_GEOID_PATH=/usr/local/share/GeographicLib/geoids" >> ~/.bashrc && \ echo "export PYTHONPATH=\$PYTHONPATH:/opt/gazebo/install/lib/python" >> ~/.bashrc && \ From cd4ad0a2a0c6b0fb94df17b2ed5fecb6914f43fe Mon Sep 17 00:00:00 2001 From: woensug-choi Date: Wed, 11 Mar 2026 20:04:47 +0900 Subject: [PATCH 2/2] revert --- .docker/jazzy.arm64v8.dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.docker/jazzy.arm64v8.dockerfile b/.docker/jazzy.arm64v8.dockerfile index bc81020e..da1f9418 100644 --- a/.docker/jazzy.arm64v8.dockerfile +++ b/.docker/jazzy.arm64v8.dockerfile @@ -129,7 +129,7 @@ extras/background.png && \ # Install Ardupilot - Ardusub USER docker -RUN wget -O /tmp/install.sh https://raw.githubusercontent.com/IOES-Lab/dave/$BRANCH/extras/ardusub-ubuntu-install.sh +RUN wget -O /tmp/install.sh https://raw.githubusercontent.com/IOES-Lab/dave/$BRANCH/extras/ardusub-ubuntu-install-local.sh RUN chmod +x /tmp/install.sh && bash /tmp/install.sh # Set up Dave workspace