From dd4a55806cded773123c09581c05d8e23e19221c Mon Sep 17 00:00:00 2001 From: Mehmet Killioglu Date: Wed, 1 Nov 2023 11:23:40 +0200 Subject: [PATCH] Upgrade baseimage to v3.0.2 --- .github/dependabot.yml | 6 ++++++ Dockerfile | 4 ++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/.github/dependabot.yml b/.github/dependabot.yml index ac63c45..c996bec 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -9,6 +9,12 @@ updates: directory: "/" schedule: interval: "daily" + groups: + baseimage-dependencies: + patterns: + - "tiiuae/fog-ros-sdk" + - "tiiuae/fog-ros-baseimage-builder" + - "tiiuae/fog-ros-baseimage" - package-ecosystem: "github-actions" directory: "/" schedule: diff --git a/Dockerfile b/Dockerfile index 3378784..2f5909d 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:sha-79529bc-${TARGETARCH:-amd64} AS builder +FROM --platform=${BUILDPLATFORM:-linux/amd64} ghcr.io/tiiuae/fog-ros-sdk:v3.0.2-${TARGETARCH:-amd64} AS builder # Must be defined another time after "FROM" keyword. ARG TARGETARCH @@ -14,7 +14,7 @@ RUN /packaging/build_colcon_sdk.sh ${TARGETARCH:-amd64} # Even though it is possible to tar the install directory for retrieving it later in runtime image, # the tar extraction in arm64 emulated on arm64 is still slow. So, we copy the install directory instead -FROM ghcr.io/tiiuae/fog-ros-baseimage:sha-79529bc +FROM ghcr.io/tiiuae/fog-ros-baseimage:v3.0.2 HEALTHCHECK --interval=5s \ CMD fog-health check --metric=location_update_count --diff-gte=5.0 \