update bases to a later container date

PX4 · May 16, 2024 · d9d7d51 · d9d7d51
1 parent 0cd6197
commit d9d7d51
Show file tree

Hide file tree

Showing 11 changed files with 54 additions and 21 deletions.
diff --git a/docker/Dockerfile_clang b/docker/Dockerfile_clang
@@ -3,7 +3,7 @@
 #  px4-dev-base + latest clang
 #
 
-FROM px4io/px4-dev-base-bionic:2021-09-08
+FROM px4io/px4-dev-base-bionic:2024-04-04
 LABEL maintainer="Daniel Agar <[email protected]>"
 
 RUN wget --quiet http://apt.llvm.org/llvm-snapshot.gpg.key -O - | apt-key add - \

diff --git a/docker/Dockerfile_nuttx-bionic b/docker/Dockerfile_nuttx-bionic
@@ -2,7 +2,7 @@
 # PX4 NuttX development environment in Ubuntu 18.04 Bionic
 #
 
-FROM px4io/px4-dev-base-bionic:2021-09-08
+FROM px4io/px4-dev-base-bionic:2024-04-04
 LABEL maintainer="Daniel Agar <[email protected]>"
 
 RUN apt-get update \

diff --git a/docker/Dockerfile_nuttx-focal b/docker/Dockerfile_nuttx-focal
@@ -2,7 +2,7 @@
 # PX4 NuttX development environment in Ubuntu 20.04 Focal
 #
 
-FROM px4io/px4-dev-base-focal:2021-09-08
+FROM px4io/px4-dev-base-focal:2024-04-04
 LABEL maintainer="Daniel Agar <[email protected]>"
 
 RUN apt-get update \

diff --git a/docker/Dockerfile_nuttx_clang b/docker/Dockerfile_nuttx_clang
@@ -2,7 +2,7 @@
 # PX4 Clang + NuttX development environment
 #
 
-FROM px4io/px4-dev-clang:2021-09-08
+FROM px4io/px4-dev-clang:2024-04-04
 
 RUN dpkg --add-architecture i386 \
 	&& apt-get update \

diff --git a/docker/Dockerfile_raspi b/docker/Dockerfile_raspi
@@ -5,7 +5,7 @@
 # Raspberry Pi or Parrot Bebop
 #
 
-FROM px4io/px4-dev-base-bionic:2021-09-08
+FROM px4io/px4-dev-base-bionic:2024-04-04
 LABEL maintainer="Michael Schaeuble"
 
 RUN apt-get update \

diff --git a/docker/Dockerfile_ros-noetic b/docker/Dockerfile_ros-noetic
@@ -2,7 +2,7 @@
 # PX4 ROS development environment
 #
 
-FROM px4io/px4-dev-simulation-focal:2021-09-08
+FROM px4io/px4-dev-simulation-focal:2024-04-04
 LABEL maintainer="Nuno Marques <[email protected]>"
 
 ENV ROS_DISTRO noetic

diff --git a/docker/Dockerfile_ros2-foxy b/docker/Dockerfile_ros2-foxy
@@ -3,7 +3,7 @@
 # Based from container under https://github.com/osrf/docker_images/tree/master/ros2/source/devel
 #
 
-FROM px4io/px4-dev-ros-noetic:2021-09-08
+FROM px4io/px4-dev-ros-noetic:2024-04-04
 LABEL maintainer="Nuno Marques <[email protected]>"
 
 # setup environment

diff --git a/docker/Dockerfile_ros2-galactic b/docker/Dockerfile_ros2-galactic
@@ -3,7 +3,7 @@
 # Based from container under https://github.com/osrf/docker_images/tree/master/ros2/source/devel
 #
 
-FROM px4io/px4-dev-base-focal:2021-09-08
+FROM px4io/px4-dev-base-focal:2024-04-04
 LABEL maintainer="Nuno Marques <[email protected]>"
 
 # setup environment

diff --git a/docker/Dockerfile_ros2-rolling b/docker/Dockerfile_ros2-rolling
@@ -8,7 +8,7 @@
 # stable distribution." - in https://docs.ros.org/en/foxy/Releases/Release-Rolling-Ridley.html
 #
 
