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 dependencymaster
parent
9fb584b20c
commit
49c7615ed3
|
@ -12,7 +12,7 @@ env:
|
||||||
jobs:
|
jobs:
|
||||||
docker_push:
|
docker_push:
|
||||||
name: docker push
|
name: docker push
|
||||||
runs-on: ubuntu-16.04
|
runs-on: ubuntu-20.04
|
||||||
timeout-minutes: 45
|
timeout-minutes: 45
|
||||||
if: github.ref == 'refs/heads/master' && github.event_name != 'pull_request' && github.repository == 'commaai/panda'
|
if: github.ref == 'refs/heads/master' && github.event_name != 'pull_request' && github.repository == 'commaai/panda'
|
||||||
steps:
|
steps:
|
||||||
|
@ -28,7 +28,7 @@ jobs:
|
||||||
|
|
||||||
build:
|
build:
|
||||||
name: build
|
name: build
|
||||||
runs-on: ubuntu-16.04
|
runs-on: ubuntu-20.04
|
||||||
timeout-minutes: 45
|
timeout-minutes: 45
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v2
|
- uses: actions/checkout@v2
|
||||||
|
@ -47,7 +47,7 @@ jobs:
|
||||||
|
|
||||||
safety:
|
safety:
|
||||||
name: safety
|
name: safety
|
||||||
runs-on: ubuntu-16.04
|
runs-on: ubuntu-20.04
|
||||||
timeout-minutes: 45
|
timeout-minutes: 45
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v2
|
- uses: actions/checkout@v2
|
||||||
|
@ -63,7 +63,7 @@ jobs:
|
||||||
|
|
||||||
safety_replay:
|
safety_replay:
|
||||||
name: safety replay
|
name: safety replay
|
||||||
runs-on: ubuntu-16.04
|
runs-on: ubuntu-20.04
|
||||||
timeout-minutes: 45
|
timeout-minutes: 45
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v2
|
- uses: actions/checkout@v2
|
||||||
|
@ -74,7 +74,7 @@ jobs:
|
||||||
|
|
||||||
misra:
|
misra:
|
||||||
name: misra c2012
|
name: misra c2012
|
||||||
runs-on: ubuntu-16.04
|
runs-on: ubuntu-20.04
|
||||||
timeout-minutes: 45
|
timeout-minutes: 45
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v2
|
- uses: actions/checkout@v2
|
||||||
|
@ -97,7 +97,7 @@ jobs:
|
||||||
|
|
||||||
python_linter:
|
python_linter:
|
||||||
name: python linter
|
name: python linter
|
||||||
runs-on: ubuntu-16.04
|
runs-on: ubuntu-20.04
|
||||||
timeout-minutes: 45
|
timeout-minutes: 45
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v2
|
- uses: actions/checkout@v2
|
||||||
|
|
11
Dockerfile
11
Dockerfile
|
@ -1,12 +1,14 @@
|
||||||
FROM ubuntu:16.04
|
FROM ubuntu:20.04
|
||||||
ENV PYTHONUNBUFFERED 1
|
ENV PYTHONUNBUFFERED 1
|
||||||
|
|
||||||
|
ENV DEBIAN_FRONTEND=noninteractive
|
||||||
RUN apt-get update && apt-get install -y \
|
RUN apt-get update && apt-get install -y \
|
||||||
autoconf \
|
autoconf \
|
||||||
automake \
|
automake \
|
||||||
bash \
|
bash \
|
||||||
bison \
|
bison \
|
||||||
bzip2 \
|
bzip2 \
|
||||||
|
ca-certificates \
|
||||||
curl \
|
curl \
|
||||||
dfu-util \
|
dfu-util \
|
||||||
flex \
|
flex \
|
||||||
|
@ -30,7 +32,7 @@ RUN apt-get update && apt-get install -y \
|
||||||
ncurses-dev \
|
ncurses-dev \
|
||||||
network-manager \
|
network-manager \
|
||||||
python-dev \
|
python-dev \
|
||||||
python-serial \
|
python3-serial \
|
||||||
sed \
|
sed \
|
||||||
texinfo \
|
texinfo \
|
||||||
unrar-free \
|
unrar-free \
|
||||||
|
@ -38,7 +40,6 @@ RUN apt-get update && apt-get install -y \
|
||||||
wget \
|
wget \
|
||||||
build-essential \
|
build-essential \
|
||||||
python-dev \
|
python-dev \
|
||||||
python-pip \
|
|
||||||
screen \
|
screen \
|
||||||
vim \
|
vim \
|
||||||
wget \
|
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
|
RUN curl -L https://github.com/pyenv/pyenv-installer/raw/master/bin/pyenv-installer | bash
|
||||||
|
|
||||||
ENV PATH="/root/.pyenv/bin:/root/.pyenv/shims:${PATH}"
|
ENV PATH="/root/.pyenv/bin:/root/.pyenv/shims:${PATH}"
|
||||||
RUN pyenv install 3.7.3
|
RUN pyenv install 3.8.2
|
||||||
RUN pyenv global 3.7.3
|
RUN pyenv global 3.8.2
|
||||||
RUN pyenv rehash
|
RUN pyenv rehash
|
||||||
|
|
||||||
RUN pip install --upgrade pip==18.0
|
RUN pip install --upgrade pip==18.0
|
||||||
|
|
|
@ -1,11 +1,13 @@
|
||||||
FROM ubuntu:16.04
|
FROM ubuntu:20.04
|
||||||
ENV PYTHONUNBUFFERED 1
|
ENV PYTHONUNBUFFERED 1
|
||||||
ENV PYTHONPATH /tmp/openpilot:$PYTHONPATH
|
ENV PYTHONPATH /tmp/openpilot:$PYTHONPATH
|
||||||
|
|
||||||
|
ENV DEBIAN_FRONTEND=noninteractive
|
||||||
RUN apt-get update && apt-get install -y --no-install-recommends \
|
RUN apt-get update && apt-get install -y --no-install-recommends \
|
||||||
autoconf \
|
autoconf \
|
||||||
automake \
|
automake \
|
||||||
bzip2 \
|
bzip2 \
|
||||||
|
ca-certificates \
|
||||||
capnproto \
|
capnproto \
|
||||||
clang \
|
clang \
|
||||||
curl \
|
curl \
|
||||||
|
@ -28,7 +30,6 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
|
||||||
pkg-config \
|
pkg-config \
|
||||||
python \
|
python \
|
||||||
python-dev \
|
python-dev \
|
||||||
python-pip \
|
|
||||||
unzip \
|
unzip \
|
||||||
wget \
|
wget \
|
||||||
zlib1g-dev \
|
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}"
|
ENV PATH="/root/.pyenv/bin:/root/.pyenv/shims:${PATH}"
|
||||||
|
|
||||||
COPY requirements.txt /tmp/
|
COPY requirements.txt /tmp/
|
||||||
RUN pyenv install 3.7.3 && \
|
RUN pyenv install 3.8.2 && \
|
||||||
pyenv global 3.7.3 && \
|
pyenv global 3.8.2 && \
|
||||||
pyenv rehash && \
|
pyenv rehash && \
|
||||||
pip install --no-cache-dir --upgrade pip==18.0 && \
|
pip install --no-cache-dir --upgrade pip==18.0 && \
|
||||||
pip install --no-cache-dir -r /tmp/requirements.txt
|
pip install --no-cache-dir -r /tmp/requirements.txt
|
||||||
|
@ -59,7 +60,7 @@ RUN cd /tmp && \
|
||||||
RUN cd /tmp && \
|
RUN cd /tmp && \
|
||||||
git clone https://github.com/commaai/openpilot.git tmppilot || true && \
|
git clone https://github.com/commaai/openpilot.git tmppilot || true && \
|
||||||
cd /tmp/tmppilot && \
|
cd /tmp/tmppilot && \
|
||||||
git pull && git checkout a086f52881f4a1f0d20486e7fa089a843d5d8b34 && \
|
git pull && git checkout 9a605d2617bd701ce013eedbe0a47782c865fb09 && \
|
||||||
git submodule update --init cereal opendbc && \
|
git submodule update --init cereal opendbc && \
|
||||||
mkdir /tmp/openpilot && \
|
mkdir /tmp/openpilot && \
|
||||||
cp -pR SConstruct tools/ selfdrive/ common/ cereal/ opendbc/ /tmp/openpilot && \
|
cp -pR SConstruct tools/ selfdrive/ common/ cereal/ opendbc/ /tmp/openpilot && \
|
||||||
|
@ -67,7 +68,7 @@ RUN cd /tmp && \
|
||||||
|
|
||||||
RUN cd /tmp/openpilot && \
|
RUN cd /tmp/openpilot && \
|
||||||
pip install --no-cache-dir -r opendbc/requirements.txt && \
|
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
|
COPY . /tmp/openpilot/panda
|
||||||
RUN rm -rf /tmp/openpilot/panda/.git
|
RUN rm -rf /tmp/openpilot/panda/.git
|
||||||
|
|
|
@ -7,7 +7,7 @@ nose
|
||||||
parameterized
|
parameterized
|
||||||
requests
|
requests
|
||||||
flake8==3.7.9
|
flake8==3.7.9
|
||||||
cffi==1.11.4
|
cffi==1.14.3
|
||||||
crcmod
|
crcmod
|
||||||
pre-commit==2.4.0
|
pre-commit==2.4.0
|
||||||
pylint==2.5.2
|
pylint==2.5.2
|
||||||
|
|
Loading…
Reference in New Issue