Unverified Commit 8ee6c972 authored by Alexander Poddubny's avatar Alexander Poddubny Committed by GitHub

Makes pre and post merge pipelines more flexible on the Isaac SIM base image version (#1211)

# Description

Making the base image version a parameter so the pipelines can use
different versions without the need to hardcode that.
parent f879aa6a
...@@ -34,7 +34,7 @@ phases: ...@@ -34,7 +34,7 @@ phases:
docker login -u \$oauthtoken -p $NGC_TOKEN nvcr.io docker login -u \$oauthtoken -p $NGC_TOKEN nvcr.io
docker build -t $IMAGE_NAME:$COMBINED_TAG \ docker build -t $IMAGE_NAME:$COMBINED_TAG \
--build-arg ISAACSIM_BASE_IMAGE_ARG=$ISAACSIM_BASE_IMAGE \ --build-arg ISAACSIM_BASE_IMAGE_ARG=$ISAACSIM_BASE_IMAGE \
--build-arg ISAACSIM_VERSION_ARG=4.2.0 \ --build-arg ISAACSIM_VERSION_ARG=$ISAACSIM_BASE_VERSION \
--build-arg ISAACSIM_ROOT_PATH_ARG=/isaac-sim \ --build-arg ISAACSIM_ROOT_PATH_ARG=/isaac-sim \
--build-arg ISAACLAB_PATH_ARG=/workspace/isaaclab \ --build-arg ISAACLAB_PATH_ARG=/workspace/isaaclab \
--build-arg DOCKER_USER_HOME_ARG=/root \ --build-arg DOCKER_USER_HOME_ARG=/root \
......
...@@ -69,7 +69,7 @@ phases: ...@@ -69,7 +69,7 @@ phases:
cd $SRC_DIR cd $SRC_DIR
DOCKER_BUILDKIT=1 docker build -t isaac-lab-dev \ DOCKER_BUILDKIT=1 docker build -t isaac-lab-dev \
--build-arg ISAACSIM_BASE_IMAGE_ARG=$ISAACSIM_BASE_IMAGE \ --build-arg ISAACSIM_BASE_IMAGE_ARG=$ISAACSIM_BASE_IMAGE \
--build-arg ISAACSIM_VERSION_ARG=4.2.0 \ --build-arg ISAACSIM_VERSION_ARG=$ISAACSIM_BASE_VERSION \
--build-arg ISAACSIM_ROOT_PATH_ARG=/isaac-sim \ --build-arg ISAACSIM_ROOT_PATH_ARG=/isaac-sim \
--build-arg ISAACLAB_PATH_ARG=/workspace/isaaclab \ --build-arg ISAACLAB_PATH_ARG=/workspace/isaaclab \
--build-arg DOCKER_USER_HOME_ARG=/root \ --build-arg DOCKER_USER_HOME_ARG=/root \
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment