Skip to content

Commit fe73dcc

Browse files
authoredApr 7, 2020
Openpilot-tools is deprecated (#484)
* openpilot-tools is deprecated * Add pycurl * Add dependency for pycurl * Add tenacity * add atomicwrites
1 parent da8e00f commit fe73dcc

File tree

2 files changed

+22
-5
lines changed

2 files changed

+22
-5
lines changed
 

‎tests/safety_replay/Dockerfile

+19-5
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,21 @@
11
FROM ubuntu:16.04
22

3-
RUN apt-get update && apt-get install -y make clang python python-pip git libarchive-dev libusb-1.0-0 locales curl zlib1g-dev libffi-dev bzip2 libssl-dev libbz2-dev
3+
RUN apt-get update && apt-get install -y \
4+
bzip2 \
5+
clang \
6+
curl \
7+
git \
8+
libarchive-dev \
9+
libbz2-dev \
10+
libcurl4-openssl-dev \
11+
libffi-dev \
12+
libssl-dev \
13+
libusb-1.0-0 \
14+
locales \
15+
make \
16+
python \
17+
python-pip \
18+
zlib1g-dev
419

520
RUN sed -i -e 's/# en_US.UTF-8 UTF-8/en_US.UTF-8 UTF-8/' /etc/locale.gen && locale-gen
621
ENV LANG en_US.UTF-8
@@ -21,14 +36,13 @@ RUN pip install -r requirements_extra.txt
2136
COPY tests/safety_replay/install_capnp.sh install_capnp.sh
2237
RUN ./install_capnp.sh
2338

24-
RUN mkdir /openpilot
39+
RUN git clone https://github.com/commaai/openpilot.git || true
2540
WORKDIR /openpilot
41+
RUN git pull && git checkout f9257fc75f68c673f9e433985fbe739f23310bb4
42+
2643
RUN git clone https://github.com/commaai/cereal.git || true
2744
WORKDIR /openpilot/cereal
2845
RUN git pull && git checkout 35040fe6bb9ebc31d38e98faa64d5ec4093ce3d5
2946
COPY . /openpilot/panda
3047

3148
WORKDIR /openpilot/panda/tests/safety_replay
32-
RUN git clone https://github.com/commaai/openpilot-tools.git tools || true
33-
WORKDIR tools
34-
RUN git checkout d69c6bc85f221766305ec53956e9a1d3bf283160

‎tests/safety_replay/requirements_extra.txt

+3
Original file line numberDiff line numberDiff line change
@@ -2,3 +2,6 @@ aenum
22
subprocess32
33
libarchive
44
pycapnp
5+
pycurl
6+
tenacity
7+
atomicwrites

0 commit comments

Comments
 (0)