From 1e152d940703101c545f4ea46efad36de42277bd Mon Sep 17 00:00:00 2001
From: Aaron Marburg <amarburg@uw.edu>
Date: Wed, 7 Aug 2024 09:23:44 -0700
Subject: [PATCH 1/2] Install ros_gz from package, not from source, remove
 sim.repos

---
 .docker/Dockerfile | 10 +++++++++-
 sim.repos          | 11 -----------
 2 files changed, 9 insertions(+), 12 deletions(-)
 delete mode 100644 sim.repos

diff --git a/.docker/Dockerfile b/.docker/Dockerfile
index 83b8740e..6aa2add0 100644
--- a/.docker/Dockerfile
+++ b/.docker/Dockerfile
@@ -130,6 +130,15 @@ RUN wget https://packages.osrfoundation.org/gazebo.gpg -O /usr/share/keyrings/pk
     && apt-get -q update \
     && apt-get -y --quiet --no-install-recommends install \
     gz-${GZ_VERSION} \
+    ros-${ROS_DISTRO}-ros-gz${GZ_VERSION} \
+    && apt-get autoremove -y \
+    && apt-get clean -y \
+    && rm -rf /var/lib/apt/lists/*
+
+# Install ArduPilot and ardupilot_gazebo dependencies
+RUN apt-get -q update \
+    && apt-get -q -y upgrade \
+    && apt-get -q install --no-install-recommends -y \
     python3-pexpect \
     python3-wxgtk4.0 \
     python3-future \
@@ -178,7 +187,6 @@ RUN [ "/bin/bash" , "-c" , " \
 WORKDIR $USER_WORKSPACE
 RUN sudo apt-get -q update \
     && sudo apt-get -q -y upgrade \
-    && vcs import src < src/blue/sim.repos \
     && rosdep update \
     && rosdep install -y --from-paths src --ignore-src --rosdistro ${ROS_DISTRO} --skip-keys="gz-transport12 gz-sim7 gz-math7 gz-msgs9 gz-plugin2" \
     && sudo apt-get autoremove -y \
diff --git a/sim.repos b/sim.repos
deleted file mode 100644
index b530a5f9..00000000
--- a/sim.repos
+++ /dev/null
@@ -1,11 +0,0 @@
-#
-# Note this is _in addition to_ blue.repos
-# (i.e. you need to vcs import both files independently)
-#
-repositories:
-
-  # ROS-Gazebo integration
-  ros_gz:
-    type: git
-    url: https://github.com/gazebosim/ros_gz
-    version: iron

From 4312a49511b8ab05b8d05d5d18d6403aa49ff170 Mon Sep 17 00:00:00 2001
From: Aaron Marburg <amarburg@uw.edu>
Date: Fri, 9 Aug 2024 10:33:23 -0700
Subject: [PATCH 2/2] Removed additional apt-get lines from cherry-pick

---
 .docker/Dockerfile | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/.docker/Dockerfile b/.docker/Dockerfile
index 6aa2add0..dc31ea0b 100644
--- a/.docker/Dockerfile
+++ b/.docker/Dockerfile
@@ -131,14 +131,6 @@ RUN wget https://packages.osrfoundation.org/gazebo.gpg -O /usr/share/keyrings/pk
     && apt-get -y --quiet --no-install-recommends install \
     gz-${GZ_VERSION} \
     ros-${ROS_DISTRO}-ros-gz${GZ_VERSION} \
-    && apt-get autoremove -y \
-    && apt-get clean -y \
-    && rm -rf /var/lib/apt/lists/*
-
-# Install ArduPilot and ardupilot_gazebo dependencies
-RUN apt-get -q update \
-    && apt-get -q -y upgrade \
-    && apt-get -q install --no-install-recommends -y \
     python3-pexpect \
     python3-wxgtk4.0 \
     python3-future \