Преглед изворни кода

Rename ubuntu-20.04 files to ubuntu-galactic

Signed-off-by: Steve Pham <[email protected]>
Steve Pham пре 2 година
родитељ
комит
b9819b6c6e

+ 1 - 7
Docker/Dockerfile.robot.ubuntu-galactic

@@ -4,12 +4,6 @@
 # SPDX-License-Identifier: Apache-2.0 OR MIT
 # SPDX-License-Identifier: Apache-2.0 OR MIT
 #
 #
 
 
-
-# Example usage:
-#
-# sudo DOCKER_BUILDKIT=1 docker build -t o3de_loft_demo:latest -f Dockerfile.ubuntu-20.04 .
-#
-
 FROM ros:galactic-ros-base-focal
 FROM ros:galactic-ros-base-focal
 ARG minimal
 ARG minimal
 ENV WORKSPACE=/data/workspace
 ENV WORKSPACE=/data/workspace
@@ -62,7 +56,7 @@ RUN apt-get install -y --no-install-recommends libglu1-mesa-dev \
 RUN cd $WORKSPACE && \
 RUN cd $WORKSPACE && \
     git clone --single-branch --branch main --recursive $O3DE_DEMO_REPO 
     git clone --single-branch --branch main --recursive $O3DE_DEMO_REPO 
 
 
-COPY LaunchRViz.bash.ubuntu-20.04 /data/workspace/LaunchRViz.bash
+COPY LaunchRViz.bash.ubuntu-galactic /data/workspace/LaunchRViz.bash
 
 
 ENV NVIDIA_VISIBLE_DEVICES all
 ENV NVIDIA_VISIBLE_DEVICES all
 ENV NVIDIA_DRIVER_CAPABILITIES all
 ENV NVIDIA_DRIVER_CAPABILITIES all

+ 1 - 7
Docker/Dockerfile.simulation.ubuntu-galactic

@@ -4,12 +4,6 @@
 # SPDX-License-Identifier: Apache-2.0 OR MIT
 # SPDX-License-Identifier: Apache-2.0 OR MIT
 #
 #
 
 
-
-# Example usage:
-#
-# sudo DOCKER_BUILDKIT=1 docker build -t o3de_loft_demo:latest -f Dockerfile.ubuntu-20.04 .
-#
-
 FROM ros:galactic-ros-base-focal
 FROM ros:galactic-ros-base-focal
 ARG minimal
 ARG minimal
 ENV WORKSPACE=/data/workspace
 ENV WORKSPACE=/data/workspace
@@ -124,7 +118,7 @@ RUN cd $WORKSPACE/o3de-demo-project && \
                   cmake --build build/linux --config profile --target AssetProcessorBatch ROS2-Gem-Demo.GameLauncher ROS2-Gem-Demo.Assets -j 12'
                   cmake --build build/linux --config profile --target AssetProcessorBatch ROS2-Gem-Demo.GameLauncher ROS2-Gem-Demo.Assets -j 12'
 
 
 
 
-COPY LaunchClient.bash.ubuntu-20.04 /data/workspace/LaunchClient.bash
+COPY LaunchClient.bash.ubuntu-galactic /data/workspace/LaunchClient.bash
 COPY delete_source.bash /data/workspace/delete_source.bash
 COPY delete_source.bash /data/workspace/delete_source.bash
 
 
 RUN if [ "$minimal" -eq "1" ]; then /bin/bash -c 'source /data/workspace/delete_source.bash'; else echo "Skipping source delete"; fi
 RUN if [ "$minimal" -eq "1" ]; then /bin/bash -c 'source /data/workspace/delete_source.bash'; else echo "Skipping source delete"; fi

+ 0 - 0
Docker/LaunchClient.bash.ubuntu-20.04 → Docker/LaunchClient.bash.ubuntu-galactic


+ 0 - 0
Docker/LaunchRViz.bash.ubuntu-20.04 → Docker/LaunchRViz.bash.ubuntu-galactic


+ 5 - 0
Docker/README.md

@@ -28,6 +28,7 @@ There are also two robot navigation stack Dockerfile scripts defined
 Select which docker image you would like to build and run the following commands to build the client and rviz docker images
 Select which docker image you would like to build and run the following commands to build the client and rviz docker images
 
 
 ```
 ```
+
 sudo docker build --build-arg minimal=1 -t o3de_loft_demo_simulation:latest -f Dockerfile.simulation.ubuntu-galactic .
 sudo docker build --build-arg minimal=1 -t o3de_loft_demo_simulation:latest -f Dockerfile.simulation.ubuntu-galactic .
 
 
 sudo docker build -t o3de_loft_demo_simulation:latest -f Dockerfile.robot.ubuntu-galactic .
 sudo docker build -t o3de_loft_demo_simulation:latest -f Dockerfile.robot.ubuntu-galactic .
@@ -35,9 +36,11 @@ sudo docker build -t o3de_loft_demo_simulation:latest -f Dockerfile.robot.ubuntu
 ```
 ```
 
 
 ```
 ```
+
 sudo docker build --build-arg minimal=1 -t o3de_loft_demo_simulation:latest -f Dockerfile.simulation.ubuntu-humble .
 sudo docker build --build-arg minimal=1 -t o3de_loft_demo_simulation:latest -f Dockerfile.simulation.ubuntu-humble .
 
 
 sudo docker build -t o3de_loft_demo_simulation:latest -f Dockerfile.robot.ubuntu-humble .
 sudo docker build -t o3de_loft_demo_simulation:latest -f Dockerfile.robot.ubuntu-humble .
+
 ```
 ```
 
 
 ## Running the Docker Image
 ## Running the Docker Image
@@ -53,6 +56,7 @@ xhost +local:root
 Then launch the built simulation docker image with the following command
 Then launch the built simulation docker image with the following command
 
 
 ```
 ```
+
 sudo docker run --rm --network="bridge" --gpus all -e DISPLAY=:1 -v /tmp/.X11-unix:/tmp/.X11-unix -it o3de_loft_demo_simulation:latest /data/workspace/LaunchClient.bash
 sudo docker run --rm --network="bridge" --gpus all -e DISPLAY=:1 -v /tmp/.X11-unix:/tmp/.X11-unix -it o3de_loft_demo_simulation:latest /data/workspace/LaunchClient.bash
 
 
 ```
 ```
@@ -61,6 +65,7 @@ Once the simulation is up and running, launch the robot application docker image
 
 
 
 
 ```
 ```
+
 sudo docker run --rm --network="bridge" --gpus all -e DISPLAY=:1 -v /tmp/.X11-unix:/tmp/.X11-unix -it o3de_loft_demo_robot:latest /data/workspace/LaunchRViz.bash
 sudo docker run --rm --network="bridge" --gpus all -e DISPLAY=:1 -v /tmp/.X11-unix:/tmp/.X11-unix -it o3de_loft_demo_robot:latest /data/workspace/LaunchRViz.bash
 
 
 ```
 ```