From 5c6b8d7dd4e89f9cdb1fa95920b39a912c26b02e Mon Sep 17 00:00:00 2001 From: Jari Hodju Date: Tue, 3 Oct 2023 11:52:09 +0300 Subject: [PATCH] Use a base image with both proxy clients --- .github/workflows/tii-gremsy.yaml | 2 +- Dockerfile | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/tii-gremsy.yaml b/.github/workflows/tii-gremsy.yaml index 9e3574f..cfe749c 100644 --- a/.github/workflows/tii-gremsy.yaml +++ b/.github/workflows/tii-gremsy.yaml @@ -18,7 +18,7 @@ jobs: submodules: recursive - name: Setup QEMU - uses: docker/setup-qemu-action@v2 + uses: docker/setup-qemu-action@v3 with: platforms: amd64,riscv64,arm64 diff --git a/Dockerfile b/Dockerfile index 9459c4f..96a0b06 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM --platform=${BUILDPLATFORM:-linux/amd64} ghcr.io/tiiuae/fog-ros-sdk:v3.0.0-${TARGETARCH:-amd64} AS builder +FROM --platform=${BUILDPLATFORM:-linux/amd64} ghcr.io/tiiuae/fog-ros-sdk:sha-ba8047f-${TARGETARCH:-amd64} AS builder # Must be defined another time after "FROM" keyword. ARG TARGETARCH @@ -15,7 +15,7 @@ RUN /packaging/build_colcon_sdk.sh ${TARGETARCH:-amd64} # ▲ runtime ──┐ # └── build ▼ -FROM ghcr.io/tiiuae/fog-ros-baseimage:v3.0.0 +FROM ghcr.io/tiiuae/fog-ros-baseimage:sha-ba8047f # ENTRYPOINT exec ros-with-env ros2 run ros2_gremsy gremsy_node --ros-args --remap __ns:=/$DRONE_DEVICE_ID -p com_port:=/dev/ttyUSB0 ENTRYPOINT [ "/entrypoint.sh" ]