alihan/docker-selenium-grid
1
0
Fork 0
mirror of https://github.com/SeleniumHQ/docker-selenium.git synced 2024-02-23 15:49:32 +03:00
Code Issues Projects Releases Wiki Activity

Adding SE_START_VNC to config VNC (#1804)

Browse Source 
[deploy]
This commit is contained in:
Diego Molina
2023-03-06 22:30:00 +01:00
committed by GitHub
parent 25cc3e5c38
commit 59cf4f7549
3 changed files with 46 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
NodeBase/Dockerfile
View File

@@ -165,8 +165,7 @@ ENV SE_SCREEN_HEIGHT 1020
ENV SE_SCREEN_DEPTH 24
ENV SE_SCREEN_DPI 96
ENV SE_START_XVFB true
# Temporal fix for https://github.com/SeleniumHQ/docker-selenium/issues/1610
ENV START_XVFB true
ENV SE_START_VNC true
ENV SE_START_NO_VNC true
ENV SE_NO_VNC_PORT 7900
ENV SE_VNC_PORT 5900

10
NodeBase/start-novnc.sh
View File

@@ -3,10 +3,14 @@
# IMPORTANT: Change this file only in directory NodeBase!
if [ "${START_XVFB:-$SE_START_XVFB}" = true ] ; then
if [ "${START_NO_VNC:-$SE_START_NO_VNC}" = true ] ; then
/opt/bin/noVNC/utils/novnc_proxy --listen ${NO_VNC_PORT:-$SE_NO_VNC_PORT} --vnc localhost:${VNC_PORT:-$SE_VNC_PORT}
if [ "${START_VNC:-$SE_START_VNC}" = true ] ; then
if [ "${START_NO_VNC:-$SE_START_NO_VNC}" = true ] ; then
/opt/bin/noVNC/utils/novnc_proxy --listen ${NO_VNC_PORT:-$SE_NO_VNC_PORT} --vnc localhost:${VNC_PORT:-$SE_VNC_PORT}
else
echo "noVNC won't start because SE_START_NO_VNC is false."
fi
else
echo "noVNC won't start because SE_START_NO_VNC is false."
echo "noVNC won't start because VNC is configured to not start."
fi
else
echo "noVNC won't start because Xvfb is configured to not start."

73
NodeBase/start-vnc.sh
View File

@@ -3,42 +3,45 @@
# IMPORTANT: Change this file only in directory NodeBase!
if [ "${START_XVFB:-$SE_START_XVFB}" = true ] ; then
# Centering wallpaper
for i in $(seq 1 10)
do
sleep 0.5
echo "Centering wallpaper"
/usr/bin/fbsetbg -c /usr/share/images/fluxbox/ubuntu-light.png
if [ $? -eq 0 ]; then
break
fi
done
VNC_NO_PASSWORD=${VNC_NO_PASSWORD:-$SE_VNC_NO_PASSWORD}
if [ ! -z $VNC_NO_PASSWORD ]; then
echo "Starting VNC server without password authentication"
X11VNC_OPTS=
else
X11VNC_OPTS=-usepw
fi
VNC_VIEW_ONLY=${VNC_VIEW_ONLY:-$SE_VNC_VIEW_ONLY}
if [ ! -z $VNC_VIEW_ONLY ]; then
echo "Starting VNC server with viewonly option"
X11VNC_OPTS="${X11VNC_OPTS} -viewonly"
fi
for i in $(seq 1 10)
do
sleep 1
xdpyinfo -display ${DISPLAY} >/dev/null 2>&1
if [ $? -eq 0 ]; then
break
if [ "${START_VNC:-$SE_START_VNC}" = true ] ; then
# Centering wallpaper
for i in $(seq 1 10)
do
sleep 0.5
echo "Centering wallpaper"
/usr/bin/fbsetbg -c /usr/share/images/fluxbox/ubuntu-light.png
if [ $? -eq 0 ]; then
break
fi
done
VNC_NO_PASSWORD=${VNC_NO_PASSWORD:-$SE_VNC_NO_PASSWORD}
if [ ! -z $VNC_NO_PASSWORD ]; then
echo "Starting VNC server without password authentication"
X11VNC_OPTS=
else
X11VNC_OPTS=-usepw
fi
echo "Waiting for Xvfb..."
done
x11vnc ${X11VNC_OPTS} -forever -shared -rfbport ${VNC_PORT:-$SE_VNC_PORT} -rfbportv6 ${VNC_PORT:-$SE_VNC_PORT} -display ${DISPLAY}
VNC_VIEW_ONLY=${VNC_VIEW_ONLY:-$SE_VNC_VIEW_ONLY}
if [ ! -z $VNC_VIEW_ONLY ]; then
echo "Starting VNC server with viewonly option"
X11VNC_OPTS="${X11VNC_OPTS} -viewonly"
fi
for i in $(seq 1 10)
do
sleep 1
xdpyinfo -display ${DISPLAY} >/dev/null 2>&1
if [ $? -eq 0 ]; then
break
fi
echo "Waiting for Xvfb..."
done
x11vnc ${X11VNC_OPTS} -forever -shared -rfbport ${VNC_PORT:-$SE_VNC_PORT} -rfbportv6 ${VNC_PORT:-$SE_VNC_PORT} -display ${DISPLAY}
else
echo "VNC won't start because SE_START_VNC is false."
fi
else
echo "Vnc won't start because Xvfb is configured to not start."
echo "VNC won't start because Xvfb is configured to not start."
fi