Only require Xtigervnc or Xvfb+x11vnc for Docker with vnc console. Ref #1438

This commit is contained in:
grossmj 2018-11-11 22:33:58 +08:00
parent d0bab9947e
commit 029344da14

View File

@ -519,7 +519,7 @@ class DockerVM(BaseNode):
""" """
self._display = self._get_free_display_port() self._display = self._get_free_display_port()
if shutil.which("Xtigervnc") is None or shutil.which("Xvfb") is None or shutil.which("x11vnc") is None: if not (shutil.which("Xtigervnc") or shutil.which("Xvfb") and shutil.which("x11vnc")):
raise DockerError("Please install tigervnc-standalone-server (recommended) or Xvfb + x11vnc before using VNC support") raise DockerError("Please install tigervnc-standalone-server (recommended) or Xvfb + x11vnc before using VNC support")
if shutil.which("Xtigervnc"): if shutil.which("Xtigervnc"):