fix docker ci

IOES-Lab · Jun 5, 2024 · 7131b95 · 7131b95
1 parent 478ebc5
commit 7131b95
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/.docker/jazzy.amd64.dockerfile b/.docker/jazzy.amd64.dockerfile
@@ -1,5 +1,5 @@
-ARG ROS_DISTRO="jazzy"
 FROM osrf/ros:$ROS_DISTRO-desktop-full
+ARG ROS_DISTRO="jazzy"
 ARG BRANCH="ros2"
 
 ADD https://raw.githubusercontent.com/IOES-Lab/dave/$BRANCH/\

diff --git a/.docker/jazzy.arm64v8.dockerfile b/.docker/jazzy.arm64v8.dockerfile
@@ -1,6 +1,6 @@
-ARG ROS_DISTRO="jazzy"
 FROM arm64v8/ubuntu:24.04
 ARG BRANCH="ros2"
+ARG ROS_DISTRO="jazzy"
 
 # update and upgrade libs
 RUN apt-get update \
@@ -34,7 +34,7 @@ ENV ROS_UNDERLAY /root/ws_dave/install
 WORKDIR $ROS_UNDERLAY/../src
 
 ADD https://raw.githubusercontent.com/IOES-Lab/dave/$BRANCH/\
-extras/repos/dave.$ROS_DISTRO.repos dave.repos
+extras/repos/dave.jazzy.repos dave.repos
 RUN vcs import < dave.repos
 
 RUN apt-get update && rosdep update && \

diff --git a/.github/workflows/docker-arm64v8.yml b/.github/workflows/docker-arm64v8.yml
@@ -51,6 +51,7 @@ jobs:
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}
           file: .docker/jazzy.arm64v8.dockerfile
+          platforms: linux/arm64/v8
           build-args: |
             ROS_DISTRO=${{ env.ROS_DISTRO }}
             BRANCH=${{ env.BRANCH }}