fly316/PX4-Autopilot
7
0
Fork 0
mirror of https://gitee.com/mirrors_PX4/PX4-Autopilot.git synced 2026-11-09 08:41:37 +08:00
Code Issues Packages Projects Releases Wiki Activity

docker: cleanup verbose script output

Browse Source
This commit is contained in:
Ramon Roche
2022-08-02 09:30:39 -07:00
parent 34b9dc880f
commit a3d0ca9800
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Tools/docker_run.sh
+1 -1
View File
@@ -8,7 +8,7 @@ fi
PX4_DOCKER_REPO="px4io/px4-dev:$TAG_NAME" PX4_DOCKER_REPO="px4io/px4-dev:$TAG_NAME"
echo "docker_run.sh: Running [$PX4_DOCKER_REPO]" echo "[docker_run.sh]: Running '$PX4_DOCKER_REPO'"
PWD=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd ) PWD=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )
SRC_DIR=$PWD/../ SRC_DIR=$PWD/../
Tools/setup/docker-entrypoint.sh
+3 -2
View File
@@ -1,11 +1,12 @@
#!/bin/bash #!/bin/bash
echo "[docker-entrypoint.sh] Starting entrypoint"
# Start virtual X server in the background # Start virtual X server in the background
# - DISPLAY default is :99, set in dockerfile # - DISPLAY default is :99, set in dockerfile
# - Users can override with `-e DISPLAY=` in `docker run` command to avoid # - Users can override with `-e DISPLAY=` in `docker run` command to avoid
# running Xvfb and attach their screen # running Xvfb and attach their screen
if [[ -x "$(command -v Xvfb)" && "$DISPLAY" == ":99" ]]; then if [[ -x "$(command -v Xvfb)" && "$DISPLAY" == ":99" ]]; then
echo "Starting Xvfb" echo "[docker-entrypoint.sh] Starting Xvfb"
Xvfb :99 -screen 0 1600x1200x24+32 & Xvfb :99 -screen 0 1600x1200x24+32 &
fi fi
@@ -17,7 +18,7 @@ fi
# Use the LOCAL_USER_ID if passed in at runtime # Use the LOCAL_USER_ID if passed in at runtime
if [ -n "${LOCAL_USER_ID}" ]; then if [ -n "${LOCAL_USER_ID}" ]; then
echo "Starting with UID : $LOCAL_USER_ID" echo "[docker-entrypoint.sh] Starting with UID : $LOCAL_USER_ID"
# modify existing user's id # modify existing user's id
usermod -u $LOCAL_USER_ID user usermod -u $LOCAL_USER_ID user