|
@@ -16,18 +16,18 @@ WORKDIR $WORKSPACE
|
|
|
# O3DE Variables
|
|
|
ARG O3DE_REPO=https://github.com/o3de/o3de.git
|
|
|
ARG O3DE_BRANCH=main
|
|
|
-ARG O3DE_COMMIT=HEAD
|
|
|
+ARG O3DE_COMMIT=2310.1
|
|
|
ENV O3DE_ROOT=$WORKSPACE/o3de
|
|
|
|
|
|
# O3DE Extras Variables
|
|
|
ARG O3DE_EXTRAS_REPO=https://github.com/o3de/o3de-extras.git
|
|
|
ARG O3DE_EXTRAS_BRANCH=main
|
|
|
-ARG O3DE_EXTRAS_COMMIT=HEAD
|
|
|
+ARG O3DE_EXTRAS_COMMIT=2310.1
|
|
|
ENV O3DE_EXTRAS_ROOT=$WORKSPACE/o3de-extras
|
|
|
|
|
|
# ROSConDemo Variables
|
|
|
ARG ROSCON_DEMO_REPO=https://github.com/o3de/ROSConDemo.git
|
|
|
-ARG ROSCON_DEMO_BRANCH=development
|
|
|
+ARG ROSCON_DEMO_BRANCH=main
|
|
|
ARG ROSCON_DEMO_COMMIT=HEAD
|
|
|
ENV ROSCON_DEMO_ROOT=$WORKSPACE/ROSConDemo
|
|
|
ENV ROSCON_DEMO_PROJECT=$ROSCON_DEMO_ROOT/Project
|
|
@@ -143,7 +143,7 @@ RUN . /opt/ros/${ROS_DISTRO}/setup.sh \
|
|
|
--target ROSConDemo.GameLauncher Editor ROSConDemo.Assets \
|
|
|
\
|
|
|
############################################################### \
|
|
|
- # Build the Editor, Tools, and clients
|
|
|
+ # Remove build artifacts
|
|
|
############################################################### \
|
|
|
&& rm -rf ~/.o3de/3rdParty/ \
|
|
|
&& rm -rf $O3DE_ROOT/.git \
|