diff --git a/docker/Dockerfile.airstack-dev b/docker/Dockerfile.airstack-dev index c3b2bb12..ad8a0b62 100644 --- a/docker/Dockerfile.airstack-dev +++ b/docker/Dockerfile.airstack-dev @@ -28,28 +28,6 @@ RUN apt update -y && apt install -y \ ros-humble-topic-tools \ ros-humble-grid-map -RUN /opt/ros/humble/lib/mavros/install_geographiclib_datasets.sh - - -# Install Python dependencies -RUN pip3 install \ - empy \ - future \ - lxml \ - matplotlib \ - numpy \ - pkgconfig \ - psutil \ - pygments \ - wheel \ - pymavlink \ - pyyaml \ - requests \ - setuptools \ - six \ - toml \ - scipy - # Override install newer openvdb 8.2.0 for compatibility with Ubuntu 22.04 https://bugs.launchpad.net/bugs/1970108 RUN apt remove -y libopenvdb*; \ diff --git a/docker/Dockerfile.isaac-ros b/docker/Dockerfile.isaac-ros index 8a6a733e..069cba8f 100644 --- a/docker/Dockerfile.isaac-ros +++ b/docker/Dockerfile.isaac-ros @@ -11,22 +11,6 @@ RUN echo 'Etc/UTC' > /etc/timezone && \ rm -rf /var/lib/apt/lists/* # install packages -RUN apt-get update && apt-get install -q -y --no-install-recommends \ - dirmngr \ - gnupg2 \ - unzip \ - && rm -rf /var/lib/apt/lists/* - -# setup keys -RUN set -eux; \ - key='C1CF6E31E6BADE8868B172B4F42ED6FBAB17C654'; \ - export GNUPGHOME="$(mktemp -d)"; \ - gpg --batch --keyserver keyserver.ubuntu.com --recv-keys "$key"; \ - mkdir -p /usr/share/keyrings; \ - gpg --batch --export "$key" > /usr/share/keyrings/ros2-latest-archive-keyring.gpg; \ - gpgconf --kill all; \ - rm -rf "$GNUPGHOME" - # setup sources.list RUN echo "deb [ signed-by=/usr/share/keyrings/ros2-latest-archive-keyring.gpg ] http://packages.ros.org/ros2/ubuntu jammy main" > /etc/apt/sources.list.d/ros2-latest.list