From fe73dcc9137d0e2ac6a22c2e64ad9c9e46a0530f Mon Sep 17 00:00:00 2001
From: Willem Melching <willem.melching@gmail.com>
Date: Mon, 6 Apr 2020 22:19:25 -0700
Subject: [PATCH] Openpilot-tools is deprecated (#484)

* openpilot-tools is deprecated

* Add pycurl

* Add dependency for pycurl

* Add tenacity

* add atomicwrites
---
 tests/safety_replay/Dockerfile             | 24 +++++++++++++++++-----
 tests/safety_replay/requirements_extra.txt |  3 +++
 2 files changed, 22 insertions(+), 5 deletions(-)

diff --git a/tests/safety_replay/Dockerfile b/tests/safety_replay/Dockerfile
index d876f6e..3134b13 100644
--- a/tests/safety_replay/Dockerfile
+++ b/tests/safety_replay/Dockerfile
@@ -1,6 +1,21 @@
 FROM ubuntu:16.04
 
-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
+RUN apt-get update && apt-get install -y \
+    bzip2 \
+    clang \
+    curl \
+    git \
+    libarchive-dev \
+    libbz2-dev \
+    libcurl4-openssl-dev \
+    libffi-dev \
+    libssl-dev \
+    libusb-1.0-0 \
+    locales \
+    make \
+    python \
+    python-pip \
+    zlib1g-dev
 
 RUN sed -i -e 's/# en_US.UTF-8 UTF-8/en_US.UTF-8 UTF-8/' /etc/locale.gen && locale-gen
 ENV LANG en_US.UTF-8
@@ -21,14 +36,13 @@ RUN pip install -r requirements_extra.txt
 COPY tests/safety_replay/install_capnp.sh install_capnp.sh
 RUN ./install_capnp.sh
 
-RUN mkdir /openpilot
+RUN git clone https://github.com/commaai/openpilot.git || true
 WORKDIR /openpilot
+RUN git pull && git checkout f9257fc75f68c673f9e433985fbe739f23310bb4
+
 RUN git clone https://github.com/commaai/cereal.git || true
 WORKDIR /openpilot/cereal
 RUN git pull && git checkout 35040fe6bb9ebc31d38e98faa64d5ec4093ce3d5
 COPY . /openpilot/panda
 
 WORKDIR /openpilot/panda/tests/safety_replay
-RUN git clone https://github.com/commaai/openpilot-tools.git tools || true
-WORKDIR tools
-RUN git checkout d69c6bc85f221766305ec53956e9a1d3bf283160
diff --git a/tests/safety_replay/requirements_extra.txt b/tests/safety_replay/requirements_extra.txt
index b04b767..8034efc 100644
--- a/tests/safety_replay/requirements_extra.txt
+++ b/tests/safety_replay/requirements_extra.txt
@@ -2,3 +2,6 @@ aenum
 subprocess32
 libarchive
 pycapnp
+pycurl
+tenacity
+atomicwrites