This commit is contained in:
Thies Lennart Alff 2024-04-12 14:20:34 +02:00
parent a5cf832a3b
commit 02937d1a93
4 changed files with 18 additions and 4 deletions

View file

@ -12,6 +12,7 @@ RUN apt-get update \
clang-format \ clang-format \
xclip \ xclip \
wl-clipboard \ wl-clipboard \
breeze \
&& mkdir -p /etc/apt/keyrings \ && mkdir -p /etc/apt/keyrings \
&& curl -fsSL https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key | gpg --dearmor -o /etc/apt/keyrings/nodesource.gpg \ && curl -fsSL https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key | gpg --dearmor -o /etc/apt/keyrings/nodesource.gpg \
&& NODE_MAJOR=20 \ && NODE_MAJOR=20 \
@ -35,6 +36,13 @@ ENV NVIDIA_DRIVER_CAPABILITIES \
${NVIDIA_DRIVER_CAPABILITIES:+$NVIDIA_DRIVER_CAPABILITIES,}graphics ${NVIDIA_DRIVER_CAPABILITIES:+$NVIDIA_DRIVER_CAPABILITIES,}graphics
ENV ROS_DISTR=$ROS_DISTR ENV ROS_DISTR=$ROS_DISTR
RUN apt-get update \
#&& apt-get -y install --no-install-recommends apt-utils dialog 2>&1 \
&& apt-get install -y \
software-properties-common \
&& add-apt-repository -y ppa:inivation-ppa/inivation \
&& rm -rf /var/lib/apt/lists/*
RUN apt-get update \ RUN apt-get update \
&& apt-get -y install --no-install-recommends apt-utils dialog 2>&1 \ && apt-get -y install --no-install-recommends apt-utils dialog 2>&1 \
&& apt-get install -y \ && apt-get install -y \
@ -50,6 +58,7 @@ RUN apt-get update \
iputils-ping \ iputils-ping \
sudo \ sudo \
wget \ wget \
libserial-dev \
ros-${ROS_DISTR}-rqt-tf-tree \ ros-${ROS_DISTR}-rqt-tf-tree \
ros-${ROS_DISTR}-apriltag \ ros-${ROS_DISTR}-apriltag \
ros-${ROS_DISTR}-plotjuggler-ros \ ros-${ROS_DISTR}-plotjuggler-ros \

2
build
View file

@ -1,3 +1,3 @@
#!/usr/bin/bash #!/usr/bin/bash
docker compose build docker compose build --pull

View file

@ -1,6 +1,6 @@
services: services:
nvidia: nvidia:
container_name: ros2-vim container_name: ros2-vim-nvidia
extends: extends:
service: dev service: dev
deploy: deploy:
@ -58,6 +58,7 @@ services:
- XDG_RUNTIME_DIR=/tmp - XDG_RUNTIME_DIR=/tmp
- WAYLAND_DISPLAY=${WAYLAND_DISPLAY} - WAYLAND_DISPLAY=${WAYLAND_DISPLAY}
- QT_X11_NO_MITSHM=1 - QT_X11_NO_MITSHM=1
- QT_STYLE_OVERRIDE=breeze
- SHELL=/usr/bin/zsh - SHELL=/usr/bin/zsh
- ROS_WORKSPACE=/home/ros-user/uuv/ros2 - ROS_WORKSPACE=/home/ros-user/uuv/ros2
- SSH_AUTH_SOCK=/ssh-agent - SSH_AUTH_SOCK=/ssh-agent

View file

@ -3,8 +3,10 @@ set -e
WORKSPACE_DIR="\$HOME/uuv/ros2" WORKSPACE_DIR="\$HOME/uuv/ros2"
UNDERLAY_DIR="\$HOME/uuv/ros2_underlay" UNDERLAY_DIR="\$HOME/uuv/ros2_underlay"
echo "alias build_ros=\"env -i HOME=\$HOME USER=\$USER TERM=xterm-256color bash -l -c 'source $UNDERLAY_DIR/install/setup.bash && cd $WORKSPACE_DIR && colcon build --symlink-install --cmake-args -DCMAKE_EXPORT_COMPILE_COMMANDS=ON'\"" >> ~/.zshrc #echo "alias build_ros=\"env -i HOME=\$HOME USER=\$USER TERM=xterm-256color bash -l -c 'source $UNDERLAY_DIR/install/setup.bash && cd $WORKSPACE_DIR && colcon build --symlink-install --cmake-args -DCMAKE_EXPORT_COMPILE_COMMANDS=ON'\"" >> ~/.zshrc
echo "alias build_underlay=\"env -i HOME=\$HOME USER=\$USER TERM=xterm-256color bash -l -c 'source /opt/ros/$ROS_DISTR/setup.bash && cd $UNDERLAY_DIR && colcon build'\"" >> ~/.zshrc #echo "alias build_underlay=\"env -i HOME=\$HOME USER=\$USER TERM=xterm-256color bash -l -c 'source /opt/ros/$ROS_DISTR/setup.bash && cd $UNDERLAY_DIR && colcon build'\"" >> ~/.zshrc
echo "alias rosdep-ros2=\"env -i HOME=\$HOME USER=\$USER TERM=xterm-256color bash -l -c 'source \$HOME/uuv/ros2_underlay/install/setup.bash && cd \$HOME/uuv/ros2 && rosdep install --from-paths src -y --ignore-src'\"" >> ~/.zshrc
echo "alias rosdep-underlay=\"env -i HOME=\$HOME USER=\$USER TERM=xterm-256color bash -l -c 'source /opt/ros/iron/setup.bash && cd \$HOME/uuv/ros2_underlay && rosdep install --from-paths src -y --ignore-src'\"" >> ~/.zshrc
echo 'source $HOME/uuv/ros2_underlay/install/setup.zsh' >> ~/.zshrc echo 'source $HOME/uuv/ros2_underlay/install/setup.zsh' >> ~/.zshrc
@ -12,6 +14,8 @@ echo 'source $HOME/uuv/ros2/install/local_setup.zsh' >> ~/.zshrc
echo 'export RCUTILS_COLORIZED_OUTPUT=1' >> ~/.zshrc echo 'export RCUTILS_COLORIZED_OUTPUT=1' >> ~/.zshrc
echo 'eval "$(register-python-argcomplete3 ros2)"' >> ~/.zshrc echo 'eval "$(register-python-argcomplete3 ros2)"' >> ~/.zshrc
echo 'eval "$(register-python-argcomplete3 colcon)"' >> ~/.zshrc echo 'eval "$(register-python-argcomplete3 colcon)"' >> ~/.zshrc
echo 'eval "$(register-python-argcomplete3 build-ros)"' >> ~/.zshrc
echo 'eval "$(register-python-argcomplete3 clean-ros)"' >> ~/.zshrc
echo "bindkey '^ ' autosuggest-toggle" >> ~/.zshrc echo "bindkey '^ ' autosuggest-toggle" >> ~/.zshrc
exec $@ exec $@