From a6a762c5a3f1a5be110be0eb7fb54ac8b1fa2f39 Mon Sep 17 00:00:00 2001 From: Saikrishna Bairamoni <84093461+SaikrishnaBairamoni@users.noreply.github.com> Date: Fri, 9 Feb 2024 13:29:46 -0500 Subject: [PATCH 1/4] update config to point candidate images --- Dockerfile | 4 ++-- docker/checkout.bash | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Dockerfile b/Dockerfile index 548645e..0be7199 100644 --- a/Dockerfile +++ b/Dockerfile @@ -12,7 +12,7 @@ # License for the specific language governing permissions and limitations under # the License. -FROM usdotfhwastoldev/carma-base:develop as setup +FROM usdotfhwastolcandidate/carma-base:lavida as setup ARG ROS1_PACKAGES="" ENV ROS1_PACKAGES=${ROS1_PACKAGES} @@ -24,7 +24,7 @@ COPY --chown=carma . /home/carma/src/ RUN ~/src/docker/checkout.bash RUN ~/src/docker/install.sh -FROM usdotfhwastoldev/carma-base:develop +FROM usdotfhwastolcandidate/carma-base:lavida ARG BUILD_DATE="NULL" ARG VERSION="NULL" diff --git a/docker/checkout.bash b/docker/checkout.bash index 18c728a..c2f6ace 100755 --- a/docker/checkout.bash +++ b/docker/checkout.bash @@ -39,6 +39,6 @@ if [[ "$BRANCH" = "develop" ]]; then git clone https://github.com/usdot-fhwa-stol/carma-msgs.git ${dir}/src/CARMAMsgs --branch $BRANCH git clone https://github.com/usdot-fhwa-stol/carma-utils.git ${dir}/src/CARMAUtils --branch $BRANCH else - git clone https://github.com/usdot-fhwa-stol/carma-msgs.git ${dir}/src/CARMAMsgs --branch develop - git clone https://github.com/usdot-fhwa-stol/carma-utils.git ${dir}/src/CARMAUtils --branch develop + git clone https://github.com/usdot-fhwa-stol/carma-msgs.git ${dir}/src/CARMAMsgs --branch release/lavida + git clone https://github.com/usdot-fhwa-stol/carma-utils.git ${dir}/src/CARMAUtils --branch release/lavida fi From 27fd6f30201775071af2ec5372d6877941528e15 Mon Sep 17 00:00:00 2001 From: maefromm Date: Tue, 9 Apr 2024 20:17:00 -0400 Subject: [PATCH 2/4] Update ci.yml --- .github/workflows/ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index cf094b4..e0de58c 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -10,7 +10,7 @@ jobs: working-directory: "/opt/carma/" runs-on: ubuntu-latest container: - image: usdotfhwastoldev/carma-base:develop + image: usdotfhwastol/carma-base:carma-system-4.5.0 env: INIT_ENV: "/home/carma/.base-image/init-env.sh" ROS_2_ENV: "/opt/ros/foxy/setup.bash" @@ -44,4 +44,4 @@ jobs: uses: usdot-fhwa-stol/actions/sonar-scanner@main with: sonar-token: ${{ secrets.SONAR_TOKEN }} - working-dir: "/opt/carma/src/${{ github.event.repository.name }}" \ No newline at end of file + working-dir: "/opt/carma/src/${{ github.event.repository.name }}" From 68e8c1ef23340c4715da8a8e294af1695798037c Mon Sep 17 00:00:00 2001 From: maefromm Date: Tue, 9 Apr 2024 20:17:38 -0400 Subject: [PATCH 3/4] Update Dockerfile --- Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 0be7199..776e76e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -12,7 +12,7 @@ # License for the specific language governing permissions and limitations under # the License. -FROM usdotfhwastolcandidate/carma-base:lavida as setup +FROM usdotfhwastol/carma-base:carma-system-4.5.0 as setup ARG ROS1_PACKAGES="" ENV ROS1_PACKAGES=${ROS1_PACKAGES} @@ -24,7 +24,7 @@ COPY --chown=carma . /home/carma/src/ RUN ~/src/docker/checkout.bash RUN ~/src/docker/install.sh -FROM usdotfhwastolcandidate/carma-base:lavida +FROM usdotfhwastol/carma-base:carma-system-4.5.0 ARG BUILD_DATE="NULL" ARG VERSION="NULL" From de4280924e303ee390f20ff0966a3ce2f9db3843 Mon Sep 17 00:00:00 2001 From: maefromm Date: Tue, 9 Apr 2024 20:18:05 -0400 Subject: [PATCH 4/4] Update checkout.bash --- docker/checkout.bash | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docker/checkout.bash b/docker/checkout.bash index c2f6ace..3d0cc24 100755 --- a/docker/checkout.bash +++ b/docker/checkout.bash @@ -39,6 +39,6 @@ if [[ "$BRANCH" = "develop" ]]; then git clone https://github.com/usdot-fhwa-stol/carma-msgs.git ${dir}/src/CARMAMsgs --branch $BRANCH git clone https://github.com/usdot-fhwa-stol/carma-utils.git ${dir}/src/CARMAUtils --branch $BRANCH else - git clone https://github.com/usdot-fhwa-stol/carma-msgs.git ${dir}/src/CARMAMsgs --branch release/lavida - git clone https://github.com/usdot-fhwa-stol/carma-utils.git ${dir}/src/CARMAUtils --branch release/lavida + git clone https://github.com/usdot-fhwa-stol/carma-msgs.git ${dir}/src/CARMAMsgs --branch carma-system-4.5.0 + git clone https://github.com/usdot-fhwa-stol/carma-utils.git ${dir}/src/CARMAUtils --branch carma-system-4.5.0 fi