From 1f8ceb4ca15b2aa71d88e74c7df54519ed5968e9 Mon Sep 17 00:00:00 2001
From: Justin Newberry <justin@comma.ai>
Date: Wed, 20 Sep 2023 16:34:29 -0700
Subject: [PATCH] Simulator: fix port issues in devcontainer (#29977)

* fix sim devcontainer

* use host.docker.internal instead

* devcontainer supports jsonc
---
 .devcontainer/Dockerfile        | 2 ++
 .devcontainer/devcontainer.json | 3 ++-
 .pre-commit-config.yaml         | 1 +
 tools/sim/run_bridge.py         | 3 ++-
 4 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile
index 08d3abaca9..aaa6be829a 100644
--- a/.devcontainer/Dockerfile
+++ b/.devcontainer/Dockerfile
@@ -9,3 +9,5 @@ RUN pip install ipython jupyter jupyterlab
 RUN cd $HOME && \
     curl -O https://raw.githubusercontent.com/commaai/agnos-builder/master/userspace/home/.tmux.conf && \
     curl -O https://github.com/commaai/agnos-builder/blob/master/userspace/home/.vimrc
+
+ENV CARLA_HOST="host.docker.internal"
\ No newline at end of file
diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
index 7224f251a7..ef6534c1ae 100644
--- a/.devcontainer/devcontainer.json
+++ b/.devcontainer/devcontainer.json
@@ -18,7 +18,8 @@
     "--volume=${localEnv:HOME}/.comma:/root/.comma",
     "--volume=/tmp/comma_download_cache:/tmp/comma_download_cache",
     "--volume=/tmp/devcontainer_scons_cache:/tmp/scons_cache",
-    "--shm-size=1G"
+    "--shm-size=1G",
+    "--add-host=host.docker.internal:host-gateway" // required to use host.docker.internal on linux
   ],
   "customizations": {
     "vscode": {
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index e612dfa74a..46ecbeb8ce 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -10,6 +10,7 @@ repos:
     -   id: check-ast
         exclude: '^(third_party)/'
     -   id: check-json
+        exclude: '.devcontainer/devcontainer.json' # this supports JSON with comments
     -   id: check-toml
     -   id: check-xml
     -   id: check-yaml
diff --git a/tools/sim/run_bridge.py b/tools/sim/run_bridge.py
index b49c8be2aa..e58cf5f0af 100755
--- a/tools/sim/run_bridge.py
+++ b/tools/sim/run_bridge.py
@@ -1,5 +1,6 @@
 #!/usr/bin/env python
 import argparse
+import os
 
 from typing import Any
 from multiprocessing import Queue
@@ -19,7 +20,7 @@ def parse_args(add_args=None):
   # Carla specific
   parser.add_argument('--town', type=str, default='Town04_Opt')
   parser.add_argument('--spawn_point', dest='num_selected_spawn_point', type=int, default=16)
-  parser.add_argument('--host', dest='host', type=str, default='127.0.0.1')
+  parser.add_argument('--host', dest='host', type=str, default=os.environ.get("CARLA_HOST", '127.0.0.1'))
   parser.add_argument('--port', dest='port', type=int, default=2000)
 
   return parser.parse_args(add_args)