migration to jazzy

This commit is contained in:
Thies Lennart Alff 2024-06-05 12:51:18 +02:00
parent 1babceecdb
commit 6ad1685cc3
2 changed files with 9 additions and 9 deletions

View file

@ -1,4 +1,4 @@
FROM osrf/ros:iron-desktop-full AS base-ros-nvim
FROM osrf/ros:jazzy-desktop-full AS base-ros-nvim
ENV DEBIAN_FRONTEND=noninteractive
RUN apt-get update \
&& apt-get -y install --no-install-recommends apt-utils dialog 2>&1 \
@ -31,7 +31,7 @@ RUN apt-get update \
FROM base-ros-nvim AS base-ros-nvim-graphics
ARG ROS_DISTR=iron
ARG ROS_DISTR=jazzy
ENV ROS_DISTR=$ROS_DISTR
ENV NVIDIA_VISIBLE_DEVICES \
${NVIDIA_VISIBLE_DEVICES:-all}
@ -49,8 +49,8 @@ RUN apt-get update \
&& apt-get -y install --no-install-recommends apt-utils dialog 2>&1 \
&& apt-get install -y \
libgl1-mesa-dri \
libgl1-mesa-glx \
# libglx-mesa0 \
# libgl1-mesa-glx \
libglx-mesa0 \
mesa-utils \
mesa-utils-extra \
python3-pip \
@ -118,10 +118,10 @@ RUN sh -c "$(wget -O- https://github.com/deluan/zsh-in-docker/releases/download/
&& git clone https://github.com/HippoCampusRobotics/hippo_core.git "$HOME/hippo_core" \
&& ls $HOME/hippo_core/hippo_common/scripts \
&& $HOME/hippo_core/hippo_common/scripts/install_scripts.sh \
&& sudo wget https://hippocampusrobotics.github.io/docs/_downloads/6055b3168d4f0a8cd764ebc481280219/ros-iron-px4-msgs_2.0.1-0jammy_amd64.deb \
# && sudo wget https://hippocampusrobotics.github.io/docs/_downloads/286cb880b68d2c4b6c6d9e6730fab199/ros-jazzy-px4-msgs_2.0.1-0noble_amd64.deb \
# && sudo apt-get install ./ros-${ROS_DISTR}-px4-msgs_2.0.1-0noble_amd64.deb \
&& sudo apt-get install ./ros-${ROS_DISTR}-px4-msgs_2.0.1-0jammy_amd64.deb \
# && sudo wget https://hippocampusrobotics.github.io/docs/_downloads/6055b3168d4f0a8cd764ebc481280219/ros-iron-px4-msgs_2.0.1-0jammy_amd64.deb \
&& sudo wget https://hippocampusrobotics.github.io/docs/_downloads/286cb880b68d2c4b6c6d9e6730fab199/ros-jazzy-px4-msgs_2.0.1-0noble_amd64.deb \
&& sudo apt-get install ./ros-${ROS_DISTR}-px4-msgs_2.0.1-0noble_amd64.deb \
# && sudo apt-get install ./ros-${ROS_DISTR}-px4-msgs_2.0.1-0jammy_amd64.deb \
&& sudo apt install asciinema \
&& sudo apt-get autoremove -y \
&& sudo apt-get clean -y \

2
build
View file

@ -1,4 +1,4 @@
#!/usr/bin/bash
docker pull osrf/ros:iron-desktop-full
docker pull osrf/ros:jazzy-desktop-full
docker compose build --pull