From 6842b2d2cede28c9e71b2c16fe11721e4e47b7f7 Mon Sep 17 00:00:00 2001 From: Riccardo Date: Thu, 26 Sep 2019 00:53:58 -0700 Subject: [PATCH] move esptool sdk installation before python3 env is set. Kind of a cheat --- tests/build/Dockerfile | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/tests/build/Dockerfile b/tests/build/Dockerfile index cc9f0c46..e0313c10 100644 --- a/tests/build/Dockerfile +++ b/tests/build/Dockerfile @@ -2,6 +2,16 @@ FROM ubuntu:16.04 RUN apt-get update && apt-get install -y gcc-arm-none-eabi libnewlib-arm-none-eabi python python-pip gcc g++ git autoconf gperf bison flex automake texinfo wget help2man gawk libtool libtool-bin ncurses-dev unzip unrar-free libexpat-dev sed bzip2 locales curl zlib1g-dev libffi-dev libssl-dev +# Build esp toolchain +RUN mkdir -p /panda/boardesp +WORKDIR /panda/boardesp +RUN git clone --recursive https://github.com/pfalcon/esp-open-sdk.git +WORKDIR /panda/boardesp/esp-open-sdk +RUN git checkout 03f5e898a059451ec5f3de30e7feff30455f7ce +RUN CT_ALLOW_BUILD_AS_ROOT_SURE=1 make STANDALONE=y + +COPY . /panda + 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 ENV LANGUAGE en_US:en @@ -16,14 +26,4 @@ RUN pyenv rehash RUN pip install pycrypto==2.6.1 -# Build esp toolchain -RUN mkdir -p /panda/boardesp -WORKDIR /panda/boardesp -RUN git clone --recursive https://github.com/pfalcon/esp-open-sdk.git -WORKDIR /panda/boardesp/esp-open-sdk -RUN git checkout 03f5e898a059451ec5f3de30e7feff30455f7ce -RUN CT_ALLOW_BUILD_AS_ROOT_SURE=1 make STANDALONE=y - -COPY . /panda - WORKDIR /panda