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
old-commit-hash: e95a250bca
taco
Gijs Koning 3 years ago committed by GitHub
parent 955ca69cc4
commit 7b4b8d3f58
  1. 3
      Dockerfile.openpilot_base
  2. 4
      Pipfile
  3. 4
      Pipfile.lock
  4. 1
      tools/openpilot_build.sh
  5. 4
      tools/sim/Dockerfile.sim

@ -25,8 +25,9 @@ RUN cd /tmp && \
rm -rf /tmp/* && \ rm -rf /tmp/* && \
rm -rf /root/.cache && \ rm -rf /root/.cache && \
pip uninstall -y pipenv && \ pip uninstall -y pipenv && \
# remove unused architectures from gcc for panda # remove unused architectures from gcc for panda
cd /usr/lib/gcc/arm-none-eabi/9.2.1 && \ cd /usr/lib/gcc/arm-none-eabi/9.2.1 && \
rm -rf arm/ && \ rm -rf arm/ && \
rm -rf thumb/nofp thumb/v6* thumb/v8* thumb/v7+fp thumb/v7-r+fp.sp 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

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1 version https://git-lfs.github.com/spec/v1
oid sha256:08a5ff9631cfadc63a5c7ebdf227eb390cafab2e3af77554b2a41005a618ac31 oid sha256:2cfa7fc048887c39c0e3ee0adf53bff6dfec55483056b174a5d9d5f86d7cfe23
size 1410 size 1429

4
Pipfile.lock generated

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1 version https://git-lfs.github.com/spec/v1
oid sha256:ff47c83e09bd8030db7c4c7ba64f2db52c22af9003414ef09acbcc25c92ffa3b oid sha256:3ca9720d3cfc197e195efa0ec558113ad59dbce48c33ffa7147afd41fc5e9f85
size 141871 size 142639

@ -1 +0,0 @@
docker run --rm -v $(pwd):/tmp/openpilot -it commaai/openpilot bash -c 'cd /tmp/openpilot && scons -j$(nproc)'

@ -36,10 +36,6 @@ ENV QTWEBENGINE_DISABLE_SANDBOX 1
RUN dbus-uuidgen > /etc/machine-id 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 # get same tmux config used on NEOS for debugging
RUN cd $HOME && \ RUN cd $HOME && \
curl -O https://raw.githubusercontent.com/commaai/eon-neos-builder/master/devices/eon/home/.tmux.conf curl -O https://raw.githubusercontent.com/commaai/eon-neos-builder/master/devices/eon/home/.tmux.conf

Loading…
Cancel
Save