From c8023384a93b46e863caadd9f2bcb8f4a6118b5c Mon Sep 17 00:00:00 2001
From: Carlos Espinoza Curto <148376273+Carlosespicur@users.noreply.github.com>
Date: Tue, 23 Sep 2025 14:24:16 +0200
Subject: [PATCH 1/2] Change README build steps to use the official ESP-IDF
 image (#300)

* Change README build steps to use the official ESP-IDF image

Signed-off-by: Carlosespicur <carlosespicur@proton.me>

* Apply suggestions

---------

Signed-off-by: Carlosespicur <carlosespicur@proton.me>
(cherry picked from commit 3fb203b8aa7bce3147ea326cbf124db02a865824)

# Conflicts:
#	README.md
---
 README.md | 32 ++++++++++++++++++++++++++++----
 1 file changed, 28 insertions(+), 4 deletions(-)

diff --git a/README.md b/README.md
index 12245db6..3517efe5 100644
--- a/README.md
+++ b/README.md
@@ -53,18 +53,38 @@ Is possible to use a micro-ROS Agent just with this docker command:
 
 ```bash
 # UDPv4 micro-ROS Agent
+<<<<<<< HEAD
 docker run -it --rm --net=host microros/micro-ros-agent:humble udp4 --port 8888 -v6
+=======
+docker run -it --rm --net=host microros/micro-ros-agent:kilted udp4 --port 8888 -v6
+>>>>>>> 3fb203b (Change README build steps to use the official ESP-IDF image (#300))
 ```
 
 ## Build with docker container
 
-It's possible to build this example application using preconfigured docker container. Execute this line to build an example app using docker container:
+It's possible to build this example application using the official Espressif [docker images](https://hub.docker.com/r/espressif/idf), following the same steps:
 
 ```bash
-docker run -it --rm --user espidf --volume="/etc/timezone:/etc/timezone:ro" -v  $(pwd):/micro_ros_espidf_component -v  /dev:/dev --privileged --workdir /micro_ros_espidf_component microros/esp-idf-microros:latest /bin/bash  -c "cd examples/int32_publisher; idf.py menuconfig build flash monitor"
-```
+docker pull espressif/idf:release-v5.2
+# Run ESP-IDF container
+docker run --name micro-ros-espidf-component-test -it espressif/idf:release-v5.2 bash
+
+git clone https://github.com/micro-ROS/micro_ros_espidf_component.git
+cd micro_ros_espidf_component/
+
+# Install dependencies
+pip3 install catkin_pkg lark-parser colcon-common-extensions
 
-Dockerfile for this container is provided in the ./docker directory and available in dockerhub. This approach uses ESP-IDF v5.
+$IDF_PATH/export.sh
+cd examples/int32_publisher
+# Set target board [esp32|esp32s2|esp32s3|esp32c3]
+idf.py set-target esp32
+idf.py menuconfig
+# Set your micro-ROS configuration and WiFi credentials under micro-ROS Settings
+idf.py build
+idf.py flash
+idf.py monitor
+```
 
 ## Using serial transport
 
@@ -90,7 +110,11 @@ Is possible to use a micro-ROS Agent just with this docker command:
 
 ```bash
 # Serial micro-ROS Agent
+<<<<<<< HEAD
 docker run -it --rm -v /dev:/dev --privileged --net=host microros/micro-ros-agent:humble serial --dev [YOUR BOARD PORT] -v6
+=======
+docker run -it --rm -v /dev:/dev --privileged --net=host microros/micro-ros-agent:kilted serial --dev [YOUR BOARD PORT] -v6
+>>>>>>> 3fb203b (Change README build steps to use the official ESP-IDF image (#300))
 ```
 
 ## Purpose of the Project

From 9e41a6e621c54ceff5e1326b42d73a781218b5ae Mon Sep 17 00:00:00 2001
From: Carlos Espinoza Curto <148376273+Carlosespicur@users.noreply.github.com>
Date: Tue, 23 Sep 2025 14:28:19 +0200
Subject: [PATCH 2/2] Resolve conflicts

---
 README.md | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/README.md b/README.md
index 3517efe5..d737e4de 100644
--- a/README.md
+++ b/README.md
@@ -53,11 +53,7 @@ Is possible to use a micro-ROS Agent just with this docker command:
 
 ```bash
 # UDPv4 micro-ROS Agent
-<<<<<<< HEAD
 docker run -it --rm --net=host microros/micro-ros-agent:humble udp4 --port 8888 -v6
-=======
-docker run -it --rm --net=host microros/micro-ros-agent:kilted udp4 --port 8888 -v6
->>>>>>> 3fb203b (Change README build steps to use the official ESP-IDF image (#300))
 ```
 
 ## Build with docker container
@@ -110,11 +106,7 @@ Is possible to use a micro-ROS Agent just with this docker command:
 
 ```bash
 # Serial micro-ROS Agent
-<<<<<<< HEAD
 docker run -it --rm -v /dev:/dev --privileged --net=host microros/micro-ros-agent:humble serial --dev [YOUR BOARD PORT] -v6
-=======
-docker run -it --rm -v /dev:/dev --privileged --net=host microros/micro-ros-agent:kilted serial --dev [YOUR BOARD PORT] -v6
->>>>>>> 3fb203b (Change README build steps to use the official ESP-IDF image (#300))
 ```
 
 ## Purpose of the Project