Skip to content

Commit

Permalink
Install chronyc from jfrog apt
Browse files Browse the repository at this point in the history
  • Loading branch information
maseabunikie committed Dec 18, 2023
1 parent b619829 commit 421ef8a
Showing 1 changed file with 3 additions and 7 deletions.
10 changes: 3 additions & 7 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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
Expand All @@ -31,15 +31,11 @@ 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
# END-OF-LINES-TO-BE-REMOVED

RUN mkdir -p /usr/local/lib \
&& mkdir -p /usr/local/bin

Expand Down

0 comments on commit 421ef8a

Please sign in to comment.