From db569f53e7447804ea75eb54acee4bb54c2ea235 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kacper=20R=C4=85czy?= <gfw.kra@gmail.com>
Date: Mon, 25 Sep 2023 19:11:57 -0700
Subject: [PATCH] devcontainer: fix rc files, move CARLA_HOST to json  (#30047)

* Download rc files to batman home directory. Fix links

* Move CARLA_HOST to devcontainer.json

* Remove user root
old-commit-hash: 3cf58e55eb58f5e94552edfd9b52408c967c8ba7
---
 .devcontainer/Dockerfile        | 6 +++---
 .devcontainer/devcontainer.json | 1 +
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile
index 2c10762496..0e5e97316d 100644
--- a/.devcontainer/Dockerfile
+++ b/.devcontainer/Dockerfile
@@ -3,8 +3,8 @@ FROM ghcr.io/commaai/openpilot-base:latest
 RUN apt update && apt install -y vim net-tools usbutils htop ripgrep tmux
 RUN pip install ipython jupyter jupyterlab
 
+USER batman
+
 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
+    curl -O https://raw.githubusercontent.com/commaai/agnos-builder/master/userspace/home/.vimrc
diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
index 4f8097e324..2519b821a0 100644
--- a/.devcontainer/devcontainer.json
+++ b/.devcontainer/devcontainer.json
@@ -11,6 +11,7 @@
     "DISPLAY": "${localEnv:DISPLAY}",
     "PYTHONPATH": "${containerWorkspaceFolder}",
     "TERM": "xterm-256color",
+    "CARLA_HOST": "host.docker.internal",
     "force_color_prompt": "1"
   },
   "runArgs": [