From a9aa2448943e73ad250d31bcf69c2d1937fbb6cb Mon Sep 17 00:00:00 2001 From: Saikrishna Bairamoni <84093461+SaikrishnaBairamoni@users.noreply.github.com> Date: Fri, 16 Jun 2023 15:20:39 -0400 Subject: [PATCH 1/3] update checkout.sh to point 4.4.3 release images --- docker/checkout.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docker/checkout.sh b/docker/checkout.sh index ad545521..47d97242 100755 --- a/docker/checkout.sh +++ b/docker/checkout.sh @@ -39,6 +39,6 @@ if [[ "$BRANCH" = "develop" ]]; then git clone https://github.com/usdot-fhwa-stol/carma-msgs.git ~/src/carma-msgs --branch $BRANCH --depth 1 git clone https://github.com/usdot-fhwa-stol/carma-utils.git ~/src/carma-utils --branch $BRANCH --depth 1 else - git clone https://github.com/usdot-fhwa-stol/carma-msgs.git ${dir}/src/carma-msgs --branch develop --depth 1 - git clone https://github.com/usdot-fhwa-stol/carma-utils.git ${dir}/src/carma-utils --branch develop --depth 1 + git clone https://github.com/usdot-fhwa-stol/carma-msgs.git ${dir}/src/carma-msgs --branch carma-system-4.4.3 --depth 1 + git clone https://github.com/usdot-fhwa-stol/carma-utils.git ${dir}/src/carma-utils --branch carma-system-4.4.3 --depth 1 fi From 0861bed069dd224a703cc1b6c7a5aacbfab440f6 Mon Sep 17 00:00:00 2001 From: Saikrishna Bairamoni <84093461+SaikrishnaBairamoni@users.noreply.github.com> Date: Tue, 20 Jun 2023 10:33:43 -0400 Subject: [PATCH 2/3] Update Dockerfile with new reponame cdasim --- Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 1ffcc7db..256cd1bb 100644 --- a/Dockerfile +++ b/Dockerfile @@ -25,12 +25,12 @@ ARG VCS_REF ARG BUILD_DATE LABEL org.label-schema.schema-version="1.0" -LABEL org.label-schema.name="carma-simulation" +LABEL org.label-schema.name="cdasim" LABEL org.label-schema.description="XIL Simulation environment for evaluation and testing of the CARMA Platform" LABEL org.label-schema.vendor="Leidos" LABEL org.label-schema.version=${VERSION} LABEL org.label-schema.url="https://highways.dot.gov/research/research-programs/operations/CARMA" -LABEL org.label-schema.vcs-url="https://github.com/usdot-fhwa-stol/carma-simulation/" +LABEL org.label-schema.vcs-url="https://github.com/usdot-fhwa-stol/cdasim/" LABEL org.label-schema.vcs-ref=${VCS_REF} LABEL org.label-schema.build-date=${BUILD_DATE} From 031edc83b0f365adb9c87521f20275712ec09950 Mon Sep 17 00:00:00 2001 From: Saikrishna Bairamoni <84093461+SaikrishnaBairamoni@users.noreply.github.com> Date: Tue, 18 Jul 2023 15:58:57 -0400 Subject: [PATCH 3/3] update checkout to point develop --- docker/checkout.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docker/checkout.sh b/docker/checkout.sh index 47d97242..ad545521 100755 --- a/docker/checkout.sh +++ b/docker/checkout.sh @@ -39,6 +39,6 @@ if [[ "$BRANCH" = "develop" ]]; then git clone https://github.com/usdot-fhwa-stol/carma-msgs.git ~/src/carma-msgs --branch $BRANCH --depth 1 git clone https://github.com/usdot-fhwa-stol/carma-utils.git ~/src/carma-utils --branch $BRANCH --depth 1 else - git clone https://github.com/usdot-fhwa-stol/carma-msgs.git ${dir}/src/carma-msgs --branch carma-system-4.4.3 --depth 1 - git clone https://github.com/usdot-fhwa-stol/carma-utils.git ${dir}/src/carma-utils --branch carma-system-4.4.3 --depth 1 + git clone https://github.com/usdot-fhwa-stol/carma-msgs.git ${dir}/src/carma-msgs --branch develop --depth 1 + git clone https://github.com/usdot-fhwa-stol/carma-utils.git ${dir}/src/carma-utils --branch develop --depth 1 fi