Mirrors_Framework/paparazzi
1
0
Fork 0
mirror of https://github.com/paparazzi/paparazzi.git synced 2026-06-02 05:17:03 +08:00
Code Issues Actions 27 Packages Projects Releases Wiki Activity

[docker] make it possible to disable X server access. (#2679)

Browse Source
This commit is contained in:
Fabien-B
2021-03-26 21:52:04 +01:00
committed by GitHub
parent 7d18d0c8a9
commit a7baf59842
1 changed files with 18 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
docker/run.sh
+9 -6
View File
@@ -13,6 +13,7 @@ fi
# check if running on Linux or OSX # check if running on Linux or OSX
UNAME=$(uname -s) UNAME=$(uname -s)
useX="${useX:-true}"
############################################################ ############################################################
# share this paparazzi directory with the container # share this paparazzi directory with the container
@@ -40,7 +41,9 @@ SHARE_PAPARAZZI_HOME_OPTS="--volume=$PAPARAZZI_SRC:$PPRZ_HOME_CONTAINER \
############################################################ ############################################################
# grant access to X-Server # grant access to X-Server
############################################################ ############################################################
if [ $UNAME == "Linux" ]; then if [ $useX = "true" ]
then
if [ $UNAME == "Linux" ]; then
XSOCK=/tmp/.X11-unix XSOCK=/tmp/.X11-unix
XAUTH=/tmp/.docker.xauth XAUTH=/tmp/.docker.xauth
touch $XAUTH touch $XAUTH
@@ -48,16 +51,16 @@ if [ $UNAME == "Linux" ]; then
# options to grant access to the Xserver # options to grant access to the Xserver
X_WINDOW_OPTS="--volume=$XSOCK:$XSOCK --volume=$XAUTH:$XAUTH --env=XAUTHORITY=${XAUTH} --env=DISPLAY=${DISPLAY}" X_WINDOW_OPTS="--volume=$XSOCK:$XSOCK --volume=$XAUTH:$XAUTH --env=XAUTHORITY=${XAUTH} --env=DISPLAY=${DISPLAY}"
fi fi
# using xauth with docker on OSX doesn't work, so we use socat: # using xauth with docker on OSX doesn't work, so we use socat:
# see https://github.com/docker/docker/issues/8710 # see https://github.com/docker/docker/issues/8710
if [ $UNAME == "Darwin" ]; then if [ $UNAME == "Darwin" ]; then
X_WINDOW_OPTS="--env=DISPLAY=192.168.99.1:0" X_WINDOW_OPTS="--env=DISPLAY=192.168.99.1:0"
TCPPROXY="socat TCP-LISTEN:6000,reuseaddr,fork UNIX-CLIENT:\"$DISPLAY\"" TCPPROXY="socat TCP-LISTEN:6000,reuseaddr,fork UNIX-CLIENT:\"$DISPLAY\""
fi
fi fi
############################################################ ############################################################
# Audio # Audio
############################################################ ############################################################