From e6be5e75e0d672f826801a89df823547464c0af8 Mon Sep 17 00:00:00 2001 From: Javier Izquierdo Hernandez Date: Wed, 29 Oct 2025 20:28:47 +0100 Subject: [PATCH 1/3] Test console output --- manager/manager/manager.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/manager/manager/manager.py b/manager/manager/manager.py index 943eeaa..be96300 100644 --- a/manager/manager/manager.py +++ b/manager/manager/manager.py @@ -689,8 +689,8 @@ def on_run_application(self, event): "source /workspace/code/install/setup.bash && ros2 run academy academyCode" ], stdin=open("/dev/pts/" + console_fd, "r"), - stdout=sys.stdout, - stderr=subprocess.STDOUT, + stdout=open("/dev/pts/" + console_fd, "w"), + stderr=open("/dev/pts/" + console_fd, "w"), bufsize=1024, universal_newlines=True, shell=True, @@ -717,8 +717,8 @@ def on_run_application(self, event): self.application_process = subprocess.Popen( ["python3", entrypoint], stdin=open("/dev/pts/" + console_fd, "r"), - stdout=sys.stdout, - stderr=subprocess.STDOUT, + stdout=open("/dev/pts/" + console_fd, "w"), + stderr=open("/dev/pts/" + console_fd, "w"), bufsize=1024, universal_newlines=True, ) From aa99f7e022f7fcb0997c331d04b5276737b727a4 Mon Sep 17 00:00:00 2001 From: Javier Izquierdo Hernandez Date: Thu, 30 Oct 2025 22:49:15 +0100 Subject: [PATCH 2/3] Remove error output --- manager/manager/manager.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/manager/manager/manager.py b/manager/manager/manager.py index be96300..be85314 100644 --- a/manager/manager/manager.py +++ b/manager/manager/manager.py @@ -690,7 +690,7 @@ def on_run_application(self, event): ], stdin=open("/dev/pts/" + console_fd, "r"), stdout=open("/dev/pts/" + console_fd, "w"), - stderr=open("/dev/pts/" + console_fd, "w"), + stderr=sys.stdout, bufsize=1024, universal_newlines=True, shell=True, @@ -718,7 +718,7 @@ def on_run_application(self, event): ["python3", entrypoint], stdin=open("/dev/pts/" + console_fd, "r"), stdout=open("/dev/pts/" + console_fd, "w"), - stderr=open("/dev/pts/" + console_fd, "w"), + stderr=sys.stdout, bufsize=1024, universal_newlines=True, ) From ed22a06665d2c6cd0444ddde3aeb2bc8883c132b Mon Sep 17 00:00:00 2001 From: Javier Izquierdo Hernandez Date: Fri, 31 Oct 2025 14:17:11 +0100 Subject: [PATCH 3/3] Update vnc server --- manager/manager/vnc/vnc_server.py | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/manager/manager/vnc/vnc_server.py b/manager/manager/vnc/vnc_server.py index 91bc690..2aa71e3 100755 --- a/manager/manager/vnc/vnc_server.py +++ b/manager/manager/vnc/vnc_server.py @@ -39,16 +39,23 @@ def start_vnc(self, display, internal_port, external_port): self.threads.append(turbovnc_thread) wait_for_xserver(display) + certs = "" + + if os.path.isfile("/etc/certs/cert.pem"): + certs = "--cert /etc/certs/cert.pem --key /etc/certs/privkey.pem" + # Start noVNC with default port 6080 listening to VNC server on 5900 if self.get_ros_version() == "2": novnc_cmd = ( f"/noVNC/utils/novnc_proxy --listen {external_port} " - f"--vnc localhost:{internal_port}" + f"--vnc localhost:{internal_port} " + f"{certs}" ) else: novnc_cmd = ( f"/noVNC/utils/launch.sh --listen {external_port} " - f"--vnc localhost:{internal_port}" + f"--vnc localhost:{internal_port} " + f"{certs}" ) novnc_thread = DockerThread(novnc_cmd)