From 664eb3401739b35af47ebc0eafb6a9ca1bb3679c Mon Sep 17 00:00:00 2001 From: Manuel Segarra-Abad Date: Mon, 18 Dec 2023 12:41:02 +0200 Subject: [PATCH] Install chronyc from jfrog apt --- Dockerfile | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/Dockerfile b/Dockerfile index aeeae212..44f2ba72 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,5 @@ # Given dynamically from CI job. -FROM --platform=${BUILDPLATFORM:-linux/amd64} ghcr.io/tiiuae/fog-ros-sdk:v3.0.2-${TARGETARCH:-amd64} AS builder +FROM --platform=${BUILDPLATFORM:-linux/amd64} ghcr.io/tiiuae/fog-ros-sdk:v3.1.0-${TARGETARCH:-amd64} AS builder # Must be defined another time after "FROM" keyword. ARG TARGETARCH @@ -16,7 +16,7 @@ RUN /packaging/build_colcon_sdk.sh ${TARGETARCH:-amd64} # ▲ runtime ──┐ # └── build ▼ -FROM ghcr.io/tiiuae/fog-ros-baseimage:v3.0.2 +FROM ghcr.io/tiiuae/fog-ros-baseimage:v3.1.0 # FIXME: remove after packages are installed from repos ARG TARGETARCH @@ -31,13 +31,14 @@ RUN apt update \ && apt install -y \ prometheus-cpp \ civetweb-cpp \ + chronyc \ && apt clean \ && rm -rf /var/lib/apt/lists/* \ && pip3 install simplejson pystache # FIXME: remove the two following lines -COPY ./debs $SRC_DIR -RUN dpkg -i $SRC_DIR/${TARGETARCH}/*.deb +#COPY ./debs $SRC_DIR +#RUN dpkg -i $SRC_DIR/${TARGETARCH}/*.deb # END-OF-LINES-TO-BE-REMOVED RUN mkdir -p /usr/local/lib \