From 938d0c09fe107e3bd36efa904ef6d2207966e9bb Mon Sep 17 00:00:00 2001 From: Guilhem Saurel <guilhem.saurel@laas.fr> Date: Mon, 15 May 2023 17:34:17 +0200 Subject: [PATCH] simplify robotpkg --- docker/robotpkg/Dockerfile | 17 +++-------------- 1 file changed, 3 insertions(+), 14 deletions(-) diff --git a/docker/robotpkg/Dockerfile b/docker/robotpkg/Dockerfile index fec1106..9963f93 100644 --- a/docker/robotpkg/Dockerfile +++ b/docker/robotpkg/Dockerfile @@ -1,16 +1,5 @@ FROM ubuntu:jammy -# Setup Robotpkg apt binary repository -ADD http://robotpkg.openrobots.org/packages/debian/robotpkg.key / -RUN --mount=type=cache,sharing=locked,target=/var/cache/apt \ - --mount=type=cache,sharing=locked,target=/var/lib/apt \ - apt-get update -y && DEBIAN_FRONTEND=noninteractive apt-get install -qqy --no-install-recommends \ - gnupg2 \ - && gpg --dearmor /robotpkg.key \ - && mv /robotpkg.key.gpg /usr/share/keyrings/robotpkg.gpg \ - && echo "deb [arch=amd64 signed-by=/usr/share/keyrings/robotpkg.gpg] \ - http://robotpkg.openrobots.org/packages/debian/pub jammy robotpkg" \ - >> /etc/apt/sources.list.d/robotpkg.list \ - && echo "deb [arch=amd64 signed-by=/usr/share/keyrings/robotpkg.gpg] \ - http://robotpkg.openrobots.org/wip/packages/debian/pub jammy robotpkg" \ - >> /etc/apt/sources.list.d/robotpkg.list +ADD http://robotpkg.openrobots.org/packages/debian/robotpkg.asc /etc/apt/keyrings/robotpkg.asc +RUN echo "deb [arch=amd64 signed-by=/usr/share/keyrings/robotpkg.asc] http://robotpkg.openrobots.org/wip/packages/debian/pub jammy robotpkg" /etc/apt/sources.list.d/robotpkg.list +RUN echo "deb [arch=amd64 signed-by=/usr/share/keyrings/robotpkg.asc] http://robotpkg.openrobots.org/packages/debian/pub jammy robotpkg" /etc/apt/sources.list.d/robotpkg.list -- GitLab