diff --git a/docker/Dockerfile.main b/docker/Dockerfile.main index 8d8e0ba..744b848 100644 --- a/docker/Dockerfile.main +++ b/docker/Dockerfile.main @@ -9,6 +9,7 @@ RUN apt-get update -qq && apt-get install -y build-essential \ RUN apt-get update && apt-get install -y ros-noetic-rqt ros-noetic-rqt-common-plugins +# New stage for each feature added ############################################ # Foxglove bridge ############################################ diff --git a/docker/Dockerfile.main.cuda b/docker/Dockerfile.main.cuda index 5a78c1a..7b8f1fc 100644 --- a/docker/Dockerfile.main.cuda +++ b/docker/Dockerfile.main.cuda @@ -56,6 +56,7 @@ ENV ROS_ETC_DIR=/opt/ros/noetic/etc/ros ENV CMAKE_PREFIX_PATH=/opt/ros/noetic ENV DEBIAN_FRONTEND= +# New stage for each feature added ########################################### # Develop image ########################################### diff --git a/docker/Dockerfile.main.l4t-35.4.1 b/docker/Dockerfile.main.l4t-35.4.1 index 040e538..b83ac7c 100644 --- a/docker/Dockerfile.main.l4t-35.4.1 +++ b/docker/Dockerfile.main.l4t-35.4.1 @@ -7,13 +7,8 @@ RUN apt-get update -qq && apt-get install -y build-essential \ terminator nano git wget curl iputils-ping \ libcanberra-gtk-module libcanberra-gtk3-module \ ros-dev-tools ros-noetic-teleop-twist-keyboard - -# # Gazebo classic install -# RUN apt install -y ros-noetic-gazebo-ros-pkgs \ -# ros-noetic-gazebo-ros \ -# ros-noetic-gazebo-plugins && \ -# curl -sSL http://get.gazebosim.org | sh +# New stage for each feature added ############################################ # USER CONFIGURATION ############################################ diff --git a/docker/README.md b/docker/README.md index 001b50a..f153eb6 100644 --- a/docker/README.md +++ b/docker/README.md @@ -9,7 +9,7 @@ ## Build images -Inside the `docker` folder in each module, there are different docker images. The convention for the naming of the **images** chosen is `home/feature:version`. Also, the `Dockerfile` should be named according to the feature and version. +Inside the `docker` folder in each module, there are different docker images. The convention for the naming of the **images** chosen is `home:area-version`, where version contains the platform used: `cpu`, `cuda` or `l4t-version`. Also, the `Dockerfile` should be named according to the feature and version. Current images available: - Noetic base full