From 412a629d7e79d4581d34dceaaff23b75753a475b Mon Sep 17 00:00:00 2001
From: Mehdi BEN ABDALLAH <mehdi.benabdallah@powerup-technology.com>
Date: Mon, 18 Apr 2022 22:32:35 +0200
Subject: [PATCH] SDK v3.4 with upgraded toolchain

---
 Dockerfile | 19 ++++++-------------
 1 file changed, 6 insertions(+), 13 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 93d2501..df8801e 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,22 +1,17 @@
-ARG BASE_IMAGE=ubuntu:18.04
-ARG ESP8266_RTOS_SDK_VERSION=v3.3
-ARG XTENSA_LX106_RELEASE=xtensa-lx106-elf-linux64-1.22.0-100-ge567ec7-5.2.0
-ARG XTENSA_ESP32_RELEASE=xtensa-esp32-elf-linux64-1.22.0-80-g6c4433a-5.2.0
+ARG BASE_IMAGE=ubuntu:20.04
+ARG ESP8266_RTOS_SDK_VERSION=v3.4
+ARG XTENSA_LX106_RELEASE=xtensa-lx106-elf-gcc8_4_0-esp-2020r3-linux-amd64
 
 FROM $BASE_IMAGE as distro
 RUN apt-get update -y
 
 FROM distro as toolchains
 ARG XTENSA_LX106_RELEASE
-ARG XTENSA_ESP32_RELEASE
 ADD https://dl.espressif.com/dl/${XTENSA_LX106_RELEASE}.tar.gz /xtensa-lx106.tar.gz
-ADD https://dl.espressif.com/dl/${XTENSA_ESP32_RELEASE}.tar.gz /xtensa-esp32.tar.gz
 RUN mkdir -p /tmp /toolchains \
     && apt-get install -y tar \
     && tar -xzf /xtensa-lx106.tar.gz -C /tmp/ \
-    && tar -xzf /xtensa-esp32.tar.gz -C /tmp/ \
-    && mv /tmp/xtensa-lx106-elf /toolchains/lx106 \
-    && mv /tmp/xtensa-esp32-elf /toolchains/esp32
+    && mv /tmp/xtensa-lx106-elf /toolchains/lx106
 
 FROM distro as sdk
 ARG ESP8266_RTOS_SDK_VERSION
@@ -29,7 +24,6 @@ RUN mkdir -p /sdk \
 FROM distro
 ARG ESP8266_RTOS_SDK_VERSION
 ARG XTENSA_LX106_RELEASE
-ARG XTENSA_ESP32_RELEASE
 ENV PATH /opt/toolchains/esp32/bin:/opt/toolchains/lx106/bin:$PATH
 ENV IDF_PATH=/opt/sdk
 COPY --from=toolchains /toolchains /opt/toolchains
@@ -43,7 +37,7 @@ RUN apt-get install -y \
         flex \
         bison \
         gperf \
-        python3-serial\
+        python3-serial \
         python3-pip \
     && update-alternatives --install /usr/bin/python python /usr/bin/python3 10 \
     && update-alternatives --install /usr/bin/pip pip /usr/bin/pip3 10 \
@@ -51,5 +45,4 @@ RUN apt-get install -y \
     && pip install --user -r /opt/sdk/requirements.txt
 
 LABEL ESP8266_RTOS_SDK_VERSION=$ESP8266_RTOS_SDK_VERSION \
-      XTENSA_LX106_RELEASE=$XTENSA_LX106_RELEASE \
-      XTENSA_ESP32_RELEASE=$XTENSA_ESP32_RELEASE
+      XTENSA_LX106_RELEASE=$XTENSA_LX106_RELEASE
\ No newline at end of file