Skip to content

Commit 022f91b

Browse files
TSC21TSC21
committed
bump base container tags to 2021-05-31
1 parent 572eefb commit 022f91b

14 files changed

+22
-14
lines changed

‎docker/Dockerfile_clang

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
# px4-dev-base + latest clang
44
#
55

6-
FROM px4io/px4-dev-base-bionic:2021-05-27
6+
FROM px4io/px4-dev-base-bionic:2021-05-31
77
LABEL maintainer="Daniel Agar <[email protected]>"
88

99
RUN wget --quiet http://apt.llvm.org/llvm-snapshot.gpg.key -O - | apt-key add - \

‎docker/Dockerfile_nuttx-bionic

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# PX4 NuttX development environment in Ubuntu 18.04 Bionic
33
#
44

5-
FROM px4io/px4-dev-base-bionic:2021-05-27
5+
FROM px4io/px4-dev-base-bionic:2021-05-31
66
LABEL maintainer="Daniel Agar <[email protected]>"
77

88
RUN apt-get update \

‎docker/Dockerfile_nuttx-focal

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# PX4 NuttX development environment in Ubuntu 20.04 Focal
33
#
44

5-
FROM px4io/px4-dev-base-focal:2021-05-27
5+
FROM px4io/px4-dev-base-focal:2021-05-31
66
LABEL maintainer="Daniel Agar <[email protected]>"
77

88
RUN apt-get update \

‎docker/Dockerfile_nuttx_clang

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# PX4 Clang + NuttX development environment
33
#
44

5-
FROM px4io/px4-dev-clang:2021-05-27
5+
FROM px4io/px4-dev-clang:2021-05-31
66

77
RUN dpkg --add-architecture i386 \
88
&& apt-get update \

‎docker/Dockerfile_raspi

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
# Raspberry Pi or Parrot Bebop
66
#
77

8-
FROM px4io/px4-dev-base-bionic:2021-05-27
8+
FROM px4io/px4-dev-base-bionic:2021-05-31
99
LABEL maintainer="Michael Schaeuble"
1010

1111
RUN apt-get update \

‎docker/Dockerfile_ros-melodic

+5-1
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,17 @@
22
# PX4 ROS development environment
33
#
44

5-
FROM px4io/px4-dev-simulation-bionic:2021-05-27
5+
FROM px4io/px4-dev-simulation-bionic:2021-05-31
66
LABEL maintainer="Nuno Marques <[email protected]>"
77

88
ENV ROS_DISTRO melodic
99

1010
# setup ros keys
11+
<<<<<<< HEAD
1112
RUN curl -s https://raw.githubusercontent.com/ros/rosdistro/master/ros.asc | apt-key add -
13+
=======
14+
RUN curl -s https://raw.githubusercontent.com/ros/rosdistro/master/ros.asc | sudo apt-key add -
15+
>>>>>>> bump base container tag to 2021-05-31
1216

1317
RUN sh -c 'echo "deb http://packages.ros.org/ros/ubuntu `lsb_release -sc` main" > /etc/apt/sources.list.d/ros-latest.list' \
1418
&& sh -c 'echo "deb http://packages.ros.org/ros-shadow-fixed/ubuntu `lsb_release -sc` main" > /etc/apt/sources.list.d/ros-shadow.list' \

‎docker/Dockerfile_ros-noetic

+5-1
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,17 @@
22
# PX4 ROS development environment
33
#
44

5-
FROM px4io/px4-dev-simulation-focal:2021-05-27
5+
FROM px4io/px4-dev-simulation-focal:2021-05-31
66
LABEL maintainer="Nuno Marques <[email protected]>"
77

88
ENV ROS_DISTRO noetic
99

1010
# setup ros keys
11+
<<<<<<< HEAD
1112
RUN curl -s https://raw.githubusercontent.com/ros/rosdistro/master/ros.asc | apt-key add -
13+
=======
14+
RUN curl -s https://raw.githubusercontent.com/ros/rosdistro/master/ros.asc | sudo apt-key add -
15+
>>>>>>> bump base container tag to 2021-05-31
1216

1317
RUN sh -c 'echo "deb http://packages.ros.org/ros/ubuntu `lsb_release -sc` main" > /etc/apt/sources.list.d/ros-latest.list' \
1418
&& sh -c 'echo "deb http://packages.ros.org/ros/ubuntu `lsb_release -sc` main" > /etc/apt/sources.list.d/ros-latest.list' \

‎docker/Dockerfile_ros2-dashing

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
# Based from container under https://github.com/osrf/docker_images/tree/master/ros2/source/devel
44
#
55

6-
FROM px4io/px4-dev-ros-melodic:2021-05-27
6+
FROM px4io/px4-dev-ros-melodic:2021-05-31
77
LABEL maintainer="Nuno Marques <[email protected]>"
88

99
# setup environment

‎docker/Dockerfile_ros2-eloquent

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
# Based from container under https://github.com/osrf/docker_images/tree/master/ros2/source/devel
44
#
55

6-
FROM px4io/px4-dev-ros-melodic:2021-05-27
6+
FROM px4io/px4-dev-ros-melodic:2021-05-31
77
LABEL maintainer="Nuno Marques <[email protected]>"
88

99
# setup environment

‎docker/Dockerfile_ros2-foxy

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
# Based from container under https://github.com/osrf/docker_images/tree/master/ros2/source/devel
44
#
55

6-
FROM px4io/px4-dev-ros-noetic:2021-05-27
6+
FROM px4io/px4-dev-ros-noetic:2021-05-31
77
LABEL maintainer="Nuno Marques <[email protected]>"
88

99
# setup environment

‎docker/Dockerfile_ros2-galactic

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
# Based from container under https://github.com/osrf/docker_images/tree/master/ros2/source/devel
44
#
55

6-
FROM px4io/px4-dev-base-focal:2021-05-27
6+
FROM px4io/px4-dev-base-focal:2021-05-31
77
LABEL maintainer="Nuno Marques <[email protected]>"
88

99
# setup environment

‎docker/Dockerfile_ros2-rolling

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
# stable distribution." - in https://docs.ros.org/en/foxy/Releases/Release-Rolling-Ridley.html
99
#
1010

11-
FROM px4io/px4-dev-base-focal:2021-05-27
11+
FROM px4io/px4-dev-base-focal:2021-05-31
1212
LABEL maintainer="Nuno Marques <[email protected]>"
1313

1414
# setup environment

‎docker/Dockerfile_simulation-bionic

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# PX4 Gazebo 9 development environment in Ubuntu 18.04 Bionic
33
#
44

5-
FROM px4io/px4-dev-base-bionic:2021-05-27
5+
FROM px4io/px4-dev-base-bionic:2021-05-31
66
LABEL maintainer="Daniel Agar <[email protected]>"
77

88
RUN wget --quiet http://packages.osrfoundation.org/gazebo.key -O - | apt-key add - \

‎docker/Dockerfile_simulation-focal

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# PX4 Gazebo 11 development environment in Ubuntu 20.04 Focal
33
#
44

5-
FROM px4io/px4-dev-base-focal:2021-05-27
5+
FROM px4io/px4-dev-base-focal:2021-05-31
66
LABEL maintainer="Nuno Marques <[email protected]>"
77

88
RUN wget --quiet http://packages.osrfoundation.org/gazebo.key -O - | apt-key add - \

0 commit comments

Comments
 (0)