From 2bc77bd9fe9ebacda0dd0b38b049d2a33b178530 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ant=C3=B3n=20Casas?= <antoncasas@eprosima.com>
Date: Fri, 11 Apr 2025 11:02:04 +0200
Subject: [PATCH 1/2] Restore arm64 builds (#106)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Test restore linux/arm64 builds on base docker

Signed-off-by: Antón Casas <antoncasas@eprosima.com>

* Test restore linux/arm64 on static library builder docker

Signed-off-by: Antón Casas <antoncasas@eprosima.com>

* Test restore linux/arm64 on agent docker

Signed-off-by: Antón Casas <antoncasas@eprosima.com>

---------

Signed-off-by: Antón Casas <antoncasas@eprosima.com>
---
 .github/workflows/generate_agent_docker.yml  | 2 +-
 .github/workflows/generate_base_docker.yml   | 2 +-
 .github/workflows/generate_libgen_docker.yml | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/generate_agent_docker.yml b/.github/workflows/generate_agent_docker.yml
index 51a3b9d..a709de1 100644
--- a/.github/workflows/generate_agent_docker.yml
+++ b/.github/workflows/generate_agent_docker.yml
@@ -37,5 +37,5 @@ jobs:
         with:
           context: ./micro-ROS-Agent/
           push: true
-          platforms: linux/amd64
+          platforms: linux/amd64,linux/arm64
           tags: microros/micro-ros-agent:${{ matrix.ros_distribution }}
\ No newline at end of file
diff --git a/.github/workflows/generate_base_docker.yml b/.github/workflows/generate_base_docker.yml
index 3ade8a1..e6e3cc6 100644
--- a/.github/workflows/generate_base_docker.yml
+++ b/.github/workflows/generate_base_docker.yml
@@ -37,5 +37,5 @@ jobs:
         with:
           context: ./base/
           push: true
-          platforms: linux/amd64
+          platforms: linux/amd64,linux/arm64
           tags: microros/base:${{ matrix.ros_distribution }}
\ No newline at end of file
diff --git a/.github/workflows/generate_libgen_docker.yml b/.github/workflows/generate_libgen_docker.yml
index 75a1972..d95f5b4 100644
--- a/.github/workflows/generate_libgen_docker.yml
+++ b/.github/workflows/generate_libgen_docker.yml
@@ -37,5 +37,5 @@ jobs:
         with:
           context: ./micro-ROS-static-library-builder/
           push: true
-          platforms: linux/amd64
+          platforms: linux/amd64,linux/arm64
           tags: microros/micro_ros_static_library_builder:${{ matrix.ros_distribution }}
\ No newline at end of file

From 9cf231f64bf07cefa9435af8cf23bd5589ec7312 Mon Sep 17 00:00:00 2001
From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com>
Date: Mon, 15 Sep 2025 16:31:43 +0200
Subject: [PATCH 2/2] Update package.xml (#109) (#112)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

(cherry picked from commit 73cc0daea0c1ef1ac1e0052d864f1bf6064bef27)

Co-authored-by: Antón Casas <antoncasas@eprosima.com>
---
 package.xml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/package.xml b/package.xml
index b5fa4d4..5974cca 100644
--- a/package.xml
+++ b/package.xml
@@ -4,6 +4,7 @@
   <name>micro_ros_dockers</name>
   <version>5.0.0</version>
   <description>Dockerfiles for micro-ROS environments</description>
-  <maintainer email="pablogarrido@eprosima.com">Pablo Garrido</maintainer>
+  <maintainer email="eugeniocollado@eprosima.com">Eugenio Collado</maintainer>
+  <maintainer email="carlosespinoza@eprosima.com">Carlos Espinoza</maintainer>
   <license>Apache License 2.0</license>
 </package>