From 49c7615ed3ee663e34953e151950e523db774dc3 Mon Sep 17 00:00:00 2001
From: Adeeb Shihadeh <adeebshihadeh@gmail.com>
Date: Fri, 23 Oct 2020 23:14:58 -0700
Subject: [PATCH] ubuntu 16.04 -> 20.04 (#608)

* ubuntu 16.04 -> 20.04

* fix pip

* think pyenv installs this

* bump python

* non interactive

* fix pyenv install

* python serial

* bump cffi

* fix index log build

* logreader dependency
---
 .github/workflows/test.yaml | 12 ++++++------
 Dockerfile                  | 11 ++++++-----
 Dockerfile.panda            | 13 +++++++------
 requirements.txt            |  2 +-
 4 files changed, 20 insertions(+), 18 deletions(-)

diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
index 50539ba..18adba5 100644
--- a/.github/workflows/test.yaml
+++ b/.github/workflows/test.yaml
@@ -12,7 +12,7 @@ env:
 jobs:
   docker_push:
     name: docker push
-    runs-on: ubuntu-16.04
+    runs-on: ubuntu-20.04
     timeout-minutes: 45
     if: github.ref == 'refs/heads/master' && github.event_name != 'pull_request' && github.repository == 'commaai/panda'
     steps:
@@ -28,7 +28,7 @@ jobs:
 
   build:
     name: build
-    runs-on: ubuntu-16.04
+    runs-on: ubuntu-20.04
     timeout-minutes: 45
     steps:
       - uses: actions/checkout@v2
@@ -47,7 +47,7 @@ jobs:
 
   safety:
     name: safety
-    runs-on: ubuntu-16.04
+    runs-on: ubuntu-20.04
     timeout-minutes: 45
     steps:
       - uses: actions/checkout@v2
@@ -63,7 +63,7 @@ jobs:
 
   safety_replay:
     name: safety replay
-    runs-on: ubuntu-16.04
+    runs-on: ubuntu-20.04
     timeout-minutes: 45
     steps:
       - uses: actions/checkout@v2
@@ -74,7 +74,7 @@ jobs:
 
   misra:
     name: misra c2012
-    runs-on: ubuntu-16.04
+    runs-on: ubuntu-20.04
     timeout-minutes: 45
     steps:
       - uses: actions/checkout@v2
@@ -97,7 +97,7 @@ jobs:
 
   python_linter:
     name: python linter
-    runs-on: ubuntu-16.04
+    runs-on: ubuntu-20.04
     timeout-minutes: 45
     steps:
       - uses: actions/checkout@v2
diff --git a/Dockerfile b/Dockerfile
index 65734bf..48715d1 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,12 +1,14 @@
-FROM ubuntu:16.04
+FROM ubuntu:20.04
 ENV PYTHONUNBUFFERED 1
 
+ENV DEBIAN_FRONTEND=noninteractive
 RUN apt-get update && apt-get install -y \
     autoconf \
     automake \
     bash \
     bison \
     bzip2 \
+    ca-certificates \
     curl \
     dfu-util \
     flex \
@@ -30,7 +32,7 @@ RUN apt-get update && apt-get install -y \
     ncurses-dev \
     network-manager \
     python-dev \
-    python-serial \
+    python3-serial \
     sed \
     texinfo \
     unrar-free \
@@ -38,7 +40,6 @@ RUN apt-get update && apt-get install -y \
     wget \
     build-essential \
     python-dev \
-    python-pip \
     screen \
     vim \
     wget \
@@ -53,8 +54,8 @@ ENV LC_ALL en_US.UTF-8
 RUN curl -L https://github.com/pyenv/pyenv-installer/raw/master/bin/pyenv-installer | bash
 
 ENV PATH="/root/.pyenv/bin:/root/.pyenv/shims:${PATH}"
-RUN pyenv install 3.7.3
-RUN pyenv global 3.7.3
+RUN pyenv install 3.8.2
+RUN pyenv global 3.8.2
 RUN pyenv rehash
 
 RUN pip install --upgrade pip==18.0
diff --git a/Dockerfile.panda b/Dockerfile.panda
index c513e41..ab6a678 100644
--- a/Dockerfile.panda
+++ b/Dockerfile.panda
@@ -1,11 +1,13 @@
-FROM ubuntu:16.04
+FROM ubuntu:20.04
 ENV PYTHONUNBUFFERED 1
 ENV PYTHONPATH /tmp/openpilot:$PYTHONPATH
 
+ENV DEBIAN_FRONTEND=noninteractive
 RUN apt-get update && apt-get install -y --no-install-recommends \
     autoconf \
     automake \
     bzip2 \
+    ca-certificates \
     capnproto \
     clang \
     curl \
@@ -28,7 +30,6 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
     pkg-config \
     python \
     python-dev \
-    python-pip \
     unzip \
     wget \
     zlib1g-dev \
@@ -43,8 +44,8 @@ RUN curl -L https://github.com/pyenv/pyenv-installer/raw/master/bin/pyenv-instal
 ENV PATH="/root/.pyenv/bin:/root/.pyenv/shims:${PATH}"
 
 COPY requirements.txt /tmp/
-RUN pyenv install 3.7.3 && \
-    pyenv global 3.7.3 && \
+RUN pyenv install 3.8.2 && \
+    pyenv global 3.8.2 && \
     pyenv rehash && \
     pip install --no-cache-dir --upgrade pip==18.0 && \
     pip install --no-cache-dir -r /tmp/requirements.txt
@@ -59,7 +60,7 @@ RUN cd /tmp && \
 RUN cd /tmp && \
     git clone https://github.com/commaai/openpilot.git tmppilot || true && \
     cd /tmp/tmppilot && \
-    git pull && git checkout a086f52881f4a1f0d20486e7fa089a843d5d8b34 && \
+    git pull && git checkout 9a605d2617bd701ce013eedbe0a47782c865fb09 && \
     git submodule update --init cereal opendbc && \
     mkdir /tmp/openpilot && \
     cp -pR SConstruct tools/ selfdrive/ common/ cereal/ opendbc/ /tmp/openpilot && \
@@ -67,7 +68,7 @@ RUN cd /tmp && \
 
 RUN cd /tmp/openpilot && \
     pip install --no-cache-dir -r opendbc/requirements.txt && \
-    pip install --no-cache-dir aenum lru-dict pycurl tenacity
+    pip install --no-cache-dir aenum lru-dict pycurl tenacity atomicwrites
 
 COPY . /tmp/openpilot/panda
 RUN rm -rf /tmp/openpilot/panda/.git
diff --git a/requirements.txt b/requirements.txt
index 68ddad3..abd07d4 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -7,7 +7,7 @@ nose
 parameterized
 requests
 flake8==3.7.9
-cffi==1.11.4
+cffi==1.14.3
 crcmod
 pre-commit==2.4.0
 pylint==2.5.2