Merge pull request #6 from wouterdevinck/feature/upgrade

Update to esp-idf v3.3-beta1
wouterdevinck · Jan 1, 2019 · 6649652 · 6649652
2 parents c5b7d97 + 526ea78
commit 6649652
Show file tree

Hide file tree

Showing 2 changed files with 159 additions and 14 deletions.
diff --git a/make/Dockerfile-mcu b/make/Dockerfile-mcu
@@ -1,5 +1,5 @@
-FROM ubuntu:17.10
-ARG ESPIDF_VERSION=v3.0
+FROM ubuntu:18.10
+ARG ESPIDF_VERSION=v3.3-beta1
 ARG TOOLCHAIN_VERSION=1.22.0-80-g6c4433a-5.2.0
 ENV ESPIDF_VERSION ${ESPIDF_VERSION}
 ENV TOOLCHAIN_VERSION ${TOOLCHAIN_VERSION}
@@ -13,8 +13,12 @@ RUN apt-get update && \
  flex \
  bison \
  gperf \
- python \
+ python-pip \
+ python-setuptools \
  python-serial \
+ python-cryptography \
+ python-future \
+ python-pyparsing \
  ca-certificates && \
  apt-get autoremove -yqq && \
  apt-get autoclean -yqq && \
@@ -25,6 +29,7 @@ RUN apt-get update && \
  tar -xzf xtensa-esp32-elf-linux64-$TOOLCHAIN_VERSION.tar.gz && \
  rm xtensa-esp32-elf-linux64-$TOOLCHAIN_VERSION.tar.gz && \
  git clone --depth 1 --recursive -b $ESPIDF_VERSION https://github.com/espressif/esp-idf.git && \
+ python -m pip install --user -r /esp/esp-idf/requirements.txt && \
  rm -rf esp-idf/.git
 ENV PATH /esp/xtensa-esp32-elf/bin:$PATH
 ENV IDF_PATH /esp/esp-idf