Unverified Commit 361f6055 authored by Kroese's avatar Kroese Committed by GitHub
Browse files

feat: Add webbased display (#307)

parent 00318133

Dockerfile

+0 −2
Original line number Diff line number Diff line
@@ -9,14 +9,12 @@ RUN apt-get update \ 
 	tini \

	wget \

        ovmf \

        novnc \

	procps \

	iptables \

	iproute2 \

	dnsmasq \

	net-tools \

        qemu-utils \

 	websockify \

	ca-certificates \

	netcat-openbsd \

	qemu-system-x86 \

src/display.sh

+6 −1
Original line number Diff line number Diff line
@@ -10,6 +10,11 @@ case "${DISPLAY,,}" in 
  vnc)

    DISPLAY_OPTS="-display vnc=:0 -vga virtio"

    ;;

  web)

    addPackage "novnc" "NoVNC"

    addPackage "websockify" "Websockify"

    DISPLAY_OPTS="-display vnc=:0 -vga virtio"

    ;;

  *)

    DISPLAY_OPTS="-display $DISPLAY -vga none"

    ;;
@@ -20,7 +25,7 @@ if [[ "$GPU" != [Yy1]* ]] || [[ "$ARCH" != "amd64" ]]; then 
fi



DISPLAY_OPTS="-display egl-headless,rendernode=/dev/dri/renderD128 -vga virtio"

[[ "${DISPLAY,,}" == "vnc" ]] && DISPLAY_OPTS="$DISPLAY_OPTS -vnc :0"

[[ "${DISPLAY,,}" == "vnc" || "${DISPLAY,,}" == "web" ]] && DISPLAY_OPTS="$DISPLAY_OPTS -vnc :0"



[ ! -d /dev/dri ] && mkdir -m 755 /dev/dri

src/entry.sh

+1 −1
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ cd /run 


trap - ERR



if [[ "${DISPLAY,,}" == "vnc" ]]; then

if [[ "${DISPLAY,,}" == "web" ]]; then

  websockify -D --web /usr/share/novnc/ 8006 localhost:5900

fi

src/network.sh

+4 −0
Original line number Diff line number Diff line
@@ -98,6 +98,10 @@ getPorts() { 
  local novnc="8006"



  if [[ "${DISPLAY,,}" == "vnc" ]] && [[ "$list" != *"$vnc"* ]]; then

    [ -z "$list" ] && list="$vnc" || list="$list,$vnc"

  fi



  if [[ "${DISPLAY,,}" == "web" ]] && [[ "$list" != *"$novnc"* ]]; then

    [ -z "$list" ] && list="$vnc,$novnc" || list="$list,$vnc,$novnc"

  fi