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 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..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 diff --git a/hooks/pre_build b/hooks/pre_build index 4fcb6f2d..1b199017 100644 --- a/hooks/pre_build +++ b/hooks/pre_build @@ -6,8 +6,10 @@ 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 + # swap checkout branch in checkout.bash to release branch sed -i "s|--branch .*|--branch $SOURCE_BRANCH|g" \ docker/checkout.bash -fi \ No newline at end of file +fi diff --git a/launch/mono_camera.launch b/launch/mono_camera.launch index 70b7ce61..a2287b1a 100644 --- a/launch/mono_camera.launch +++ b/launch/mono_camera.launch @@ -8,9 +8,6 @@ - - - @@ -73,8 +70,12 @@ - - + + + +