fixed bugs with graphics

This commit is contained in:
Matas Keras 2023-06-12 11:25:34 -04:00
parent ad8fe37b86
commit 0193a4342d
2 changed files with 33 additions and 5 deletions

View File

@ -1,10 +1,16 @@
FROM ubuntu:18.04 FROM ubuntu:18.04
ENV DEBIAN_FRONTEND noninteractive ENV DEBIAN_FRONTEND noninteractive
ENV LANG C.UTF-8 ENV LANG C.UTF-8
ENV LC_ALL C.UTF-8 ENV LC_ALL C.UTF-8
RUN apt-get update && apt-get install -y gnupg
RUN apt-key adv --fetch-keys https://developer.download.nvidia.com/compute/cuda/repos/ubuntu1804/x86_64/3bf863cc.pub
RUN apt-key adv --fetch-keys https://developer.download.nvidia.com/compute/machine-learning/repos/ubuntu1804/x86_64/7fa2af80.pub
@ -229,7 +235,7 @@ ENV QT_X11_NO_MITSHM 1
# Gazebo 7 crashes on VM with OpenGL 3.3 support, so downgrade to OpenGL 2.1 # Gazebo 7 crashes on VM with OpenGL 3.3 support, so downgrade to OpenGL 2.1
# http://answers.gazebosim.org/question/13214/virtual-machine-not-launching-gazebo/ # http://answers.gazebosim.org/question/13214/virtual-machine-not-launching-gazebo/
# https://www.mesa3d.org/vmware-guest.html # https://www.mesa3d.org/vmware-guest.html
ENV SVGA_VGPU10 0 #ENV SVGA_VGPU10 0
# Use UTF8 encoding in java tools (needed to compile jMAVSim) # Use UTF8 encoding in java tools (needed to compile jMAVSim)
ENV JAVA_TOOL_OPTIONS=-Dfile.encoding=UTF8 ENV JAVA_TOOL_OPTIONS=-Dfile.encoding=UTF8
@ -274,13 +280,19 @@ RUN echo "arrow" | sudo -S apt-get -y --quiet install code libgbm-dev
# source catkin_ws inside .bashrc # source catkin_ws inside .bashrc
RUN sed -i '/source ~\/catkin_ws\/devel\/setup.bash/d' $HOME/.bashrc && \ RUN sed -i '/source ~\/catkin_ws\/devel\/setup.bash/d' $HOME/.bashrc && \
sed -i 's+source /opt/ros/melodic/setup.bash+source /opt/ros/melodic/setup.bash\nsource ~/catkin_ws/devel/setup.bash+g' $ARROW_HOME/.bashrc sed -i 's+source /opt/ros/melodic/setup.bash+source /opt/ros/melodic/setup.bash\nsource ~/catkin_ws/devel/setup.bash+g' $ARROW_HOME/.bashrc
#RUN cd $ARRROW_HOME && git clone
# Install some useful ros tf packages # Install some useful ros tf packages
RUN echo "arrow" | sudo -S apt-get install ros-melodic-tf-conversions ros-melodic-rqt-tf-tree -y RUN echo "arrow" | sudo -S apt-get install ros-melodic-tf-conversions ros-melodic-rqt-tf-tree -y
RUN if [ ! -d "$ARROW_HOME/src" ]; then \ RUN if [ ! -d "$ARROW_HOME/src" ]; then \
mkdir -p $ARROW_HOME/src; fi mkdir -p $ARROW_HOME/src; fi
RUN if [ ! -d "$ARROW_HOME/src/containers" ]; then \ RUN if [ ! -d "$ARROW_HOME/src/containers" ]; then \
cd $ARROW_HOME/src \ cd $ARROW_HOME/src \
&& git clone https://github.com/mzahana/containers.git \ && git clone https://github.com/mzahana/containers.git \
@ -303,9 +315,8 @@ RUN git clone https://git.spirirobotics.com/scorpio1/oscillation_ctrl.git ~/cat
RUN echo "arrow" | sudo -S apt install ros-melodic-tf2-geometry-msgs RUN echo "arrow" | sudo -S apt install ros-melodic-tf2-geometry-msgs
RUN cd ~/catkin_ws && catkin build RUN cd ~/catkin_ws && catkin build
RUN bash ~/catkin_ws/src/oscillation_ctrl/px4_setup/ubuntu_sim_ros_melodic.sh RUN bash ~/catkin_ws/src/oscillation_ctrl/px4_setup/ubuntu_sim_ros_melodic.sh
RUN echo "arrow" | sudo -S apt upgrade -y libignition-math2
RUN cd ~/Firmware && git submodule update --init --recursive RUN cd ~/Firmware && make clean && make distclean && DONT_RUN=1 make px4_sitl_default gazebo
RUN ~/Firmware/Tools/setup/ubuntu.sh
RUN cp ~/catkin_ws/src/oscillation_ctrl/px4_setup/airframe_changes ~/Firmware/platforms/posix/cmake/sitl_target.cmake RUN cp ~/catkin_ws/src/oscillation_ctrl/px4_setup/airframe_changes ~/Firmware/platforms/posix/cmake/sitl_target.cmake
RUN cp -R ~/catkin_ws/src/oscillation_ctrl/models/* ~/Firmware/Tools/sitl_gazebo/models RUN cp -R ~/catkin_ws/src/oscillation_ctrl/models/* ~/Firmware/Tools/sitl_gazebo/models
RUN cp -R ~/catkin_ws/src/oscillation_ctrl/worlds/* ~/Firmware/Tools/sitl_gazebo/worlds RUN cp -R ~/catkin_ws/src/oscillation_ctrl/worlds/* ~/Firmware/Tools/sitl_gazebo/worlds

View File

@ -4,3 +4,20 @@ services:
command: bash command: bash
tty: true tty: true
privileged: true privileged: true
volumes:
- /tmp/.X11-unix:/tmp/.X11-unix:rw
environment:
- "QT_X11_NO_MITSHM=1"
- DISPLAY=$DISPLAY
ports:
- 14570:14570/udp
#deploy:
#resources:
#reservations:
#devices:
#- driver: nvidia
#
# capabilities: [gpu]