-FROM px4io/px4-dev-base-focal:2021-09-08
+FROM px4io/px4-dev-base-focal:2024-04-04
 LABEL maintainer="Nuno Marques <[email protected]>"
 
 # setup environment

diff --git a/docker/Dockerfile_simulation-bionic b/docker/Dockerfile_simulation-bionic
@@ -27,19 +27,52 @@ RUN wget --quiet http://packages.osrfoundation.org/gazebo.key -O - | apt-key add
 	&& apt-get clean autoclean \
 	&& rm -rf /var/lib/apt/lists/{apt,dpkg,cache,log} /tmp/* /var/tmp/*
 
+# Install dependencies for building Ignition Edifice from source
+RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get -y install \
+		build-essential \
+		libbz2-dev \
+		libcurl4-openssl-dev \
+		libdw-dev \
+		libfreeimage-dev \
+		libgflags-dev \
+		libglew-dev \
+		libglm-dev \
+		libgts-dev \
+		libjansson-dev \
+		libprotobuf-dev \
+		libogre-1.9-dev \
+		libogre-2.1-dev \
+		libsqlite3-dev \
+		libswscale-dev \
+		libtinyxml2-dev \
+		libwebsockets-dev \
+		python3 \
+		libignition-gui5-dev \
+		qtbase5-dev \
+		qtdeclarative5-dev \
+		qtquickcontrols2-5-dev \
+		ruby-ronn \
+		uuid-dev \
+	&& apt-get -y autoremove \
+    && apt-get clean autoclean \
+    && rm -rf /var/lib/apt/lists/{apt,dpkg,cache,log} /tmp/* /var/tmp/*
+
 # Clone, build and install Ignition Edifice and libraries
 RUN for repo in \
-		ign-cmake:ignition-cmake2_2.6.1 \
-		ign-common:ignition-common3_3.11.1 \
-		ign-math:ignition-math6_6.7.0 \
-		ign-tools:ignition-tools1_1.2.0 \
-		ign-transport:ignition-transport9_9.3.0 \
-		ign-fuel-tools:ignition-fuel-tools6_6.5.0 \
-		ign-gui:ignition-gui4_4.7.0 \
-		ign-rendering:ignition-rendering4_4.8.0 \
-		ign-physics:ignition-physics4_4.5.0 \
-		ign-sensors:ignition-sensors4_4.5.0 \
-		ign-gazebo:ignition-gazebo4_4.8.0; \
+		ign-cmake:ignition-cmake2_2.7.0 \
+		ign-common:ignition-common4_4.0.0 \
+		ign-math:ignition-math6_6.8.0 \
+		ign-msgs:ignition-msgs7_7.0.0 \
+		ign-plugin:ignition-plugin_1.2.0 \
+		ign-launch:ignition-launch4_4.0.0 \
+		ign-transport:ignition-transport10_10.0.0 \
+		ign-fuel-tools:ignition-fuel-tools6_6.0.0 \
+		ign-gui:ignition-gui5_5.0.0 \
+		ign-rendering:ignition-rendering5_5.0.0 \
+		ign-physics:ignition-physics4_4.0.0 \
+		ign-sensors:ignition-sensors5_5.0.0 \
+		ign-gazebo:ignition-gazebo5_5.0.0 \
+		ign-tools:ignition-tools_1.1.0; \
 	do \
 		cd /root; \
 		repo_name=$(echo $repo | cut -d: -f1); \

diff --git a/docker/Dockerfile_simulation-focal b/docker/Dockerfile_simulation-focal
@@ -2,7 +2,7 @@
 # PX4 Gazebo 11 development environment in Ubuntu 20.04 Focal
 #
 
-FROM px4io/px4-dev-base-focal:2021-09-08
+FROM px4io/px4-dev-base-focal:2024-04-04
 LABEL maintainer="Nuno Marques <[email protected]>"
 
 RUN wget --quiet http://packages.osrfoundation.org/gazebo.key -O - | apt-key add - \