change Dockerfile to use galactic

tiiuae · Mar 25, 2024 · ab84cc3 · ab84cc3
1 parent b5616fc
commit ab84cc3
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 19 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -1,22 +1,20 @@
-FROM ros:humble-ros-base AS builder
+FROM ros:galactic-ros-base AS builder
 
 ENV LANG C.UTF-8
 ENV LANGUAGE C.UTF-8
 ENV LC_ALL C.UTF-8
 
 RUN apt-get update -y && apt-get install -y --no-install-recommends \
     build-essential git wget cmake lsb-core ninja-build \
-    ros-humble-gazebo-ros \
+    ros-galactic-gazebo-ros \
     libopencv-dev \
     libgstreamer-plugins-base1.0-dev \
     python3-jinja2 \
     && rm -rf /var/lib/apt/lists/*
 
 
-# Clone c_library_v2 commit matching with current px4-firmware mavlink commit
-# => mavlink/c_library_v2:fbdb7c29 is built from mavlink/mavlink:08112084
 RUN git clone -q https://github.com/mavlink/c_library_v2.git  /usr/local/include/mavlink && \
-    cd /usr/local/include/mavlink && git checkout -q fbdb7c29e47902d44eeaa58b4395678a9b78f3ae && \
+    cd /usr/local/include/mavlink && git checkout -q 0129097f684ec76f44ae25fb4d64487c96d53317 && \
     rm -rf /usr/local/include/mavlink/.git
 
 ENV _MAVLINK_INCLUDE_DIR  /usr/local/include/mavlink
@@ -26,7 +24,7 @@ COPY . .
 
 SHELL ["/bin/bash", "-c"]
 
-RUN source /opt/ros/humble/setup.bash && \
+RUN source /opt/ros/galactic/setup.bash && \
     mkdir -p build && \
     cd build && \
     cmake .. && \
@@ -35,11 +33,11 @@ RUN source /opt/ros/humble/setup.bash && \
 WORKDIR /artifacts
 
 RUN mkdir -p plugins \
-  && mkdir -p models \
-  && mkdir -p scripts \
-  && cp -r /px4_sitl_gazebo/models/ssrc_fog_x models/ssrc_fog_x \
-  && cp /px4_sitl_gazebo/scripts/jinja_gen.py scripts/jinja_gen.py \
-  && find /px4_sitl_gazebo/build/*.so -exec cp {} plugins \;
+    && mkdir -p models \
+    && mkdir -p scripts \
+    && cp -r /px4_sitl_gazebo/models/ssrc_fog_x models/ssrc_fog_x \
+    && cp /px4_sitl_gazebo/scripts/jinja_gen.py scripts/jinja_gen.py \
+    && find /px4_sitl_gazebo/build/*.so -exec cp {} plugins \;
 
 
 FROM busybox

diff --git a/Dockerfile.validate_sdf b/Dockerfile.validate_sdf
@@ -1,29 +1,27 @@
-FROM ros:humble-ros-base
+FROM ros:galactic-ros-base
 
 ENV LANG C.UTF-8
 ENV LANGUAGE C.UTF-8
 ENV LC_ALL C.UTF-8
 
 RUN apt-get update -y && apt-get install -y --no-install-recommends \
     build-essential git wget cmake lsb-core ninja-build \
-    ros-humble-gazebo-ros \
+    ros-galactic-gazebo-ros \
     libopencv-dev \
     libgstreamer-plugins-base1.0-dev \
     python3-jinja2 \
     && rm -rf /var/lib/apt/lists/*
 
-# Clone c_library_v2 commit matching with current px4-firmware mavlink commit
-# => mavlink/c_library_v2:fbdb7c29 is built from mavlink/mavlink:08112084
-RUN git clone -q https://github.com/mavlink/c_library_v2.git  /usr/local/include/mavlink && \
-    cd /usr/local/include/mavlink && git checkout -q fbdb7c29e47902d44eeaa58b4395678a9b78f3ae && \
-    rm -rf /usr/local/include/mavlink/.git
+RUN git clone -q https://github.com/mavlink/c_library_v2.git /usr/local/include/mavlink/v2.0 && \
+    cd /usr/local/include/mavlink/v2.0 && git checkout -q f03d91ae932dd718d81f851b584dbd21cffafdd2 && \
+    rm -rf /usr/local/include/mavlink/v2.0/.git
 
 WORKDIR /px4_sitl_gazebo
 COPY . .
 
 SHELL ["/bin/bash", "-c"]
 
-RUN source /opt/ros/humble/setup.bash && \
+RUN source /opt/ros/galactic/setup.bash && \
     mkdir -p build && \
     cd build && \
     cmake .. && \