entrypoint update/fix

This commit is contained in:
Thies Lennart Alff 2022-05-01 01:47:57 +02:00
parent ece805b18f
commit 485b1876c0
3 changed files with 6 additions and 7 deletions

View file

@ -62,6 +62,9 @@ RUN cd /home/$USERNAME/.vim/bundle/YouCompleteMe \
&& python3 install.py --clangd-completer && python3 install.py --clangd-completer
USER root USER root
RUN chown -R $USERNAME /home/$USERNAME/ RUN chown -R $USERNAME /home/$USERNAME/
ADD entrypoint.sh /entrypoint.sh
RUN chmod +x /entrypoint.sh
RUN chown $USERNAME /entrypoint.sh
USER ${USERNAME} USER ${USERNAME}
WORKDIR /home/$USERNAME WORKDIR /home/$USERNAME
RUN wget https://raw.githubusercontent.com/llvm/llvm-project/main/clang/tools/clang-format/clang-format.py RUN wget https://raw.githubusercontent.com/llvm/llvm-project/main/clang/tools/clang-format/clang-format.py

View file

@ -16,10 +16,7 @@ services:
dockerfile: ./Dockerfile dockerfile: ./Dockerfile
stdin_open: true stdin_open: true
tty: true tty: true
entrypoint: entrypoint: ["/entrypoint.sh", "byobu"]
- bash
- entrypoint.sh
command: byobu
working_dir: /home/ros-user/uuv/ros2 working_dir: /home/ros-user/uuv/ros2
devices: devices:
- "/dev/dri:/dev/dri" - "/dev/dri:/dev/dri"

View file

@ -1,12 +1,11 @@
#!/bin/bash #!/bin/bash
set -e set -e
PX4_DIR="/home/vscode/uuv/PX4-Autopilot" PX4_DIR="\$HOME/uuv/PX4-Autopilot"
WORKSPACE_DIR="/home/vscode/uuv/ros2" WORKSPACE_DIR="\$HOME/uuv/ros2"
echo "source $WORKSPACE_DIR/install/setup.zsh" >> ~/.zshrc echo "source $WORKSPACE_DIR/install/setup.zsh" >> ~/.zshrc
echo "source $PX4_DIR/Tools/setup_gazebo.bash $PX4_DIR $PX4_DIR/build/px4_sitl_default > /dev/null" >> ~/.zshrc echo "source $PX4_DIR/Tools/setup_gazebo.bash $PX4_DIR $PX4_DIR/build/px4_sitl_default > /dev/null" >> ~/.zshrc
echo "export ROS_PACKAGE_PATH=\$ROS_PACKAGE_PATH:$PX4_DIR" >> ~/.zshrc echo "export ROS_PACKAGE_PATH=\$ROS_PACKAGE_PATH:$PX4_DIR" >> ~/.zshrc
echo "export ROS_PACKAGE_PATH=\$ROS_PACKAGE_PATH:$PX4_DIR/Tools/sitl_gazebo" >> ~/.zshrc echo "export ROS_PACKAGE_PATH=\$ROS_PACKAGE_PATH:$PX4_DIR/Tools/sitl_gazebo" >> ~/.zshrc
echo "export FASTRTPS_DEFAULT_PROFILES_FILE=/home/vscode/uuv/ros2/test.xml" >> ~/.zshrc
vim +PluginUpdate +qall vim +PluginUpdate +qall
exec $@ exec $@