From e95a250bcad5f07b7092ba6faf989352d933f678 Mon Sep 17 00:00:00 2001
From: Gijs Koning <gijs-koning@live.nl>
Date: Wed, 20 Apr 2022 05:23:27 -0700
Subject: [PATCH] Carla pip dependency and fix for git init (#24258)

* Add carla pip dependency for dev

* Revert other packages in pipfile

* Remove redundant carla install in docker

* Fix CI
Remove broken openpilot_build

* New run command
---
 Dockerfile.openpilot_base |  3 ++-
 Pipfile                   |  1 +
 Pipfile.lock              | 15 ++++++++++++++-
 tools/openpilot_build.sh  |  1 -
 tools/sim/Dockerfile.sim  |  4 ----
 5 files changed, 17 insertions(+), 7 deletions(-)
 delete mode 100644 tools/openpilot_build.sh

diff --git a/Dockerfile.openpilot_base b/Dockerfile.openpilot_base
index 2ea26b854f4a90..c5a024db820d09 100644
--- a/Dockerfile.openpilot_base
+++ b/Dockerfile.openpilot_base
@@ -25,8 +25,9 @@ RUN cd /tmp && \
     rm -rf /tmp/* && \
     rm -rf /root/.cache && \
     pip uninstall -y pipenv && \
-
     # remove unused architectures from gcc for panda
     cd /usr/lib/gcc/arm-none-eabi/9.2.1 && \
     rm -rf arm/ && \
     rm -rf thumb/nofp thumb/v6* thumb/v8* thumb/v7+fp thumb/v7-r+fp.sp
+RUN sudo git config --global --add safe.directory /tmp/openpilot
+
diff --git a/Pipfile b/Pipfile
index 02e8c602d19719..6d30179b9deb35 100644
--- a/Pipfile
+++ b/Pipfile
@@ -37,6 +37,7 @@ breathe = "*"
 subprocess32 = "*"
 tenacity = "*"
 mpld3 = "*"
+carla = "==0.9.12"
 
 [packages]
 atomicwrites = "*"
diff --git a/Pipfile.lock b/Pipfile.lock
index da2dae92aa929f..2c62e13dfaee7e 100644
--- a/Pipfile.lock
+++ b/Pipfile.lock
@@ -1,7 +1,7 @@
 {
     "_meta": {
         "hash": {
-            "sha256": "7288746fb2afc988e4de2a7d1d3bc2fbef09ce65ca135b6762f3d722c156661b"
+            "sha256": "41e285b10b9b5a353b3eb9c202886e52d22403c369784877aaa35e099aa203a8"
         },
         "pipfile-spec": 6,
         "requires": {
@@ -1143,6 +1143,19 @@
             "index": "pypi",
             "version": "==4.33.1"
         },
+        "carla": {
+            "hashes": [
+                "sha256:1ed11b56c781cd15cbd540cacfb59ad348e0a021d898cfd0ff89a585f144da0b",
+                "sha256:20c1e1b72034175824d89b2d86b09ae72b4aca09ea25874dc6251f239297251d",
+                "sha256:6d1122c24af4f6375dc6858fbb0309b61c219b101d8c5a540def4c36c4563fe1",
+                "sha256:9c19ebf6cbbc535bde4baf9e18c72ab349657b34c4202b9751541e4c0d20b3cc",
+                "sha256:a69f6d84b59e2f805b2a417de98f977fe9efe0cfa733da8d75e20d28892da915",
+                "sha256:c3ae0dce3f1354b6311fee21a365947b0ff169249993a913904f676046d2d69f",
+                "sha256:dd392a267e14b785a8f65dafef86e05a92201253e9fb4a01e1e262834f20bed2"
+            ],
+            "index": "pypi",
+            "version": "==0.9.12"
+        },
         "certifi": {
             "hashes": [
                 "sha256:78884e7c1d4b00ce3cea67b44566851c4343c120abd683433ce934a68ea58872",
diff --git a/tools/openpilot_build.sh b/tools/openpilot_build.sh
deleted file mode 100644
index f0f89d936e8f21..00000000000000
--- a/tools/openpilot_build.sh
+++ /dev/null
@@ -1 +0,0 @@
-docker run --rm -v $(pwd):/tmp/openpilot -it commaai/openpilot bash -c 'cd /tmp/openpilot && scons -j$(nproc)'
diff --git a/tools/sim/Dockerfile.sim b/tools/sim/Dockerfile.sim
index 2e36085b7ee60d..921e546d0c9e15 100644
--- a/tools/sim/Dockerfile.sim
+++ b/tools/sim/Dockerfile.sim
@@ -36,10 +36,6 @@ ENV QTWEBENGINE_DISABLE_SANDBOX 1
 
 RUN dbus-uuidgen > /etc/machine-id
 
-# Install CARLA python api
-RUN pip install --upgrade pip && \
-    pip install --no-cache-dir carla==0.9.12
-
 # get same tmux config used on NEOS for debugging
 RUN cd $HOME && \
     curl -O https://raw.githubusercontent.com/commaai/eon-neos-builder/master/devices/eon/home/.tmux.conf