Skip to content

Commit 723be2c

Browse files
Small fixes (#39)
2 parents 728ab3a + b25172c commit 723be2c

File tree

1 file changed

+6
-2
lines changed

1 file changed

+6
-2
lines changed

.ci/install.bash

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,11 @@ then
6969
DOCKER_MOUNT_KNOWN_HOSTS_ARGS="--mount type=bind,source=${HOME}/.ssh/known_hosts,target=/tmp/known_hosts_extra"
7070
fi
7171

72-
DOCKER_HOME=$(docker run --name tue-env --rm "${IMAGE_NAME}:${BRANCH_TAG}" bash -c 'echo "${HOME}"' | tr -d '\r')
72+
# Docker container can show a header on start-up. We don't want to capture it
73+
docker run --detach --tty --name tue-env "${IMAGE_NAME}:${BRANCH_TAG}"
74+
DOCKER_HOME=$(docker exec -t tue-env bash -c 'echo "${HOME}"' | tr -d '\r')
75+
docker stop tue-env &> /dev/null || true
76+
docker rm tue-env &> /dev/null || true
7377

7478
# Make sure the ~/.ccache folder exists
7579
mkdir -p "$HOME"/.ccache
@@ -108,7 +112,7 @@ docker cp "${BASEDIR}"/get_install_build_packages.py tue-env:"${DOCKER_HOME}"
108112

109113
echo -e "\e[35m\e[1m~/get_message_packages.py base_local_planner costmap_2d\e[0m"
110114
eval "$(docker exec -t tue-env bash -c 'source ~/.bashrc; ${HOME}/get_install_build_packages.py base_local_planner costmap_2d' | tr -d '\r')" # Skip base_local_planner and costmap_2d as these take too much time
111-
INSTALL_BUILD_TARGETS=(${INSTALL_BUILD_PKGS[@]/#/ros-})
115+
INSTALL_BUILD_TARGETS=("${INSTALL_BUILD_PKGS[@]/#/ros-}")
112116
echo -e "\e[35m\e[1mINSTALL_BUILD_PKGS=" "${INSTALL_BUILD_PKGS[*]}" "\e[0m"
113117
echo -e "\e[35m\e[1mBUILD_PKGS=" "${BUILD_PKGS[*]}" "\e[0m"
114118

0 commit comments

Comments
 (0)