fix restart issue
This commit is contained in:
parent
90af31a210
commit
a468ed5fed
3 changed files with 9 additions and 24 deletions
|
|
@ -12,10 +12,10 @@ rm -f /fgc/data/browser/SingletonLock
|
|||
# Options passed directly to the Xvfb server:
|
||||
# -ac disables host-based access control mechanisms
|
||||
# −screen NUM WxHxD creates the screen and sets its width, height, and depth
|
||||
Xvfb "$DISPLAY" -ac -screen 0 "${SCREEN_WIDTH}x${SCREEN_HEIGHT}x${SCREEN_DEPTH}" >/dev/null 2>&1 &
|
||||
|
||||
if [ "$VNC_ENABLED" = true ]; then
|
||||
vnc-start >/dev/null 2>&1 &
|
||||
fi
|
||||
|
||||
Xvfb :1 -ac -screen 0 "${SCREEN_WIDTH}x${SCREEN_HEIGHT}x${SCREEN_DEPTH}" >/dev/null 2>&1 &
|
||||
x11vnc -display :1.0 -forever -shared -rfbport "${VNC_PORT:-5900}" -passwd "${VNC_PASSWORD:-secret}" -bg
|
||||
websockify -D --web "$NOVNC_HOME" "$NOVNC_PORT" "localhost:$VNC_PORT" &
|
||||
DISPLAY=:1.0
|
||||
export DISPLAY
|
||||
exec tini -g -- "$@"
|
||||
|
|
|
|||
|
|
@ -1,11 +0,0 @@
|
|||
#!/bin/sh
|
||||
|
||||
# Start VNC in a background process:
|
||||
x11vnc -display "$DISPLAY" -forever -shared -rfbport "${VNC_PORT:-5900}" \
|
||||
-passwd "${VNC_PASSWORD:-secret}" -bg
|
||||
NOVNC_HOME=/usr/share/novnc
|
||||
ln -s $NOVNC_HOME/vnc_auto.html $NOVNC_HOME/index.html
|
||||
websockify -D --web "$NOVNC_HOME" "$NOVNC_PORT" "localhost:$VNC_PORT" &
|
||||
|
||||
# Execute the given command:
|
||||
exec "$@"
|
||||
Loading…
Add table
Add a link
Reference in a new issue