Skip to content

Commit

Permalink
Initial changes (#46)
Browse files Browse the repository at this point in the history
* Initial changes

* Update
  • Loading branch information
pablogs9 authored Jul 13, 2020
1 parent f069d68 commit 2f3e665
Show file tree
Hide file tree
Showing 6 changed files with 9 additions and 9 deletions.
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ To get an image, you use `docker pull` command:

You can select the tag to use appending `:tag` to the image name

* e.g. ```docker pull microros/base:dashing```
* e.g. ```docker pull microros/base:foxy```

Once you have the image locally, to start it use `docker run`

Expand Down Expand Up @@ -84,7 +84,7 @@ The currently avaiable examples are:
This image provides you with a ready-to-flash firmware for Olimex-stm32-e407 with demos embedded on it.
To flash your device you need to map your host machine devices to the Docker container

* e.g. `docker run -it --privileged -v /dev/bus/usb:/dev/bus/usb microros/micro-ros-olimex-nuttx:dashing`
* e.g. `docker run -it --privileged -v /dev/bus/usb:/dev/bus/usb microros/micro-ros-olimex-nuttx:foxy`

Once inside the container you can flash the board runing `scripts/flash.sh` from `firmware/NuttX` directory.

Expand All @@ -95,7 +95,7 @@ Once a client-agent communication is stablished you can use `ros2` tools to view
## Automated builds

These Docker files are used for automatically create images on Docker Hub.
These builds are tagged with the ROS 2 version they will be compatible with: e.g. crystal, dashing...
These builds are tagged with the ROS 2 version they will be compatible with: e.g. crystal, dashing, foxy...
The latest tag will always be the latest release of ROS 2.

These automatic builds has direct relationship with the content of the micro-ROS repositories:
Expand Down
4 changes: 2 additions & 2 deletions base/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
FROM ros:dashing
FROM ros:foxy

RUN mkdir -p uros_ws
WORKDIR uros_ws
RUN git clone --depth 1 -branch -b $ROS_DISTRO https://github.com/micro-ROS/micro-ros-build.git src/micro-ros-build \
RUN git clone --depth 1 -branch -b feature/foxy_migration https://github.com/micro-ROS/micro-ros-build.git src/micro-ros-build \
&& . /opt/ros/$ROS_DISTRO/setup.sh \
&& apt update \
&& apt install ed \
Expand Down
2 changes: 1 addition & 1 deletion ci/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM microros/base:dashing
FROM microros/base:foxy

WORKDIR /uros_ws

Expand Down
2 changes: 1 addition & 1 deletion micro-ROS-Agent/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM microros/base:dashing
FROM microros/base:foxy

WORKDIR /uros_ws
RUN . /opt/ros/$ROS_DISTRO/setup.sh \
Expand Down
2 changes: 1 addition & 1 deletion micro-ROS-Olimex-NuttX/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM microros/firmware:dashing
FROM microros/firmware:foxy

WORKDIR /uros_ws

Expand Down
2 changes: 1 addition & 1 deletion micro-ROS-demos/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM microros/base:dashing
FROM microros/base:foxy

WORKDIR /uros_ws

Expand Down

0 comments on commit 2f3e665

Please sign in to comment.