diff --git a/ros/dashing/ubuntu/bionic/ros-core/Dockerfile b/ros/dashing/ubuntu/bionic/ros-core/Dockerfile index 95d7bcc2f..b05284f7e 100644 --- a/ros/dashing/ubuntu/bionic/ros-core/Dockerfile +++ b/ros/dashing/ubuntu/bionic/ros-core/Dockerfile @@ -15,12 +15,12 @@ RUN apt-get update && apt-get install -q -y --no-install-recommends \ gnupg2 \ && rm -rf /var/lib/apt/lists/* -# setup keys -RUN apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys C1CF6E31E6BADE8868B172B4F42ED6FBAB17C654 - # setup sources.list RUN echo "deb http://packages.ros.org/ros2/ubuntu bionic main" > /etc/apt/sources.list.d/ros2-latest.list +# setup keys +RUN apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys C1CF6E31E6BADE8868B172B4F42ED6FBAB17C654 + # setup environment ENV LANG C.UTF-8 ENV LC_ALL C.UTF-8 diff --git a/ros/dashing/ubuntu/bionic/ros1-bridge/Dockerfile b/ros/dashing/ubuntu/bionic/ros1-bridge/Dockerfile index 14e5d4674..b0f620cde 100644 --- a/ros/dashing/ubuntu/bionic/ros1-bridge/Dockerfile +++ b/ros/dashing/ubuntu/bionic/ros1-bridge/Dockerfile @@ -2,18 +2,18 @@ # generated from docker_images_ros2/ros1_bridge/create_ros_ros1_bridge_image.Dockerfile.em FROM ros:dashing-ros-base-bionic -# setup keys -RUN apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys C1CF6E31E6BADE8868B172B4F42ED6FBAB17C654 - # setup sources.list RUN echo "deb http://packages.ros.org/ros/ubuntu bionic main" > /etc/apt/sources.list.d/ros1-latest.list +# setup keys +RUN apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys C1CF6E31E6BADE8868B172B4F42ED6FBAB17C654 + ENV ROS1_DISTRO melodic ENV ROS2_DISTRO dashing # install ros packages RUN apt-get update && apt-get install -y --no-install-recommends \ - ros-melodic-ros-comm=1.14.10-1* \ + ros-melodic-ros-comm=1.14.11-1* \ ros-melodic-roscpp-tutorials=0.9.3-1* \ ros-melodic-rospy-tutorials=0.9.3-1* \ && rm -rf /var/lib/apt/lists/* diff --git a/ros/foxy/ubuntu/focal/ros-core/Dockerfile b/ros/foxy/ubuntu/focal/ros-core/Dockerfile index fc6c1fc7c..8b6bbfb30 100644 --- a/ros/foxy/ubuntu/focal/ros-core/Dockerfile +++ b/ros/foxy/ubuntu/focal/ros-core/Dockerfile @@ -15,12 +15,12 @@ RUN apt-get update && apt-get install -q -y --no-install-recommends \ gnupg2 \ && rm -rf /var/lib/apt/lists/* -# setup keys -RUN apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys C1CF6E31E6BADE8868B172B4F42ED6FBAB17C654 - # setup sources.list RUN echo "deb http://packages.ros.org/ros2/ubuntu focal main" > /etc/apt/sources.list.d/ros2-latest.list +# setup keys +RUN apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys C1CF6E31E6BADE8868B172B4F42ED6FBAB17C654 + # setup environment ENV LANG C.UTF-8 ENV LC_ALL C.UTF-8 diff --git a/ros/foxy/ubuntu/focal/ros1-bridge/Dockerfile b/ros/foxy/ubuntu/focal/ros1-bridge/Dockerfile index 4425b417c..b0f6d56e9 100644 --- a/ros/foxy/ubuntu/focal/ros1-bridge/Dockerfile +++ b/ros/foxy/ubuntu/focal/ros1-bridge/Dockerfile @@ -2,12 +2,12 @@ # generated from docker_images_ros2/ros1_bridge/create_ros_ros1_bridge_image.Dockerfile.em FROM ros:foxy-ros-base-focal -# setup keys -RUN apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys C1CF6E31E6BADE8868B172B4F42ED6FBAB17C654 - # setup sources.list RUN echo "deb http://packages.ros.org/ros/ubuntu focal main" > /etc/apt/sources.list.d/ros1-latest.list +# setup keys +RUN apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys C1CF6E31E6BADE8868B172B4F42ED6FBAB17C654 + ENV ROS1_DISTRO noetic ENV ROS2_DISTRO foxy diff --git a/ros/galactic/ubuntu/focal/ros-core/Dockerfile b/ros/galactic/ubuntu/focal/ros-core/Dockerfile index d91c1edef..dece158a9 100644 --- a/ros/galactic/ubuntu/focal/ros-core/Dockerfile +++ b/ros/galactic/ubuntu/focal/ros-core/Dockerfile @@ -15,12 +15,12 @@ RUN apt-get update && apt-get install -q -y --no-install-recommends \ gnupg2 \ && rm -rf /var/lib/apt/lists/* -# setup keys -RUN apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys C1CF6E31E6BADE8868B172B4F42ED6FBAB17C654 - # setup sources.list RUN echo "deb http://packages.ros.org/ros2/ubuntu focal main" > /etc/apt/sources.list.d/ros2-latest.list +# setup keys +RUN apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys C1CF6E31E6BADE8868B172B4F42ED6FBAB17C654 + # setup environment ENV LANG C.UTF-8 ENV LC_ALL C.UTF-8 diff --git a/ros/galactic/ubuntu/focal/ros1-bridge/Dockerfile b/ros/galactic/ubuntu/focal/ros1-bridge/Dockerfile index f367e4a9d..80cd3534a 100644 --- a/ros/galactic/ubuntu/focal/ros1-bridge/Dockerfile +++ b/ros/galactic/ubuntu/focal/ros1-bridge/Dockerfile @@ -2,12 +2,12 @@ # generated from docker_images_ros2/ros1_bridge/create_ros_ros1_bridge_image.Dockerfile.em FROM ros:galactic-ros-base-focal -# setup keys -RUN apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys C1CF6E31E6BADE8868B172B4F42ED6FBAB17C654 - # setup sources.list RUN echo "deb http://packages.ros.org/ros/ubuntu focal main" > /etc/apt/sources.list.d/ros1-latest.list +# setup keys +RUN apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys C1CF6E31E6BADE8868B172B4F42ED6FBAB17C654 + ENV ROS1_DISTRO noetic ENV ROS2_DISTRO galactic diff --git a/ros/kinetic/ubuntu/xenial/ros-core/Dockerfile b/ros/kinetic/ubuntu/xenial/ros-core/Dockerfile index d030f14a6..112c98423 100644 --- a/ros/kinetic/ubuntu/xenial/ros-core/Dockerfile +++ b/ros/kinetic/ubuntu/xenial/ros-core/Dockerfile @@ -8,12 +8,12 @@ RUN apt-get update && apt-get install -q -y --no-install-recommends \ gnupg2 \ && rm -rf /var/lib/apt/lists/* -# setup keys -RUN apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys C1CF6E31E6BADE8868B172B4F42ED6FBAB17C654 - # setup sources.list RUN echo "deb http://packages.ros.org/ros/ubuntu xenial main" > /etc/apt/sources.list.d/ros1-latest.list +# setup keys +RUN apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys C1CF6E31E6BADE8868B172B4F42ED6FBAB17C654 + # setup environment ENV LANG C.UTF-8 ENV LC_ALL C.UTF-8 diff --git a/ros/melodic/ubuntu/bionic/ros-core/Dockerfile b/ros/melodic/ubuntu/bionic/ros-core/Dockerfile index a7e316a18..1a55916ad 100644 --- a/ros/melodic/ubuntu/bionic/ros-core/Dockerfile +++ b/ros/melodic/ubuntu/bionic/ros-core/Dockerfile @@ -15,12 +15,12 @@ RUN apt-get update && apt-get install -q -y --no-install-recommends \ gnupg2 \ && rm -rf /var/lib/apt/lists/* -# setup keys -RUN apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys C1CF6E31E6BADE8868B172B4F42ED6FBAB17C654 - # setup sources.list RUN echo "deb http://packages.ros.org/ros/ubuntu bionic main" > /etc/apt/sources.list.d/ros1-latest.list +# setup keys +RUN apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys C1CF6E31E6BADE8868B172B4F42ED6FBAB17C654 + # setup environment ENV LANG C.UTF-8 ENV LC_ALL C.UTF-8 diff --git a/ros/noetic/debian/buster/ros-core/Dockerfile b/ros/noetic/debian/buster/ros-core/Dockerfile index 830522fb9..8f8345c7a 100644 --- a/ros/noetic/debian/buster/ros-core/Dockerfile +++ b/ros/noetic/debian/buster/ros-core/Dockerfile @@ -8,12 +8,12 @@ RUN apt-get update && apt-get install -q -y --no-install-recommends \ gnupg2 \ && rm -rf /var/lib/apt/lists/* -# setup keys -RUN apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys C1CF6E31E6BADE8868B172B4F42ED6FBAB17C654 - # setup sources.list RUN echo "deb http://packages.ros.org/ros/ubuntu buster main" > /etc/apt/sources.list.d/ros1-latest.list +# setup keys +RUN apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys C1CF6E31E6BADE8868B172B4F42ED6FBAB17C654 + # setup environment ENV LANG C.UTF-8 ENV LC_ALL C.UTF-8 diff --git a/ros/noetic/ubuntu/focal/ros-core/Dockerfile b/ros/noetic/ubuntu/focal/ros-core/Dockerfile index d526d145c..cb598df7d 100644 --- a/ros/noetic/ubuntu/focal/ros-core/Dockerfile +++ b/ros/noetic/ubuntu/focal/ros-core/Dockerfile @@ -15,12 +15,12 @@ RUN apt-get update && apt-get install -q -y --no-install-recommends \ gnupg2 \ && rm -rf /var/lib/apt/lists/* -# setup keys -RUN apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys C1CF6E31E6BADE8868B172B4F42ED6FBAB17C654 - # setup sources.list RUN echo "deb http://packages.ros.org/ros/ubuntu focal main" > /etc/apt/sources.list.d/ros1-latest.list +# setup keys +RUN apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys C1CF6E31E6BADE8868B172B4F42ED6FBAB17C654 + # setup environment ENV LANG C.UTF-8 ENV LC_ALL C.UTF-8 diff --git a/ros/rolling/ubuntu/focal/ros-core/Dockerfile b/ros/rolling/ubuntu/focal/ros-core/Dockerfile index 81a509ca6..78459ea95 100644 --- a/ros/rolling/ubuntu/focal/ros-core/Dockerfile +++ b/ros/rolling/ubuntu/focal/ros-core/Dockerfile @@ -15,12 +15,12 @@ RUN apt-get update && apt-get install -q -y --no-install-recommends \ gnupg2 \ && rm -rf /var/lib/apt/lists/* -# setup keys -RUN apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys C1CF6E31E6BADE8868B172B4F42ED6FBAB17C654 - # setup sources.list RUN echo "deb http://packages.ros.org/ros2/ubuntu focal main" > /etc/apt/sources.list.d/ros2-latest.list +# setup keys +RUN apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys C1CF6E31E6BADE8868B172B4F42ED6FBAB17C654 + # setup environment ENV LANG C.UTF-8 ENV LC_ALL C.UTF-8 diff --git a/ros/rolling/ubuntu/focal/ros1-bridge/Dockerfile b/ros/rolling/ubuntu/focal/ros1-bridge/Dockerfile index b11c4fe63..efdf2e0d1 100644 --- a/ros/rolling/ubuntu/focal/ros1-bridge/Dockerfile +++ b/ros/rolling/ubuntu/focal/ros1-bridge/Dockerfile @@ -2,12 +2,12 @@ # generated from docker_images_ros2/ros1_bridge/create_ros_ros1_bridge_image.Dockerfile.em FROM ros:rolling-ros-base-focal -# setup keys -RUN apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys C1CF6E31E6BADE8868B172B4F42ED6FBAB17C654 - # setup sources.list RUN echo "deb http://packages.ros.org/ros/ubuntu focal main" > /etc/apt/sources.list.d/ros1-latest.list +# setup keys +RUN apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys C1CF6E31E6BADE8868B172B4F42ED6FBAB17C654 + ENV ROS1_DISTRO noetic ENV ROS2_DISTRO rolling diff --git a/ros/ros b/ros/ros index 18e3e88d6..17ae70770 100644 --- a/ros/ros +++ b/ros/ros @@ -9,7 +9,7 @@ GitRepo: https://github.com/osrf/docker_images.git Tags: kinetic-ros-core, kinetic-ros-core-xenial Architectures: amd64, arm32v7, arm64v8 -GitCommit: df19ab7d5993d3b78a908362cdcd1479a8e78b35 +GitCommit: 11c613986e35a1f36fd0fa18b49173e0c564cf1d Directory: ros/kinetic/ubuntu/xenial/ros-core Tags: kinetic-ros-base, kinetic-ros-base-xenial, kinetic @@ -36,7 +36,7 @@ Directory: ros/kinetic/ubuntu/xenial/perception Tags: melodic-ros-core, melodic-ros-core-bionic Architectures: amd64, arm32v7, arm64v8 -GitCommit: df19ab7d5993d3b78a908362cdcd1479a8e78b35 +GitCommit: 11c613986e35a1f36fd0fa18b49173e0c564cf1d Directory: ros/melodic/ubuntu/bionic/ros-core Tags: melodic-ros-base, melodic-ros-base-bionic, melodic @@ -86,7 +86,7 @@ Directory: ros/melodic/debian/stretch/perception Tags: noetic-ros-core, noetic-ros-core-focal Architectures: amd64, arm32v7, arm64v8 -GitCommit: df19ab7d5993d3b78a908362cdcd1479a8e78b35 +GitCommit: 11c613986e35a1f36fd0fa18b49173e0c564cf1d Directory: ros/noetic/ubuntu/focal/ros-core Tags: noetic-ros-base, noetic-ros-base-focal, noetic @@ -109,7 +109,7 @@ Directory: ros/noetic/ubuntu/focal/perception Tags: noetic-ros-core-buster Architectures: amd64, arm64v8 -GitCommit: df19ab7d5993d3b78a908362cdcd1479a8e78b35 +GitCommit: 11c613986e35a1f36fd0fa18b49173e0c564cf1d Directory: ros/noetic/debian/buster/ros-core Tags: noetic-ros-base-buster @@ -136,7 +136,7 @@ Directory: ros/noetic/debian/buster/perception Tags: dashing-ros-core, dashing-ros-core-bionic Architectures: amd64, arm32v7, arm64v8 -GitCommit: df19ab7d5993d3b78a908362cdcd1479a8e78b35 +GitCommit: 11c613986e35a1f36fd0fa18b49173e0c564cf1d Directory: ros/dashing/ubuntu/bionic/ros-core Tags: dashing-ros-base, dashing-ros-base-bionic, dashing @@ -146,7 +146,7 @@ Directory: ros/dashing/ubuntu/bionic/ros-base Tags: dashing-ros1-bridge, dashing-ros1-bridge-bionic Architectures: amd64, arm32v7, arm64v8 -GitCommit: 0d38100e2fec914106507817e3122d467617e2ee +GitCommit: 11c613986e35a1f36fd0fa18b49173e0c564cf1d Directory: ros/dashing/ubuntu/bionic/ros1-bridge @@ -180,7 +180,7 @@ Directory: ros/eloquent/ubuntu/bionic/ros1-bridge Tags: foxy-ros-core, foxy-ros-core-focal Architectures: amd64, arm64v8 -GitCommit: df19ab7d5993d3b78a908362cdcd1479a8e78b35 +GitCommit: 11c613986e35a1f36fd0fa18b49173e0c564cf1d Directory: ros/foxy/ubuntu/focal/ros-core Tags: foxy-ros-base, foxy-ros-base-focal, foxy, latest @@ -190,7 +190,7 @@ Directory: ros/foxy/ubuntu/focal/ros-base Tags: foxy-ros1-bridge, foxy-ros1-bridge-focal Architectures: amd64, arm64v8 -GitCommit: bf35442257b504eac671418bcb70481807a7fa69 +GitCommit: 11c613986e35a1f36fd0fa18b49173e0c564cf1d Directory: ros/foxy/ubuntu/focal/ros1-bridge @@ -202,7 +202,7 @@ Directory: ros/foxy/ubuntu/focal/ros1-bridge Tags: galactic-ros-core, galactic-ros-core-focal Architectures: amd64, arm64v8 -GitCommit: 6511d8fc0754616550b7f5ea31a40084c2462938 +GitCommit: 11c613986e35a1f36fd0fa18b49173e0c564cf1d Directory: ros/galactic/ubuntu/focal/ros-core Tags: galactic-ros-base, galactic-ros-base-focal, galactic @@ -212,7 +212,7 @@ Directory: ros/galactic/ubuntu/focal/ros-base Tags: galactic-ros1-bridge, galactic-ros1-bridge-focal Architectures: amd64, arm64v8 -GitCommit: 6511d8fc0754616550b7f5ea31a40084c2462938 +GitCommit: 11c613986e35a1f36fd0fa18b49173e0c564cf1d Directory: ros/galactic/ubuntu/focal/ros1-bridge @@ -224,7 +224,7 @@ Directory: ros/galactic/ubuntu/focal/ros1-bridge Tags: rolling-ros-core, rolling-ros-core-focal Architectures: amd64, arm64v8 -GitCommit: a5644adacdca4a49faf10221620048175cdd7262 +GitCommit: 11c613986e35a1f36fd0fa18b49173e0c564cf1d Directory: ros/rolling/ubuntu/focal/ros-core Tags: rolling-ros-base, rolling-ros-base-focal, rolling @@ -234,6 +234,6 @@ Directory: ros/rolling/ubuntu/focal/ros-base Tags: rolling-ros1-bridge, rolling-ros1-bridge-focal Architectures: amd64, arm64v8 -GitCommit: bf35442257b504eac671418bcb70481807a7fa69 +GitCommit: 11c613986e35a1f36fd0fa18b49173e0c564cf1d Directory: ros/rolling/ubuntu/focal/ros1-bridge