[ROS] | Add ros1 noetic#8073
Merged
yosifkit merged 1 commit intodocker-library:masterfrom May 27, 2020
Merged
Conversation
Diff for bc7680c:diff --git a/_bashbrew-cat b/_bashbrew-cat
index 6d90863..5218c46 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -26,6 +26,16 @@ Architectures: amd64, arm64v8
GitCommit: 0b33e61b5bbed5b93b9fba2d5bae5db604ff9b58
Directory: ros/melodic/debian/stretch/ros-core
+Tags: noetic-ros-core, noetic-ros-core-focal
+Architectures: amd64, arm32v7, arm64v8
+GitCommit: bba0ef85a9b417f3815d2cba3b36e7754611a428
+Directory: ros/noetic/ubuntu/focal/ros-core
+
+Tags: noetic-ros-core-buster
+Architectures: amd64, arm64v8
+GitCommit: bba0ef85a9b417f3815d2cba3b36e7754611a428
+Directory: ros/noetic/debian/buster/ros-core
+
Tags: dashing-ros-base, dashing-ros-base-bionic, dashing
Architectures: amd64, arm32v7, arm64v8
GitCommit: 0b33e61b5bbed5b93b9fba2d5bae5db604ff9b58
@@ -51,6 +61,16 @@ Architectures: amd64, arm64v8
GitCommit: 0b33e61b5bbed5b93b9fba2d5bae5db604ff9b58
Directory: ros/melodic/debian/stretch/ros-base
+Tags: noetic-ros-base, noetic-ros-base-focal, noetic
+Architectures: amd64, arm32v7, arm64v8
+GitCommit: cc4e832f92bcac995b9a2c9ca8a7b8fcf85c5c28
+Directory: ros/noetic/ubuntu/focal/ros-base
+
+Tags: noetic-ros-base-buster
+Architectures: amd64, arm64v8
+GitCommit: cc4e832f92bcac995b9a2c9ca8a7b8fcf85c5c28
+Directory: ros/noetic/debian/buster/ros-base
+
Tags: kinetic-perception, kinetic-perception-xenial
Architectures: amd64, arm32v7, arm64v8
GitCommit: 7ff09c2a75e902bc2bb25a1f1ae748ec4e9c7a4b
@@ -80,3 +100,23 @@ Tags: melodic-robot-stretch
Architectures: amd64, arm64v8
GitCommit: 7ff09c2a75e902bc2bb25a1f1ae748ec4e9c7a4b
Directory: ros/melodic/debian/stretch/robot
+
+Tags: noetic-perception, noetic-perception-focal
+Architectures: amd64, arm32v7, arm64v8
+GitCommit: bba0ef85a9b417f3815d2cba3b36e7754611a428
+Directory: ros/noetic/ubuntu/focal/perception
+
+Tags: noetic-perception-buster
+Architectures: amd64, arm64v8
+GitCommit: bba0ef85a9b417f3815d2cba3b36e7754611a428
+Directory: ros/noetic/debian/buster/perception
+
+Tags: noetic-robot, noetic-robot-focal
+Architectures: amd64, arm32v7, arm64v8
+GitCommit: bba0ef85a9b417f3815d2cba3b36e7754611a428
+Directory: ros/noetic/ubuntu/focal/robot
+
+Tags: noetic-robot-buster
+Architectures: amd64, arm64v8
+GitCommit: bba0ef85a9b417f3815d2cba3b36e7754611a428
+Directory: ros/noetic/debian/buster/robot
diff --git a/_bashbrew-list b/_bashbrew-list
index 77ce01f..76990fb 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -31,3 +31,16 @@ ros:melodic-ros-base-stretch
ros:melodic-ros-core
ros:melodic-ros-core-bionic
ros:melodic-ros-core-stretch
+ros:noetic
+ros:noetic-perception
+ros:noetic-perception-buster
+ros:noetic-perception-focal
+ros:noetic-robot
+ros:noetic-robot-buster
+ros:noetic-robot-focal
+ros:noetic-ros-base
+ros:noetic-ros-base-buster
+ros:noetic-ros-base-focal
+ros:noetic-ros-core
+ros:noetic-ros-core-buster
+ros:noetic-ros-core-focal
diff --git a/ros_melodic-perception-bionic/Dockerfile b/ros_noetic-perception-buster/Dockerfile
similarity index 77%
copy from ros_melodic-perception-bionic/Dockerfile
copy to ros_noetic-perception-buster/Dockerfile
index 5fc0a66..1a32080 100644
--- a/ros_melodic-perception-bionic/Dockerfile
+++ b/ros_noetic-perception-buster/Dockerfile
@@ -1,9 +1,9 @@
# This is an auto generated Dockerfile for ros:perception
# generated from docker_images/create_ros_image.Dockerfile.em
-FROM ros:melodic-ros-base-bionic
+FROM ros:noetic-ros-base-buster
# install ros packages
RUN apt-get update && apt-get install -y --no-install-recommends \
- ros-melodic-perception=1.4.1-0* \
+ ros-noetic-perception=1.5.0-1* \
&& rm -rf /var/lib/apt/lists/*
diff --git a/ros_melodic-perception-bionic/Dockerfile b/ros_noetic-perception-focal/Dockerfile
similarity index 77%
copy from ros_melodic-perception-bionic/Dockerfile
copy to ros_noetic-perception-focal/Dockerfile
index 5fc0a66..4ab48ba 100644
--- a/ros_melodic-perception-bionic/Dockerfile
+++ b/ros_noetic-perception-focal/Dockerfile
@@ -1,9 +1,9 @@
# This is an auto generated Dockerfile for ros:perception
# generated from docker_images/create_ros_image.Dockerfile.em
-FROM ros:melodic-ros-base-bionic
+FROM ros:noetic-ros-base-focal
# install ros packages
RUN apt-get update && apt-get install -y --no-install-recommends \
- ros-melodic-perception=1.4.1-0* \
+ ros-noetic-perception=1.5.0-1* \
&& rm -rf /var/lib/apt/lists/*
diff --git a/ros_melodic-robot-bionic/Dockerfile b/ros_noetic-robot-buster/Dockerfile
similarity index 78%
copy from ros_melodic-robot-bionic/Dockerfile
copy to ros_noetic-robot-buster/Dockerfile
index 273b7db..af6f24b 100644
--- a/ros_melodic-robot-bionic/Dockerfile
+++ b/ros_noetic-robot-buster/Dockerfile
@@ -1,9 +1,9 @@
# This is an auto generated Dockerfile for ros:robot
# generated from docker_images/create_ros_image.Dockerfile.em
-FROM ros:melodic-ros-base-bionic
+FROM ros:noetic-ros-base-buster
# install ros packages
RUN apt-get update && apt-get install -y --no-install-recommends \
- ros-melodic-robot=1.4.1-0* \
+ ros-noetic-robot=1.5.0-1* \
&& rm -rf /var/lib/apt/lists/*
diff --git a/ros_melodic-robot-bionic/Dockerfile b/ros_noetic-robot-focal/Dockerfile
similarity index 78%
copy from ros_melodic-robot-bionic/Dockerfile
copy to ros_noetic-robot-focal/Dockerfile
index 273b7db..b087a26 100644
--- a/ros_melodic-robot-bionic/Dockerfile
+++ b/ros_noetic-robot-focal/Dockerfile
@@ -1,9 +1,9 @@
# This is an auto generated Dockerfile for ros:robot
# generated from docker_images/create_ros_image.Dockerfile.em
-FROM ros:melodic-ros-base-bionic
+FROM ros:noetic-ros-base-focal
# install ros packages
RUN apt-get update && apt-get install -y --no-install-recommends \
- ros-melodic-robot=1.4.1-0* \
+ ros-noetic-robot=1.5.0-1* \
&& rm -rf /var/lib/apt/lists/*
diff --git a/ros_melodic-ros-base-stretch/Dockerfile b/ros_noetic-ros-base-buster/Dockerfile
similarity index 77%
copy from ros_melodic-ros-base-stretch/Dockerfile
copy to ros_noetic-ros-base-buster/Dockerfile
index dfb4bc9..badb3df 100644
--- a/ros_melodic-ros-base-stretch/Dockerfile
+++ b/ros_noetic-ros-base-buster/Dockerfile
@@ -1,13 +1,13 @@
# This is an auto generated Dockerfile for ros:ros-base
# generated from docker_images/create_ros_image.Dockerfile.em
-FROM ros:melodic-ros-core-stretch
+FROM ros:noetic-ros-core-buster
# install bootstrap tools
RUN apt-get update && apt-get install --no-install-recommends -y \
build-essential \
- python-rosdep \
- python-rosinstall \
- python-vcstools \
+ python3-rosdep \
+ python3-rosinstall \
+ python3-vcstools \
&& rm -rf /var/lib/apt/lists/*
# bootstrap rosdep
@@ -16,6 +16,6 @@ RUN rosdep init && \
# install ros packages
RUN apt-get update && apt-get install -y --no-install-recommends \
- ros-melodic-ros-base=1.4.1-0* \
+ ros-noetic-ros-base=1.5.0-1* \
&& rm -rf /var/lib/apt/lists/*
diff --git a/ros_kinetic-ros-core-xenial/Dockerfile b/ros_noetic-ros-core-buster/Dockerfile
similarity index 83%
copy from ros_kinetic-ros-core-xenial/Dockerfile
copy to ros_noetic-ros-core-buster/Dockerfile
index d030f14..830522f 100644
--- a/ros_kinetic-ros-core-xenial/Dockerfile
+++ b/ros_noetic-ros-core-buster/Dockerfile
@@ -1,6 +1,6 @@
# This is an auto generated Dockerfile for ros:ros-core
# generated from docker_images/create_ros_core_image.Dockerfile.em
-FROM ubuntu:xenial
+FROM debian:buster
# install packages
RUN apt-get update && apt-get install -q -y --no-install-recommends \
@@ -12,17 +12,17 @@ RUN apt-get update && apt-get install -q -y --no-install-recommends \
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
+RUN echo "deb http://packages.ros.org/ros/ubuntu buster main" > /etc/apt/sources.list.d/ros1-latest.list
# setup environment
ENV LANG C.UTF-8
ENV LC_ALL C.UTF-8
-ENV ROS_DISTRO kinetic
+ENV ROS_DISTRO noetic
# install ros packages
RUN apt-get update && apt-get install -y --no-install-recommends \
- ros-kinetic-ros-core=1.3.2-0* \
+ ros-noetic-ros-core=1.5.0-1* \
&& rm -rf /var/lib/apt/lists/*
# setup entrypoint
diff --git a/ros_kinetic-ros-core-xenial/ros_entrypoint.sh b/ros_noetic-ros-core-buster/ros_entrypoint.sh
similarity index 100%
copy from ros_kinetic-ros-core-xenial/ros_entrypoint.sh
copy to ros_noetic-ros-core-buster/ros_entrypoint.sh
diff --git a/ros_melodic-ros-core-bionic/Dockerfile b/ros_noetic-ros-core-focal/Dockerfile
similarity index 83%
copy from ros_melodic-ros-core-bionic/Dockerfile
copy to ros_noetic-ros-core-focal/Dockerfile
index a7e316a..d526d14 100644
--- a/ros_melodic-ros-core-bionic/Dockerfile
+++ b/ros_noetic-ros-core-focal/Dockerfile
@@ -1,6 +1,6 @@
# This is an auto generated Dockerfile for ros:ros-core
# generated from docker_images/create_ros_core_image.Dockerfile.em
-FROM ubuntu:bionic
+FROM ubuntu:focal
# setup timezone
RUN echo 'Etc/UTC' > /etc/timezone && \
@@ -19,17 +19,17 @@ RUN apt-get update && apt-get install -q -y --no-install-recommends \
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
+RUN echo "deb http://packages.ros.org/ros/ubuntu focal main" > /etc/apt/sources.list.d/ros1-latest.list
# setup environment
ENV LANG C.UTF-8
ENV LC_ALL C.UTF-8
-ENV ROS_DISTRO melodic
+ENV ROS_DISTRO noetic
# install ros packages
RUN apt-get update && apt-get install -y --no-install-recommends \
- ros-melodic-ros-core=1.4.1-0* \
+ ros-noetic-ros-core=1.5.0-1* \
&& rm -rf /var/lib/apt/lists/*
# setup entrypoint
diff --git a/ros_kinetic-ros-core-xenial/ros_entrypoint.sh b/ros_noetic-ros-core-focal/ros_entrypoint.sh
similarity index 100%
copy from ros_kinetic-ros-core-xenial/ros_entrypoint.sh
copy to ros_noetic-ros-core-focal/ros_entrypoint.sh
diff --git a/ros_kinetic/Dockerfile b/ros_noetic/Dockerfile
similarity index 77%
copy from ros_kinetic/Dockerfile
copy to ros_noetic/Dockerfile
index 4836712..7ff1809 100644
--- a/ros_kinetic/Dockerfile
+++ b/ros_noetic/Dockerfile
@@ -1,13 +1,13 @@
# This is an auto generated Dockerfile for ros:ros-base
# generated from docker_images/create_ros_image.Dockerfile.em
-FROM ros:kinetic-ros-core-xenial
+FROM ros:noetic-ros-core-focal
# install bootstrap tools
RUN apt-get update && apt-get install --no-install-recommends -y \
build-essential \
- python-rosdep \
- python-rosinstall \
- python-vcstools \
+ python3-rosdep \
+ python3-rosinstall \
+ python3-vcstools \
&& rm -rf /var/lib/apt/lists/*
# bootstrap rosdep
@@ -16,6 +16,6 @@ RUN rosdep init && \
# install ros packages
RUN apt-get update && apt-get install -y --no-install-recommends \
- ros-kinetic-ros-base=1.3.2-0* \
+ ros-noetic-ros-base=1.5.0-1* \
&& rm -rf /var/lib/apt/lists/*
|
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Related: osrf/docker_images#405