Skip to content

Commit

Permalink
Bump micro-ROS Agent Jazzy
Browse files Browse the repository at this point in the history
  • Loading branch information
pablogs9 committed May 31, 2024
1 parent ab64bed commit 452ecee
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 11 deletions.
12 changes: 7 additions & 5 deletions .github/workflows/generate_agent_docker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,21 +19,23 @@ jobs:
branch: iron
- ros_distribution: rolling
branch: rolling
- ros_distribution: jazzy
branch: jazzy
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
ref: ${{ matrix.branch }}
- name: Set up QEMU
uses: docker/setup-qemu-action@v1
uses: docker/setup-qemu-action@v3
- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v1
uses: docker/setup-buildx-action@v3
- name: Login to DockerHub
uses: docker/login-action@v1
uses: docker/login-action@v3
with:
username: ${{ secrets.DOCKERHUB_USERNAME }}
password: ${{ secrets.DOCKERHUB_TOKEN }}
- name: Build and push
uses: docker/build-push-action@v2
uses: docker/build-push-action@v5
with:
context: ./micro-ROS-Agent/
push: true
Expand Down
12 changes: 6 additions & 6 deletions micro-ROS-Agent/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
FROM microros/base:rolling AS micro-ros-agent-builder
FROM ros:jazzy AS micro-ros-agent-builder

ARG DEBIAN_FRONTEND=noninteractive
WORKDIR /uros_ws
RUN . /opt/ros/$ROS_DISTRO/setup.sh \
&& . install/local_setup.sh \
&& apt update \
&& ros2 run micro_ros_setup create_agent_ws.sh \
&& ros2 run micro_ros_setup build_agent.sh \
&& git clone -b $ROS_DISTRO https://github.com/micro-ROS/micro_ros_msgs src/micro_ros_msgs \
&& git clone -b $ROS_DISTRO https://github.com/micro-ROS/micro-ROS-Agent src/micro-ROS-Agent \
&& colcon build \
&& rm -rf log/ build/ src/

FROM ros:rolling-ros-core
FROM ros:jazzy-ros-core

COPY --from=micro-ros-agent-builder /uros_ws /uros_ws

Expand Down

0 comments on commit 452ecee

Please sign in to comment.