From b2050d28eb7e73bdd46f8ec9674742a899673a53 Mon Sep 17 00:00:00 2001 From: SaikrishnaBairamoni Date: Thu, 2 Sep 2021 12:31:59 -0400 Subject: [PATCH 1/3] update config and Dockerfile for release a1 --- .circleci/config.yml | 2 +- Dockerfile | 2 +- docker/checkout.bash | 8 ++++---- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 088733d8..0114cf1b 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -28,7 +28,7 @@ jobs: # Pull docker image from docker hub # XTERM used for better catkin_make output docker: - - image: usdotfhwastoldev/carma-base:develop + - image: usdotfhwastolcandidate/carma-base:a1 user: carma environment: TERM: xterm diff --git a/Dockerfile b/Dockerfile index 5deedfbe..e2efd803 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 base +FROM usdotfhwastolcandidate/carma-base:a1 as base FROM base as setup RUN mkdir ~/src diff --git a/docker/checkout.bash b/docker/checkout.bash index fc94822c..112e3ee1 100755 --- a/docker/checkout.bash +++ b/docker/checkout.bash @@ -36,9 +36,9 @@ while [[ $# -gt 0 ]]; do done if [[ "$BRANCH" = "develop" ]]; then - git clone https://github.com/usdot-fhwa-stol/carma-msgs.git ~/src/carma-msgs --branch develop --depth 1 - git clone https://github.com/usdot-fhwa-stol/carma-utils.git ~/src/carma-utils --branch develop --depth 1 + git clone https://github.com/usdot-fhwa-stol/carma-msgs.git ~/src/carma-msgs --branch release/a1 --depth 1 + git clone https://github.com/usdot-fhwa-stol/carma-utils.git ~/src/carma-utils --branch release/a1 --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 release/a1 --depth 1 + git clone https://github.com/usdot-fhwa-stol/carma-utils.git ${dir}/src/carma-utils --branch release/a1 --depth 1 fi From 36bc1d7c70833539c27c1b67fcb722e6fa1c6d18 Mon Sep 17 00:00:00 2001 From: SaikrishnaBairamoni Date: Fri, 24 Sep 2021 15:15:07 -0400 Subject: [PATCH 2/3] updated dockerfile and config file to point 3.8.0 --- .circleci/config.yml | 2 +- Dockerfile | 2 +- docker/checkout.bash | 8 ++++---- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 0114cf1b..aebfc0c1 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -28,7 +28,7 @@ jobs: # Pull docker image from docker hub # XTERM used for better catkin_make output docker: - - image: usdotfhwastolcandidate/carma-base:a1 + - image: usdotfhwastol/carma-base:carma-system-3.8.0 user: carma environment: TERM: xterm diff --git a/Dockerfile b/Dockerfile index e2efd803..d2ca70c3 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:a1 as base +FROM usdotfhwastol/carma-base:carma-system-3.8.0 as base FROM base as setup RUN mkdir ~/src diff --git a/docker/checkout.bash b/docker/checkout.bash index 112e3ee1..3d046463 100755 --- a/docker/checkout.bash +++ b/docker/checkout.bash @@ -36,9 +36,9 @@ while [[ $# -gt 0 ]]; do done if [[ "$BRANCH" = "develop" ]]; then - git clone https://github.com/usdot-fhwa-stol/carma-msgs.git ~/src/carma-msgs --branch release/a1 --depth 1 - git clone https://github.com/usdot-fhwa-stol/carma-utils.git ~/src/carma-utils --branch release/a1 --depth 1 + git clone https://github.com/usdot-fhwa-stol/carma-msgs.git ~/src/carma-msgs --branch carma-system-3.8.0 --depth 1 + git clone https://github.com/usdot-fhwa-stol/carma-utils.git ~/src/carma-utils --branch carma-system-3.8.0 --depth 1 else - git clone https://github.com/usdot-fhwa-stol/carma-msgs.git ${dir}/src/carma-msgs --branch release/a1 --depth 1 - git clone https://github.com/usdot-fhwa-stol/carma-utils.git ${dir}/src/carma-utils --branch release/a1 --depth 1 + git clone https://github.com/usdot-fhwa-stol/carma-msgs.git ${dir}/src/carma-msgs --branch carma-system-3.8.0 --depth 1 + git clone https://github.com/usdot-fhwa-stol/carma-utils.git ${dir}/src/carma-utils --branch carma-system-3.8.0 --depth 1 fi From c2000aea09e0771afe93194c65c85ee65af065e9 Mon Sep 17 00:00:00 2001 From: SaikrishnaBairamoni Date: Mon, 27 Sep 2021 14:22:03 -0400 Subject: [PATCH 3/3] updated config file to point develop --- .circleci/config.yml | 2 +- Dockerfile | 2 +- docker/checkout.bash | 8 ++++---- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index aebfc0c1..088733d8 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -28,7 +28,7 @@ jobs: # Pull docker image from docker hub # XTERM used for better catkin_make output docker: - - image: usdotfhwastol/carma-base:carma-system-3.8.0 + - image: usdotfhwastoldev/carma-base:develop user: carma environment: TERM: xterm diff --git a/Dockerfile b/Dockerfile index d2ca70c3..5deedfbe 100644 --- a/Dockerfile +++ b/Dockerfile @@ -12,7 +12,7 @@ # License for the specific language governing permissions and limitations under # the License. -FROM usdotfhwastol/carma-base:carma-system-3.8.0 as base +FROM usdotfhwastoldev/carma-base:develop as base FROM base as setup RUN mkdir ~/src diff --git a/docker/checkout.bash b/docker/checkout.bash index 3d046463..fc94822c 100755 --- a/docker/checkout.bash +++ b/docker/checkout.bash @@ -36,9 +36,9 @@ while [[ $# -gt 0 ]]; do done if [[ "$BRANCH" = "develop" ]]; then - git clone https://github.com/usdot-fhwa-stol/carma-msgs.git ~/src/carma-msgs --branch carma-system-3.8.0 --depth 1 - git clone https://github.com/usdot-fhwa-stol/carma-utils.git ~/src/carma-utils --branch carma-system-3.8.0 --depth 1 + git clone https://github.com/usdot-fhwa-stol/carma-msgs.git ~/src/carma-msgs --branch develop --depth 1 + git clone https://github.com/usdot-fhwa-stol/carma-utils.git ~/src/carma-utils --branch develop --depth 1 else - git clone https://github.com/usdot-fhwa-stol/carma-msgs.git ${dir}/src/carma-msgs --branch carma-system-3.8.0 --depth 1 - git clone https://github.com/usdot-fhwa-stol/carma-utils.git ${dir}/src/carma-utils --branch carma-system-3.8.0 --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