Fix reading output from docker (#730)

VERSION

@@ -1 +1 @@
-1.24.2
+1.24.3

ci/build-package.sh

@@ -33,7 +33,7 @@ do
 done
 
 echo -e "\e[35m\e[1mPACKAGE     = ${PACKAGE}\e[0m"
-ROS_VERSION=$(docker exec -t tue-env bash -c 'source ~/.bashrc; echo "${ROS_VERSION}"' | tr -d '\r')
+ROS_VERSION=$(docker exec tue-env bash -c 'source ~/.bashrc; echo "${ROS_VERSION}"' | tr -d '\r')
 echo -e "\e[35m\e[1mROS_VERSION = ${ROS_VERSION}\e[0m"
 
 # If packages is non-zero, this is a multi-package repo. In multi-package repo, check if this package needs CI.
@@ -53,7 +53,7 @@ then
     docker exec -t tue-env bash -c 'source ~/.bashrc; cd "${TUE_SYSTEM_DIR}"/src/"${PACKAGE}" && /usr/bin/python3 "$(command -v catkin)" build --this --no-status -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCATKIN_ENABLE_TESTING=OFF'
 else
     echo -e "\e[35m\e[1mCheck for default mixin repo (colcon mixin list)\e[0m"
-    MIXIN_REPOS=$(docker exec -t tue-env bash -c 'source ~/.bashrc; cd "${TUE_SYSTEM_DIR}" && colcon mixin list | grep -v "^- "' | tr -d '\r' | awk -F ": " '{print $1}')
+    MIXIN_REPOS=$(docker exec tue-env bash -c 'source ~/.bashrc; cd "${TUE_SYSTEM_DIR}" && colcon mixin list | grep -v "^- "' | tr -d '\r' | awk -F ": " '{print $1}')
     if ! echo -e "${MIXIN_REPOS}" | grep "^default$" -q
     then
         echo -e "\e[35m\e[1mAdd the default mixin repo (colcon mixin add default https://raw.githubusercontent.com/colcon/colcon-mixin-repository/master/index.yaml)\e[0m"

ci/install-package.sh

@@ -171,7 +171,11 @@ then
     BRANCH_TAG=$MASTER_TAG
 fi
 
-DOCKER_HOME=$(docker run --name tue-env --rm "$IMAGE_NAME:$BRANCH_TAG" bash -c 'echo "$HOME"' | tr -d '\r')
+# Docker container can show a header on start-up. We don't want to capture it
+docker run --detach --tty --name tue-env "${IMAGE_NAME}:${BRANCH_TAG}"
+DOCKER_HOME=$(docker exec tue-env bash -c 'echo "${HOME}"' | tr -d '\r')
+docker stop tue-env  &> /dev/null || true
+docker rm tue-env &> /dev/null || true
 
 # Make sure the ~/.ccache folder exists
 mkdir -p "$HOME"/.ccache
@@ -204,10 +208,10 @@ fi
 # Catch the ROS_DISTRO of the docker container
 # stip carriage return from docker output by "tr -d '\r'"
 # see https://unix.stackexchange.com/a/487185
-ROS_DISTRO=$(docker exec -t tue-env bash -c 'source ~/.bashrc; echo "$ROS_DISTRO"' | tr -d '\r')
+ROS_DISTRO=$(docker exec tue-env bash -c 'source ~/.bashrc; echo "${ROS_DISTRO}"' | tr -d '\r')
 echo -e "\e[35m\e[1mROS_DISTRO = ${ROS_DISTRO}\e[0m"
 
-TUE_SYSTEM_DIR=$(docker exec -t tue-env bash -c 'source ~/.bashrc; echo "$TUE_SYSTEM_DIR"' | tr -d '\r')
+TUE_SYSTEM_DIR=$(docker exec tue-env bash -c 'source ~/.bashrc; echo "${TUE_SYSTEM_DIR}"' | tr -d '\r')
 
 # First install only the git repo of the package so that appropriate branch can be checked out later
 echo -e "\e[35m\e[1mtue-get install ros-$PACKAGE --no-ros-deps\e[0m"

ci/test-package.sh

@@ -33,7 +33,7 @@ do
 done
 
 echo -e "\e[35m\e[1mPACKAGE     = ${PACKAGE}\e[0m"
-ROS_VERSION=$(docker exec -t tue-env bash -c 'source ~/.bashrc; echo "${ROS_VERSION}"' | tr -d '\r')
+ROS_VERSION=$(docker exec tue-env bash -c 'source ~/.bashrc; echo "${ROS_VERSION}"' | tr -d '\r')
 echo -e "\e[35m\e[1mROS_VERSION = ${ROS_VERSION}\e[0m"
 
 # If packages is non-zero, this is a multi-package repo. In multi-package repo, check if this package needs CI.