Commit 10ef66ad authored by Guilhem Saurel's avatar Guilhem Saurel Committed by Olivier Stasse
Browse files

[Docker] download ROS key in http

while here, check both fingerprints, and run everything in one layer
parent c1c38957
......@@ -4,16 +4,18 @@ FROM nvidia/opengl:1.0-glvnd-runtime-ubuntu${UBUNTU_VERSION}
ARG UBUNTU=bionic
ARG ROS_DISTRO=melodic
# ROS packages
RUN apt-get update -qqy && DEBIAN_FRONTEND=noninteractive apt-get install -qqy gnupg2 && rm -rf /var/lib/apt/lists \
# ROS & robotpkg packages repository
ENV ROS_KEY=C1CF6E31E6BADE8868B172B4F42ED6FBAB17C654 ROBOTPKG_KEY=F6F93D4D425860C0B0FBE848ADD535E05E56C3FD
ADD http://repo.ros2.org/repos.key http://robotpkg.openrobots.org/packages/debian/robotpkg.key /
RUN apt-get update -qqy && apt-get install -qqy gnupg2 && rm -rf /var/lib/apt/lists \
&& echo "deb http://packages.ros.org/ros/ubuntu ${UBUNTU} main" > /etc/apt/sources.list.d/ros-latest.list \
&& apt-key adv --keyserver hkp://ha.pool.sks-keyservers.net:80 --recv-key C1CF6E31E6BADE8868B172B4F42ED6FBAB17C654
# robotpkg packages
ADD http://robotpkg.openrobots.org/packages/debian/robotpkg.key /
RUN echo "deb [arch=amd64] http://robotpkg.openrobots.org/wip/packages/debian/pub ${UBUNTU} robotpkg" > /etc/apt/sources.list.d/robotpkg.list \
&& echo "deb [arch=amd64] http://robotpkg.openrobots.org/wip/packages/debian/pub ${UBUNTU} robotpkg" > /etc/apt/sources.list.d/robotpkg.list \
&& echo "deb [arch=amd64] http://robotpkg.openrobots.org/packages/debian/pub ${UBUNTU} robotpkg" >> /etc/apt/sources.list.d/robotpkg.list \
&& apt-key add /robotpkg.key
&& export GNUPGHOME=$(mktemp -d) \
&& gpg2 --import-options import-show /repos.key | grep -q $ROS_KEY \
&& gpg2 --import-options import-show /robotpkg.key | grep -q $ROBOTPKG_KEY \
&& rm -rf $GNUPGHOME \
&& apt-key add /repos.key /robotpkg.key
# environment helpers
ENV ROS_PREFIX=/opt/ros/${ROS_DISTRO} ROBOTPKG_BASE=/opt/openrobots
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment