From 08723789ee1ee2fa04cce9d3b837c5ffbd673025 Mon Sep 17 00:00:00 2001 From: Kyle Rush Date: Mon, 12 Dec 2022 11:06:35 -0500 Subject: [PATCH 1/5] Copy fix for incremental build args from carma-platform --- docker/build-image.sh | 33 +++++++++++++++++++++++++++------ 1 file changed, 27 insertions(+), 6 deletions(-) diff --git a/docker/build-image.sh b/docker/build-image.sh index a4f5e4a..5a95e8a 100755 --- a/docker/build-image.sh +++ b/docker/build-image.sh @@ -23,43 +23,64 @@ echo "" echo "##### $IMAGE Docker Image Build Script #####" echo "" +ROS1_PACKAGES="" +ROS2_PACKAGES="" +ROS1_PACKAGES_COLLECT=false +ROS2_PACKAGES_COLLECT=false + while [[ $# -gt 0 ]]; do arg="$1" case $arg in -v|--version) + ROS1_PACKAGES_COLLECT=false + ROS2_PACKAGES_COLLECT=false + COMPONENT_VERSION_STRING="$2" shift shift ;; --system-release) + ROS1_PACKAGES_COLLECT=false + ROS2_PACKAGES_COLLECT=false + SYSTEM_RELEASE=true shift ;; -p|--push) + ROS1_PACKAGES_COLLECT=false + ROS2_PACKAGES_COLLECT=false + PUSH=true shift ;; -d|--develop) + ROS1_PACKAGES_COLLECT=false + ROS2_PACKAGES_COLLECT=false + USERNAME=usdotfhwastoldev COMPONENT_VERSION_STRING=develop shift ;; --ros-1-packages|--ros1) - ROS1_PACKAGES="" + ROS1_PACKAGES_COLLECT=true + ROS2_PACKAGES_COLLECT=false + shift ;; --ros-2-packages|--ros2) - ROS2_PACKAGES="" + ROS1_PACKAGES_COLLECT=false + ROS2_PACKAGES_COLLECT=true + shift ;; *) # Var test based on Stack Overflow question: https://stackoverflow.com/questions/5406858/difference-between-unset-and-empty-variables-in-bash # Asker: green69 # Answerer: geekosaur - if [ "${ROS2_PACKAGES+set}" = "set" ]; then - ROS2_PACKAGES="$ROS2_PACKAGES $arg" - elif [ "${ROS1_PACKAGES+set}" = "set" ]; then + if $ROS1_PACKAGES_COLLECT; then ROS1_PACKAGES="$ROS1_PACKAGES $arg" + elif $ROS2_PACKAGES_COLLECT; then + ROS2_PACKAGES="$ROS2_PACKAGES $arg" else echo "Unknown argument $arg..." exit -1 @@ -70,7 +91,7 @@ while [[ $# -gt 0 ]]; do done if [[ ! -z "$ROS1_PACKAGES$ROS2_PACKAGES" ]]; then - echo "Performing incremental build of image to rebuild packages: $ROS1_PACKAGES $ROS2_PACKAGES..." + echo "Performing incremental build of image to rebuild packages: ROS1>> $ROS1_PACKAGES ROS2>> $ROS2_PACKAGES..." echo "Updating Dockerfile references to use most recent image as base image" # Trim of docker image LS command sourced from From 23604bf4f39797690cbebb38bc9c151be49816cd Mon Sep 17 00:00:00 2001 From: Saikrishna Bairamoni <84093461+SaikrishnaBairamoni@users.noreply.github.com> Date: Thu, 9 Feb 2023 10:08:48 -0500 Subject: [PATCH 2/5] Delete pull_request_template.md (#102) --- docs/pull_request_template.md | 44 ----------------------------------- 1 file changed, 44 deletions(-) delete mode 100644 docs/pull_request_template.md diff --git a/docs/pull_request_template.md b/docs/pull_request_template.md deleted file mode 100644 index 88abd7b..0000000 --- a/docs/pull_request_template.md +++ /dev/null @@ -1,44 +0,0 @@ - - -# PR Details -## Description - - - -## Related Issue - - - - - - -## Motivation and Context - - - -## How Has This Been Tested? - - - - - -## Types of changes - - - -- [ ] Defect fix (non-breaking change that fixes an issue) -- [ ] New feature (non-breaking change that adds functionality) -- [ ] Breaking change (fix or feature that cause existing functionality to change) - -## Checklist: - - - - -- [ ] I have added any new packages to the sonar-scanner.properties file -- [ ] My change requires a change to the documentation. -- [ ] I have updated the documentation accordingly. -- [ ] I have read the **CONTRIBUTING** document. -[CARMA Contributing Guide](https://github.com/usdot-fhwa-stol/carma-platform/blob/develop/Contributing.md) -- [ ] I have added tests to cover my changes. -- [ ] All new and existing tests passed. \ No newline at end of file From 31af815bb1ea10a292be4947f88933e52c2a675e Mon Sep 17 00:00:00 2001 From: Cody Garver Date: Mon, 20 Feb 2023 12:47:33 -0500 Subject: [PATCH 3/5] Revert from carma-system-4.3.0 to develop --- .circleci/config.yml | 2 +- Dockerfile | 4 ++-- docker/checkout.bash | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index e621c67..b1322d4 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/autoware.ai:carma-system-4.3.0 + - image: usdotfhwastoldev/autoware.ai:develop user: carma environment: TERM: xterm # use xterm to get full display output from build diff --git a/Dockerfile b/Dockerfile index 67bb15c..8fa79cd 100644 --- a/Dockerfile +++ b/Dockerfile @@ -12,7 +12,7 @@ # License for the specific language governing permissions and limitations under # the License. -FROM usdotfhwastol/autoware.ai:carma-system-4.3.0 as setup +FROM usdotfhwastoldev/autoware.ai:develop 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 usdotfhwastol/autoware.ai:carma-system-4.3.0 +FROM usdotfhwastoldev/autoware.ai:develop ARG BUILD_DATE="NULL" diff --git a/docker/checkout.bash b/docker/checkout.bash index fbad21e..18c728a 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 carma-system-4.3.0 - git clone https://github.com/usdot-fhwa-stol/carma-utils.git ${dir}/src/CARMAUtils --branch carma-system-4.3.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 e1ac8ab88ef3071ec92f2fd406cf951b56c874a4 Mon Sep 17 00:00:00 2001 From: Saikrishna Bairamoni <84093461+SaikrishnaBairamoni@users.noreply.github.com> Date: Wed, 19 Apr 2023 21:50:49 -0400 Subject: [PATCH 4/5] update dockerfiles to point k900 --- .circleci/config.yml | 2 +- Dockerfile | 4 ++-- docker/checkout.bash | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index b1322d4..90ba021 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/autoware.ai:develop + - image: usdotfhwastolcandidate/autoware.ai:k900 user: carma environment: TERM: xterm # use xterm to get full display output from build diff --git a/Dockerfile b/Dockerfile index 8fa79cd..3f52480 100644 --- a/Dockerfile +++ b/Dockerfile @@ -12,7 +12,7 @@ # License for the specific language governing permissions and limitations under # the License. -FROM usdotfhwastoldev/autoware.ai:develop as setup +FROM usdotfhwastolcandidate/autoware.ai:k900 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/autoware.ai:develop +FROM usdotfhwastolcandidate/autoware.ai:k900 ARG BUILD_DATE="NULL" diff --git a/docker/checkout.bash b/docker/checkout.bash index 18c728a..a5b0721 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/k900 + git clone https://github.com/usdot-fhwa-stol/carma-utils.git ${dir}/src/CARMAUtils --branch release/k900 fi From 3d00809e7a26c43f54c76394e2ad6fc5caaf7913 Mon Sep 17 00:00:00 2001 From: Saikrishna Bairamoni <84093461+SaikrishnaBairamoni@users.noreply.github.com> Date: Thu, 4 May 2023 10:39:12 -0400 Subject: [PATCH 5/5] update docker files to point new version 4.4.0 --- .circleci/config.yml | 2 +- Dockerfile | 4 ++-- docker/checkout.bash | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 90ba021..d281bd9 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/autoware.ai:k900 + - image: usdotfhwastol/autoware.ai:carma-system-4.4.0 user: carma environment: TERM: xterm # use xterm to get full display output from build diff --git a/Dockerfile b/Dockerfile index 3f52480..c193235 100644 --- a/Dockerfile +++ b/Dockerfile @@ -12,7 +12,7 @@ # License for the specific language governing permissions and limitations under # the License. -FROM usdotfhwastolcandidate/autoware.ai:k900 as setup +FROM usdotfhwastol/autoware.ai:carma-system-4.4.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/autoware.ai:k900 +FROM usdotfhwastol/autoware.ai:carma-system-4.4.0 ARG BUILD_DATE="NULL" diff --git a/docker/checkout.bash b/docker/checkout.bash index a5b0721..f519576 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/k900 - git clone https://github.com/usdot-fhwa-stol/carma-utils.git ${dir}/src/CARMAUtils --branch release/k900 + git clone https://github.com/usdot-fhwa-stol/carma-msgs.git ${dir}/src/CARMAMsgs --branch carma-system-4.4.0 + git clone https://github.com/usdot-fhwa-stol/carma-utils.git ${dir}/src/CARMAUtils --branch carma-system-4.4.0 fi