From 63127f9c3680c9098e5bb38a648637b202fc39f7 Mon Sep 17 00:00:00 2001 From: Michael McConnell Date: Tue, 23 Mar 2021 07:29:53 -0700 Subject: [PATCH 01/11] update version numbers --- .circleci/config.yml | 2 +- Dockerfile | 5 +++-- docker/checkout.bash | 8 ++++---- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 40dfeb8c..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.5.0 + - image: usdotfhwastoldev/carma-base:develop user: carma environment: TERM: xterm diff --git a/Dockerfile b/Dockerfile index df9df900..5deedfbe 100644 --- a/Dockerfile +++ b/Dockerfile @@ -12,14 +12,15 @@ # License for the specific language governing permissions and limitations under # the License. -FROM usdotfhwastol/carma-base:carma-system-3.5.0 as setup +FROM usdotfhwastoldev/carma-base:develop as base +FROM base as setup RUN mkdir ~/src COPY --chown=carma . /home/carma/src/CARMAAvtVimbaDriver RUN ~/src/CARMAAvtVimbaDriver/docker/checkout.bash RUN ~/src/CARMAAvtVimbaDriver/docker/install.sh -FROM usdotfhwastol/carma-base:carma-system-3.5.0 +FROM base ARG BUILD_DATE="NULL" ARG VERSION="NULL" diff --git a/docker/checkout.bash b/docker/checkout.bash index 73bf6007..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 develop - git clone https://github.com/usdot-fhwa-stol/carma-utils.git ~/src/carma-utils --branch develop + 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.5.0 - git clone https://github.com/usdot-fhwa-stol/carma-utils.git ${dir}/src/carma-utils --branch carma-system-3.5.0 + 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 From 64ab0931adc60494d8dde52d237bbbad7cf8af53 Mon Sep 17 00:00:00 2001 From: Kyle Rush Date: Sun, 2 May 2021 22:57:59 -0400 Subject: [PATCH 02/11] Adjust pre_build hook for release builds --- hooks/pre_build | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/hooks/pre_build b/hooks/pre_build index 4fcb6f2d..471bce7e 100644 --- a/hooks/pre_build +++ b/hooks/pre_build @@ -6,8 +6,9 @@ if [[ "$SOURCE_BRANCH" = "develop" ]]; then Dockerfile elif [[ "$SOURCE_BRANCH" =~ ^release/.*$ ]]; then # swap checkout branch in checkout.bash to release branch - sed -i "s|usdotfhwastoldev/|usdotfhwastolcandidate/|g; s|usdotfhwastol/|usdotfhwastolcandidate/|g; s|:[0-9]*\.[0-9]*\.[0-9]*|:candidate|g; s|:CARMA[a-zA-Z]*_[0-9]*\.[0-9]*\.[0-9]*|:candidate|g; s|:carma-[a-zA-Z]*-[0-9]*\.[0-9]*\.[0-9]*|:candidate|g" \ + RELEASE_NAME=$(echo $SOURCE_BRANCH | cut -d "/" -f 2) + sed -i "s|usdotfhwastol/|usdotfhwastolcandidate/|g; s|usdotfhwastoldev/|usdotfhwastolcandidate/|g; s|:[0-9]*\.[0-9]*\.[0-9]*|:$RELEASE_NAME|g; s|:CARMA[a-zA-Z]*_[0-9]*\.[0-9]*\.[0-9]*|:$RELEASE_NAME|g; s|:carma-[a-zA-Z]*-[0-9]*\.[0-9]*\.[0-9]*|:$RELEASE_NAME|g; s|:develop|:$RELEASE_NAME|g" \ Dockerfile sed -i "s|--branch .*|--branch $SOURCE_BRANCH|g" \ docker/checkout.bash -fi \ No newline at end of file +fi From 291848c5471af0bd03a354692e5bea531f48463f Mon Sep 17 00:00:00 2001 From: CARMA Developer Date: Wed, 5 May 2021 12:33:37 -0700 Subject: [PATCH 03/11] Remove image_proc lines --- launch/mono_camera.launch | 3 --- 1 file changed, 3 deletions(-) diff --git a/launch/mono_camera.launch b/launch/mono_camera.launch index 70b7ce61..69e62f52 100644 --- a/launch/mono_camera.launch +++ b/launch/mono_camera.launch @@ -8,9 +8,6 @@ - - - From fc19b807652774ebad42390f5ed3d734efb34106 Mon Sep 17 00:00:00 2001 From: CARMA Developer Date: Wed, 5 May 2021 12:34:14 -0700 Subject: [PATCH 04/11] Update image dimensions --- launch/mono_camera.launch | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/launch/mono_camera.launch b/launch/mono_camera.launch index 69e62f52..b39f0815 100644 --- a/launch/mono_camera.launch +++ b/launch/mono_camera.launch @@ -70,8 +70,8 @@ - - + + From 82782fdbc838aa7e0b211642c6b346a485e5f845 Mon Sep 17 00:00:00 2001 From: CARMA Developer Date: Wed, 5 May 2021 12:48:34 -0700 Subject: [PATCH 05/11] Add related issue link in comment --- launch/mono_camera.launch | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/launch/mono_camera.launch b/launch/mono_camera.launch index b39f0815..a2287b1a 100644 --- a/launch/mono_camera.launch +++ b/launch/mono_camera.launch @@ -70,6 +70,10 @@ + + From 1415405292d0b3d458d995a4461b731c8c7024fb Mon Sep 17 00:00:00 2001 From: SaikrishnaBairamoni Date: Thu, 3 Jun 2021 22:45:21 -0400 Subject: [PATCH 06/11] Updating version numbers for CARMA release 3.6.0 --- Dockerfile | 2 +- docker/checkout.bash | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Dockerfile b/Dockerfile index 5deedfbe..937800d2 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 usdotfhwastol/carma-base:carma-system-3.6.0 as base FROM base as setup RUN mkdir ~/src diff --git a/docker/checkout.bash b/docker/checkout.bash index fc94822c..c13874c3 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 carma-system-3.6.0 + git clone https://github.com/usdot-fhwa-stol/carma-utils.git ~/src/carma-utils --branch carma-system-3.6.0 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-3.6.0 + git clone https://github.com/usdot-fhwa-stol/carma-utils.git ${dir}/src/carma-utils --branch carma-system-3.6.0 fi From 751d731b7a179c42162c9f6f76759690b5613843 Mon Sep 17 00:00:00 2001 From: SaikrishnaBairamoni Date: Tue, 8 Jun 2021 02:53:50 -0400 Subject: [PATCH 07/11] Update version number 3.6.0 --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 088733d8..b3f1d7d3 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.6.0 user: carma environment: TERM: xterm From bd16be296b93af14a0429e268268d5b655491970 Mon Sep 17 00:00:00 2001 From: SaikrishnaBairamoni Date: Fri, 11 Jun 2021 14:22:22 -0400 Subject: [PATCH 08/11] Revert "Merge branch 'develop' into release/zephyr" This reverts commit ddc3123a20aa4a8993953a869dd7a4509d28cd7f, reversing changes made to 91f884a8265f29a9c7e1fc14a73968736026f2c5. --- .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 b3f1d7d3..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.6.0 + - image: usdotfhwastoldev/carma-base:develop user: carma environment: TERM: xterm diff --git a/Dockerfile b/Dockerfile index 937800d2..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.6.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 c13874c3..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.6.0 - git clone https://github.com/usdot-fhwa-stol/carma-utils.git ~/src/carma-utils --branch carma-system-3.6.0 + 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.6.0 - git clone https://github.com/usdot-fhwa-stol/carma-utils.git ${dir}/src/carma-utils --branch carma-system-3.6.0 + 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 From c33e22d9aa18fab7864d47ddb89c5f3792321516 Mon Sep 17 00:00:00 2001 From: Saikrishna Bairamoni <84093461+SaikrishnaBairamoni@users.noreply.github.com> Date: Mon, 28 Jun 2021 16:44:52 -0400 Subject: [PATCH 09/11] Update config.yml --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 088733d8..b3f1d7d3 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.6.0 user: carma environment: TERM: xterm From 54fc14d7c01f77107638b19b51b94f3a081b6d1c Mon Sep 17 00:00:00 2001 From: Saikrishna Bairamoni <84093461+SaikrishnaBairamoni@users.noreply.github.com> Date: Mon, 28 Jun 2021 16:46:54 -0400 Subject: [PATCH 10/11] 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 fc94822c..936b5a64 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 carma-system-3.6.0 --depth 1 + git clone https://github.com/usdot-fhwa-stol/carma-utils.git ~/src/carma-utils --branch carma-system-3.6.0 --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-3.6.0 --depth 1 + git clone https://github.com/usdot-fhwa-stol/carma-utils.git ${dir}/src/carma-utils --branch carma-system-3.6.0 --depth 1 fi From 2417c137a4b3bdd12a3226a5e3cb42e1b7683e52 Mon Sep 17 00:00:00 2001 From: Saikrishna Bairamoni <84093461+SaikrishnaBairamoni@users.noreply.github.com> Date: Mon, 28 Jun 2021 16:47:48 -0400 Subject: [PATCH 11/11] Update Dockerfile --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 5deedfbe..937800d2 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 usdotfhwastol/carma-base:carma-system-3.6.0 as base FROM base as setup RUN mkdir ~/src