From 4d18df182cfd55849ff4ac300980105c4687d566 Mon Sep 17 00:00:00 2001
From: Manuel Segarra-Abad <manuel.segarra-abad@unikie.com>
Date: Mon, 2 May 2022 13:29:31 +0300
Subject: [PATCH] Use more generic name for the tag suffix number

---
 .github/workflows/main.yaml | 3 ++-
 Dockerfile                  | 4 ++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml
index e29e424d..33fa45f7 100644
--- a/.github/workflows/main.yaml
+++ b/.github/workflows/main.yaml
@@ -21,8 +21,9 @@ jobs:
       - name: Set image tag format with suffix
         # it is possible that run_number should be used instead run_attempt
         # run_attempt is unique number on every run and run_attempt resets to 1 if re-build is not used
+        # content of image_sha_tag_suffix is defined in fog-ros-baseimage dispatcher workflow.
         run: |
-          echo "IMAGE_TAG_FORMAT=type=sha,suffix=-${{ github.event.client_payload.run_attempt }}" >> $GITHUB_ENV
+          echo "IMAGE_TAG_FORMAT=type=sha,suffix=-${{ github.event.client_payload.image_sha_tag_suffix }}" >> $GITHUB_ENV
         if: github.event_name == 'repository_dispatch'
 
       - name: Docker meta
diff --git a/Dockerfile b/Dockerfile
index 59e163ea..43648b23 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -4,7 +4,7 @@ COPY . /main_ws/src/
 
 # this:
 # 1) builds the application
-# 2) packages the application as .deb & writes it to build_output/
+# 2) packages the application as .deb in /main_ws/
 RUN /packaging/build.sh
 
 #  ▲               runtime ──┐
@@ -16,7 +16,7 @@ ENTRYPOINT /entrypoint.sh
 
 COPY entrypoint.sh /entrypoint.sh
 
-COPY --from=builder /main_ws/src/build_output/ros-*-rplidar-ros2_*_amd64.deb /rplidar.deb
+COPY --from=builder /main_ws/ros-*-rplidar-ros2_*_amd64.deb /rplidar.deb
 
 # need update because ROS people have a habit of removing old packages pretty fast
 RUN apt update && apt install -y ros-${ROS_DISTRO}-tf2-ros \