feat: update Dockerfiles and rosdep.yaml to install fastapi and starlette, remove starlette dependency
This commit is contained in:
@@ -5,6 +5,7 @@ ARG BUILD_TYPE=release
|
|||||||
|
|
||||||
ENV RMW_IMPLEMENTATION=rmw_cyclonedds_cpp
|
ENV RMW_IMPLEMENTATION=rmw_cyclonedds_cpp
|
||||||
ENV WEBOTS_HOME=/usr/local/webots
|
ENV WEBOTS_HOME=/usr/local/webots
|
||||||
|
ENV PIP_BREAK_SYSTEM_PACKAGES=1
|
||||||
|
|
||||||
# X11 utilities and Mesa software renderer
|
# X11 utilities and Mesa software renderer
|
||||||
RUN apt-get update && apt-get install -y --no-install-recommends \
|
RUN apt-get update && apt-get install -y --no-install-recommends \
|
||||||
@@ -35,7 +36,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
|
|||||||
ros-${ROS_DISTRO}-ament-cmake-clang-format \
|
ros-${ROS_DISTRO}-ament-cmake-clang-format \
|
||||||
ros-${ROS_DISTRO}-rosbag2-storage-mcap \
|
ros-${ROS_DISTRO}-rosbag2-storage-mcap \
|
||||||
python3-pil \
|
python3-pil \
|
||||||
&& rm -rf /var/lib/apt/lists/* \
|
python3-pip \
|
||||||
&& rm -rf /var/lib/apt/lists/*
|
&& rm -rf /var/lib/apt/lists/*
|
||||||
|
|
||||||
WORKDIR /ros2_ws
|
WORKDIR /ros2_ws
|
||||||
@@ -54,6 +55,7 @@ RUN echo "yaml file:///ros2_ws/rosdep.yaml" \
|
|||||||
> /etc/ros/rosdep/sources.list.d/50-kuka-local.list && \
|
> /etc/ros/rosdep/sources.list.d/50-kuka-local.list && \
|
||||||
rosdep update && \
|
rosdep update && \
|
||||||
apt-get update && \
|
apt-get update && \
|
||||||
|
pip3 install --ignore-installed "fastapi>=0.100.0" "starlette>=0.27.0" fastmcp && \
|
||||||
rosdep install --from-paths src -i -r -y && \
|
rosdep install --from-paths src -i -r -y && \
|
||||||
rm -rf /var/lib/apt/lists/*
|
rm -rf /var/lib/apt/lists/*
|
||||||
|
|
||||||
|
|||||||
@@ -4,6 +4,7 @@ FROM ${IMAGE}
|
|||||||
ARG BUILD_TYPE=release
|
ARG BUILD_TYPE=release
|
||||||
|
|
||||||
ENV RMW_IMPLEMENTATION=rmw_cyclonedds_cpp
|
ENV RMW_IMPLEMENTATION=rmw_cyclonedds_cpp
|
||||||
|
ENV PIP_BREAK_SYSTEM_PACKAGES=1
|
||||||
|
|
||||||
RUN apt-get update && apt-get install -y --no-install-recommends \
|
RUN apt-get update && apt-get install -y --no-install-recommends \
|
||||||
ros-${ROS_DISTRO}-ros2-control \
|
ros-${ROS_DISTRO}-ros2-control \
|
||||||
@@ -13,6 +14,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
|
|||||||
ros-${ROS_DISTRO}-moveit-py \
|
ros-${ROS_DISTRO}-moveit-py \
|
||||||
ros-${ROS_DISTRO}-ament-cmake-clang-format \
|
ros-${ROS_DISTRO}-ament-cmake-clang-format \
|
||||||
ros-${ROS_DISTRO}-rosbag2-storage-mcap \
|
ros-${ROS_DISTRO}-rosbag2-storage-mcap \
|
||||||
|
python3-pip \
|
||||||
&& rm -rf /var/lib/apt/lists/*
|
&& rm -rf /var/lib/apt/lists/*
|
||||||
|
|
||||||
WORKDIR /ros2_ws
|
WORKDIR /ros2_ws
|
||||||
@@ -31,6 +33,7 @@ RUN echo "yaml file:///ros2_ws/rosdep.yaml" \
|
|||||||
> /etc/ros/rosdep/sources.list.d/50-kuka-local.list && \
|
> /etc/ros/rosdep/sources.list.d/50-kuka-local.list && \
|
||||||
rosdep update && \
|
rosdep update && \
|
||||||
apt-get update && \
|
apt-get update && \
|
||||||
|
pip3 install --ignore-installed "fastapi>=0.100.0" "starlette>=0.27.0" fastmcp && \
|
||||||
rosdep install --from-paths src -i -r -y && \
|
rosdep install --from-paths src -i -r -y && \
|
||||||
rm -rf /var/lib/apt/lists/*
|
rm -rf /var/lib/apt/lists/*
|
||||||
|
|
||||||
|
|||||||
@@ -3,11 +3,6 @@ python3-fastapi:
|
|||||||
pip:
|
pip:
|
||||||
packages: ["fastapi>=0.100.0"]
|
packages: ["fastapi>=0.100.0"]
|
||||||
|
|
||||||
python3-starlette:
|
|
||||||
ubuntu:
|
|
||||||
pip:
|
|
||||||
packages: ["starlette>=0.27.0"]
|
|
||||||
|
|
||||||
python3-uvicorn:
|
python3-uvicorn:
|
||||||
ubuntu:
|
ubuntu:
|
||||||
pip:
|
pip:
|
||||||
|
|||||||
@@ -8,7 +8,6 @@
|
|||||||
<license>Apache-2.0</license>
|
<license>Apache-2.0</license>
|
||||||
|
|
||||||
<exec_depend>python3-fastapi</exec_depend>
|
<exec_depend>python3-fastapi</exec_depend>
|
||||||
<exec_depend>python3-starlette</exec_depend>
|
|
||||||
<exec_depend>python3-uvicorn</exec_depend>
|
<exec_depend>python3-uvicorn</exec_depend>
|
||||||
<exec_depend>python3-multipart</exec_depend>
|
<exec_depend>python3-multipart</exec_depend>
|
||||||
<exec_depend>python3-fastmcp</exec_depend>
|
<exec_depend>python3-fastmcp</exec_depend>
|
||||||
|
|||||||
Reference in New Issue
Block a user