From df3e1cf2ec4522462ef899fd63bc6b59931a5aa6 Mon Sep 17 00:00:00 2001 From: Patrick Creighton Date: Mon, 2 Oct 2023 13:49:45 -0700 Subject: [PATCH 1/2] Add local pathfinding python dependencies --- .devcontainer/base-dev/base-dev.Dockerfile | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.devcontainer/base-dev/base-dev.Dockerfile b/.devcontainer/base-dev/base-dev.Dockerfile index 5119c1bf2..4c49e7b55 100644 --- a/.devcontainer/base-dev/base-dev.Dockerfile +++ b/.devcontainer/base-dev/base-dev.Dockerfile @@ -22,6 +22,11 @@ RUN apt-get update \ && rosdep init || echo "rosdep already initialized" ENV DEBIAN_FRONTEND= +# install base pip dependencies +RUN pip3 install \ + pyproj \ + shapely + # root bash configuration ENV ROS_WORKSPACE=/workspaces/sailbot_workspace COPY update-bashrc.sh /sbin/update-bashrc From 9a1bfda246a23c44efb42c92e7e7363a9f03d3ba Mon Sep 17 00:00:00 2001 From: Patrick Creighton Date: Mon, 2 Oct 2023 13:51:30 -0700 Subject: [PATCH 2/2] Update dev container base image --- .devcontainer/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile index d85a7bcec..fde617772 100644 --- a/.devcontainer/Dockerfile +++ b/.devcontainer/Dockerfile @@ -1,4 +1,4 @@ -FROM ghcr.io/ubcsailbot/sailbot_workspace/dev:mongodb-cpp +FROM ghcr.io/ubcsailbot/sailbot_workspace/dev:add-py-deps # Copy configuration files (e.g., .vimrc) from config/ to the container's home directory ARG USERNAME=ros