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
commaai · Apr 20, 2022 · e95a250 · e95a250
1 parent 6de434f
commit e95a250
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 7 deletions.
diff --git 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
@@ -37,6 +37,7 @@ breathe = "*"
 subprocess32 = "*"
 tenacity = "*"
 mpld3 = "*"
+carla = "==0.9.12"
 
 [packages]
 atomicwrites = "*"

diff --git a/Pipfile.lock b/Pipfile.lock
diff --git a/tools/openpilot_build.sh b/tools/openpilot_build.sh
diff --git 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