Browse Source

Update Docker commit hash defaults (#16)

* Update commit hash for the last tested commits for o3de and the ROS2 gem in the docker file
* Update Loft Arch Vis hash tag to match prefab update

Signed-off-by: Steve Pham <[email protected]>
Steve Pham 2 years ago
parent
commit
3c941d60eb
2 changed files with 9 additions and 9 deletions
  1. 5 5
      Docker/Dockerfile
  2. 4 4
      Docker/README.md

+ 5 - 5
Docker/Dockerfile

@@ -19,13 +19,13 @@ ARG IMAGE_TYPE=simulation  # Default to 'simulation'
 
 # Arguments for the source repos needed for the robot vacuum sample docker
 ARG O3DE_REPO=https://github.com/o3de/o3de.git
-ARG O3DE_BRANCH=development
+ARG O3DE_BRANCH=606fed5
 
 ARG O3DE_EXTRAS_REPO=https://github.com/o3de/o3de-extras.git
-ARG O3DE_EXTRAS_BRANCH=development
+ARG O3DE_EXTRAS_BRANCH=f1d8afe
 
 ARG LOFT_GEM_REPO=https://github.com/o3de/loft-arch-vis-sample.git
-ARG LOFT_GEM_BRANCH=main
+ARG LOFT_GEM_BRANCH=658ad5f
 
 ARG ROBOT_VAC_SAMPLE_REPO=https://github.com/o3de/RobotVacuumSample.git
 ARG ROBOT_VAC_SAMPLE_BRANCH=main
@@ -90,8 +90,8 @@ RUN apt-get install -y --no-install-recommends git \
                        ros-${ROS_VERSION}-gazebo-msgs \
                        ros-${ROS_VERSION}-ackermann-msgs \
                        ros-${ROS_VERSION}-rmw-cyclonedds-cpp \
-                       ros-${ROS_VERSION}-control-toolbox
-
+                       ros-${ROS_VERSION}-control-toolbox \
+                       ros-${ROS_VERSION}-nav-msgs 
 
 COPY cleanup.bash /data/workspace/cleanup.bash
 

+ 4 - 4
Docker/README.md

@@ -21,7 +21,7 @@ command:
 
 ```
 
-docker build --build-arg O3DE_BRANCH=199205f --build-arg O3DE_EXTRAS_BRANCH=cbd3cd5 --build-arg LOFT_GEM_BRANCH=eed5208 -t o3de_robot_vacuum_simulation:latest .
+docker build -t o3de_robot_vacuum_simulation:latest .
 ```
 
 **Note** 
@@ -117,10 +117,10 @@ In addition the repositories, the following arguments target the branch, commit,
 
 | Argument                | Repository                       | Default     |
 |-------------------------|----------------------------------|-------------|
-| O3DE_BRANCH             | O3DE                             | development |
-| O3DE_EXTRAS_BRANCH      | O3DE Extras                      | development |
+| O3DE_BRANCH             | O3DE                             | 606fed5     |
+| O3DE_EXTRAS_BRANCH      | O3DE Extras                      | f1d8afe     |
 | LOFT_GEM_BRANCH         | Loft ArchVis Sample Scene        | main        |
 | ROBOT_VAC_SAMPLE_BRANCH | Loft Scene Simulation repository | main        |
 
 ### Optimizing the build process ###
-The docker script provides a cmake-specific argument override to control the number of parallel jobs that can be used during the build of the docker image. ```CMAKE_JOBS``` sets the maximum number of concurrent jobs cmake will run during its build process and defaults to 8 jobs. This number can be adjusted to better suit the hardware which is running the docker image build.
+The docker script provides a cmake-specific argument override to control the number of parallel jobs that can be used during the build of the docker image. ```CMAKE_JOBS``` sets the maximum number of concurrent jobs cmake will run during its build process and defaults to 8 jobs. This number can be adjusted to better suit the hardware which is running the docker image build.