From ba471f6591dffc04105bbf7cd34a17ccf5b2ebed Mon Sep 17 00:00:00 2001 From: SaikrishnaBairamoni Date: Thu, 1 Jul 2021 14:38:44 -0400 Subject: [PATCH 1/3] Updated docker tags to point develop from 3.6.0 --- .circleci/config.yml | 2 +- Dockerfile | 4 ++-- docker/checkout.bash | 8 ++++---- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index bf20bfa..7471745 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.6.0 + - image: usdotfhwastoldev/carma-base:develop user: carma environment: TERM: xterm # use xterm to get full display output from build diff --git a/Dockerfile b/Dockerfile index f9c0c06..3eb447d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -12,14 +12,14 @@ # License for the specific language governing permissions and limitations under # the License. -FROM usdotfhwastol/carma-base:carma-system-3.6.0 as setup +FROM usdotfhwastoldev/carma-base:develop as setup RUN mkdir ~/src COPY --chown=carma . /home/carma/src/ RUN ~/src/docker/checkout.bash RUN ~/src/docker/install.sh -FROM usdotfhwastol/carma-base:carma-system-3.6.0 +FROM usdotfhwastoldev/carma-base:develop ARG BUILD_DATE="NULL" ARG VERSION="NULL" diff --git a/docker/checkout.bash b/docker/checkout.bash index ac30dbe..f9a183e 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 ${dir}/src/CARMAMsgs --branch carma-system-3.6.0 - git clone https://github.com/usdot-fhwa-stol/carma-utils.git ${dir}/src/CARMAUtils --branch carma-system-3.6.0 + 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 else - git clone https://github.com/usdot-fhwa-stol/carma-msgs.git ${dir}/src/CARMAMsgs --branch carma-system-3.6.0 - git clone https://github.com/usdot-fhwa-stol/carma-utils.git ${dir}/src/CARMAUtils --branch carma-system-3.6.0 + 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 fi From 10a88990427af0b2bf84498d8fe5198d1b0238af Mon Sep 17 00:00:00 2001 From: SaikrishnaBairamoni Date: Thu, 5 Aug 2021 02:00:42 -0400 Subject: [PATCH 2/3] update config and dockerfile with version 3.7.0 --- .circleci/config.yml | 2 +- Dockerfile | 4 ++-- docker/checkout.bash | 8 ++++---- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 7471745..a159c28 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: usdotfhwastol/carma-base:carma-system-3.7.0 user: carma environment: TERM: xterm # use xterm to get full display output from build diff --git a/Dockerfile b/Dockerfile index 3eb447d..e3d7ddc 100644 --- a/Dockerfile +++ b/Dockerfile @@ -12,14 +12,14 @@ # License for the specific language governing permissions and limitations under # the License. -FROM usdotfhwastoldev/carma-base:develop as setup +FROM usdotfhwastol/carma-base:carma-system-3.7.0 as setup RUN mkdir ~/src COPY --chown=carma . /home/carma/src/ RUN ~/src/docker/checkout.bash RUN ~/src/docker/install.sh -FROM usdotfhwastoldev/carma-base:develop +FROM usdotfhwastol/carma-base:carma-system-3.7.0 ARG BUILD_DATE="NULL" ARG VERSION="NULL" diff --git a/docker/checkout.bash b/docker/checkout.bash index f9a183e..330d56a 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 ${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/yenko + git clone https://github.com/usdot-fhwa-stol/carma-utils.git ${dir}/src/CARMAUtils --branch release/yenko 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/yenko + git clone https://github.com/usdot-fhwa-stol/carma-utils.git ${dir}/src/CARMAUtils --branch release/yenko fi From 5511b3055b2433ffc4a34c0512a3793f670291de Mon Sep 17 00:00:00 2001 From: Saikrishna Bairamoni <84093461+SaikrishnaBairamoni@users.noreply.github.com> Date: Mon, 9 Aug 2021 11:09:10 -0400 Subject: [PATCH 3/3] Update checkout.bash --- docker/checkout.bash | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/docker/checkout.bash b/docker/checkout.bash index 330d56a..1e69ed9 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 ${dir}/src/CARMAMsgs --branch release/yenko - git clone https://github.com/usdot-fhwa-stol/carma-utils.git ${dir}/src/CARMAUtils --branch release/yenko + git clone https://github.com/usdot-fhwa-stol/carma-msgs.git ${dir}/src/CARMAMsgs --branch carma-system-3.7.0 + git clone https://github.com/usdot-fhwa-stol/carma-utils.git ${dir}/src/CARMAUtils --branch carma-system-3.7.0 else - git clone https://github.com/usdot-fhwa-stol/carma-msgs.git ${dir}/src/CARMAMsgs --branch release/yenko - git clone https://github.com/usdot-fhwa-stol/carma-utils.git ${dir}/src/CARMAUtils --branch release/yenko + git clone https://github.com/usdot-fhwa-stol/carma-msgs.git ${dir}/src/CARMAMsgs --branch carma-system-3.7.0 + git clone https://github.com/usdot-fhwa-stol/carma-utils.git ${dir}/src/CARMAUtils --branch carma-system-3.7.0 fi