Skip to content

[ros] Swap key active ros images #538

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mikaelarguedas merged 3 commits into from
May 31, 2021
Merged

[ros] Swap key active ros images #538

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
11c6139
swap key and source list file creation to force rebld
mikaelarguedas May 30, 2021
ad0d925
update docker library
mikaelarguedas May 30, 2021
dcd9fcb
update docker library after rebase
mikaelarguedas May 31, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions ros/dashing/ubuntu/bionic/ros-core/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
8 changes: 4 additions & 4 deletions ros/dashing/ubuntu/bionic/ros1-bridge/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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/*
Expand Down
6 changes: 3 additions & 3 deletions ros/foxy/ubuntu/focal/ros-core/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions ros/foxy/ubuntu/focal/ros1-bridge/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
6 changes: 3 additions & 3 deletions ros/galactic/ubuntu/focal/ros-core/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions ros/galactic/ubuntu/focal/ros1-bridge/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
6 changes: 3 additions & 3 deletions ros/kinetic/ubuntu/xenial/ros-core/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions ros/melodic/ubuntu/bionic/ros-core/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions ros/noetic/debian/buster/ros-core/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions ros/noetic/ubuntu/focal/ros-core/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions ros/rolling/ubuntu/focal/ros-core/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions ros/rolling/ubuntu/focal/ros1-bridge/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
24 changes: 12 additions & 12 deletions ros/ros
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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


Expand Down Expand Up @@ -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
Expand All @@ -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


Expand All @@ -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
Expand All @@ -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


Expand All @@ -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
Expand All @@ -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