mirror of
https://gitee.com/mirrors_PX4/PX4-Autopilot.git
synced 2026-05-16 17:27:35 +08:00
docker: update docker entry
This commit is contained in:
@@ -2,26 +2,26 @@
|
||||
|
||||
GREEN='\033[0;32m'
|
||||
NC='\033[0m' # No Color
|
||||
FILE_DESCRIPTOR="${GREEN}[docker-entrypoint.sh]${NC}"
|
||||
SCRIPTID="${GREEN}[docker-entrypoint.sh]${NC}"
|
||||
|
||||
echo -e "$FILE_DESCRIPTOR Starting"
|
||||
echo -e "$SCRIPTID Starting"
|
||||
|
||||
# Start virtual X server in the background
|
||||
# - DISPLAY default is :99, set in dockerfile
|
||||
# - Users can override with `-e DISPLAY=` in `docker run` command to avoid
|
||||
# running Xvfb and attach their screen
|
||||
if [[ -x "$(command -v Xvfb)" && "$DISPLAY" == ":99" ]]; then
|
||||
echo -e "$FILE_DESCRIPTOR Starting Xvfb"
|
||||
echo -e "$SCRIPTID Starting Xvfb"
|
||||
Xvfb :99 -screen 0 1600x1200x24+32 &
|
||||
fi
|
||||
|
||||
# Check if the ROS_DISTRO is passed and use it
|
||||
# to source the ROS environment
|
||||
if [ -n "${ROS_DISTRO}" ]; then
|
||||
echo -e "$FILE_DESCRIPTOR ROS: ${ROS_DISTRO}"
|
||||
echo -e "$SCRIPTID ROS: ${ROS_DISTRO}"
|
||||
source "/opt/ros/$ROS_DISTRO/setup.bash"
|
||||
fi
|
||||
|
||||
echo -e "$FILE_DESCRIPTOR ($( uname -m ))"
|
||||
echo -e "$SCRIPTID ($( uname -m ))"
|
||||
|
||||
exec "$@"
|
||||
|
||||
Reference in New Issue
Block a user