.

Signed-off-by: Oguz Ozturk <oguzkaganozt@gmail.com>
autowarefoundation · Nov 21, 2024 · ceb5159 · ceb5159
1 parent 506a1f9
commit ceb5159
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 7 deletions.
diff --git a/.dockerignore b/.dockerignore
@@ -10,7 +10,7 @@
 docker
 !docker/etc
 !docker/scripts
-!docker/simulator-tools
+!docker/simulator-visualizer
 !docker/vnc
 
 # Ignore a part of files under src

diff --git a/docker/docker-bake.hcl b/docker/docker-bake.hcl
@@ -12,7 +12,7 @@ group "default" {
     "universe-vehicle-system",
     "universe-devel",
     "universe",
-    "simulator-tools"
+    "simulator-visualizer"
   ]
 }
 
@@ -29,7 +29,7 @@ target "docker-metadata-action-universe-vehicle-system-devel" {}
 target "docker-metadata-action-universe-vehicle-system" {}
 target "docker-metadata-action-universe-devel" {}
 target "docker-metadata-action-universe" {}
-target "docker-metadata-action-simulator-tools" {}
+target "docker-metadata-action-simulator-visualizer" {}
 target "base" {
   inherits = ["docker-metadata-action-base"]
   dockerfile = "docker/Dockerfile"
@@ -102,8 +102,8 @@ target "universe" {
   target = "universe"
 }
 
-target "simulator-tools" {
-  inherits = ["docker-metadata-action-simulator-tools"]
-  dockerfile = "docker/simulator-tools/Dockerfile"
-  target = "simulator-tools"
+target "simulator-visualizer" {
+  inherits = ["docker-metadata-action-simulator-visualizer"]
+  dockerfile = "docker/simulator-visualizer/Dockerfile"
+  target = "simulator-visualizer"
 }
diff --git a/docker/vnc/Dockerfile b/docker/vnc/Dockerfile
@@ -30,6 +30,13 @@ RUN openssl req -x509 -nodes -newkey rsa:2048 \
     -days 365 \
     -subj "/O=Autoware-OpenADKit/CN=localhost"
 
+# Install ngrok
+RUN curl -s https://ngrok-agent.s3.amazonaws.com/ngrok.asc | \
+  gpg --dearmor -o /etc/apt/keyrings/ngrok.gpg && \
+  echo "deb [signed-by=/etc/apt/keyrings/ngrok.gpg] https://ngrok-agent.s3.amazonaws.com buster main" | \
+  tee /etc/apt/sources.list.d/ngrok.list && \
+  apt update && apt install ngrok
+
 # Need to expose VNC and NoVNC ports when running the container
 EXPOSE 5900 6080
 

diff --git a/docker/vnc/entrypoint.sh b/docker/vnc/entrypoint.sh
@@ -18,6 +18,12 @@ sleep 2
 # Start NoVNC
 websockify --web=/usr/share/novnc/ --cert=/etc/ssl/certs/novnc.crt --key=/etc/ssl/private/novnc.key 6080 localhost:5901 & > /dev/null 2>&1
 
+# Configure ngrok
+ngrok config add-authtoken $NGROK_AUTH_TOKEN
+
+# Start ngrok tunnel
+ngrok tcp 6080 --url=simviz.openadkit.ngrok.app
+
 # Print message
 echo -e "\033[32m-------------------------------------------------------------------------\033[0m"
 echo -e "\033[32mVNC server is running and accessible at localhost:5901\033[0m"