From 2376979bbd1ce7e90a142051515ad22e86a2f503 Mon Sep 17 00:00:00 2001
From: Alex Tsitsiura <s07641069@gmail.com>
Date: Fri, 20 Oct 2023 18:37:29 +0300
Subject: [PATCH] [Telink] Cleanup Docker image (#29886)

* [Telink] Cleanup Docker image

* [Telink] Update docker version
---
 .../docker/images/base/chip-build/version     |  2 +-
 .../stage-2/chip-build-telink/Dockerfile      | 55 ++-----------------
 2 files changed, 7 insertions(+), 50 deletions(-)

diff --git a/integrations/docker/images/base/chip-build/version b/integrations/docker/images/base/chip-build/version
index 366e70bb2f0bce..70c0f8738d6b29 100644
--- a/integrations/docker/images/base/chip-build/version
+++ b/integrations/docker/images/base/chip-build/version
@@ -1 +1 @@
-21 : [chip-build-java] Ensure java is actually available in the docker image
+22 : [Telink] Cleanup Docker image
diff --git a/integrations/docker/images/stage-2/chip-build-telink/Dockerfile b/integrations/docker/images/stage-2/chip-build-telink/Dockerfile
index 018344aa4378e6..1310e0a12f9add 100644
--- a/integrations/docker/images/stage-2/chip-build-telink/Dockerfile
+++ b/integrations/docker/images/stage-2/chip-build-telink/Dockerfile
@@ -2,34 +2,20 @@ ARG VERSION=1
 FROM ghcr.io/project-chip/chip-build:${VERSION} as build
 LABEL org.opencontainers.image.source https://github.com/project-chip/connectedhomeip
 
-RUN set -x \
-    && apt-get update \
-    && DEBIAN_FRONTEND=noninteractive apt-get install -fy --no-install-recommends \
-    wget \
-    && apt-get clean \
-    && rm -rf /var/lib/apt/lists/ \
-    && : # last line
-
 # Setup toolchain
+WORKDIR /opt/telink
 RUN set -x \
-    && mkdir /opt/telink \
-    && cd /opt/telink \
-    && wget https://github.com/zephyrproject-rtos/sdk-ng/releases/download/v0.16.1/zephyr-sdk-0.16.1_linux-x86_64_minimal.tar.xz \
-    && wget -O - https://github.com/zephyrproject-rtos/sdk-ng/releases/download/v0.16.1/sha256.sum | shasum --check --ignore-missing \
+    && curl --location https://github.com/zephyrproject-rtos/sdk-ng/releases/download/v0.16.1/zephyr-sdk-0.16.1_linux-x86_64_minimal.tar.xz --output zephyr-sdk-0.16.1_linux-x86_64_minimal.tar.xz \
     && tar xvf zephyr-sdk-0.16.1_linux-x86_64_minimal.tar.xz \
     && rm -rf zephyr-sdk-0.16.1_linux-x86_64_minimal.tar.xz \
-    && cd zephyr-sdk-0.16.1 \
-    && ./setup.sh -t riscv64-zephyr-elf -h -c \
-    && cd / \
+    && zephyr-sdk-0.16.1/setup.sh -t riscv64-zephyr-elf \
     && : # last line
 
 # Setup Zephyr
 ARG ZEPHYR_REVISION=5e5f3cfde3fb5070b2e6cfb8ab08bc688b5aa3d4
 WORKDIR /opt/telink/zephyrproject
 RUN set -x \
-    && python3 -m pip install -U --no-cache-dir \
-    west==1.0.0 \
-    imgtool==1.7.0 \
+    && python3 -m pip install -U --no-cache-dir west \
     && git clone https://github.com/telink-semi/zephyr \
     && cd zephyr \
     && git reset ${ZEPHYR_REVISION} --hard \
@@ -41,45 +27,16 @@ RUN set -x \
     && : # last line
 
 FROM ghcr.io/project-chip/chip-build:${VERSION}
-LABEL org.opencontainers.image.source https://github.com/project-chip/connectedhomeip
 
 COPY --from=build /opt/telink/zephyr-sdk-0.16.1/ /opt/telink/zephyr-sdk-0.16.1/
 COPY --from=build /opt/telink/zephyrproject/ /opt/telink/zephyrproject/
 
-ENV ZEPHYR_TOOLCHAIN_VARIANT=zephyr
-ENV ZEPHYR_SDK_INSTALL_DIR=/opt/telink/zephyr-sdk-0.16.1
-
 RUN set -x \
     && apt-get update \
-    && DEBIAN_FRONTEND=noninteractive apt-get install -fy --no-install-recommends \
-    ccache \
-    dfu-util=0.9-1 \
-    device-tree-compiler \
-    gcc-multilib \
-    g++-multilib \
-    libsdl2-dev \
     && apt-get clean \
     && rm -rf /var/lib/apt/lists/ \
-    && python3 -m pip install -U --no-cache-dir \
-    pyelftools==0.27 \
     && pip3 install --no-cache-dir --user -r /opt/telink/zephyrproject/zephyr/scripts/requirements.txt \
     && : # last line
 
-# Setup Telink tools required for "west flash"
-ARG TELINK_TOOLS_BASE=/opt/telink/tools
-RUN wget http://wiki.telink-semi.cn/tools_and_sdk/Tools/IDE/telink_riscv_ice_flash_tool.zip -O /opt/telink/tools.zip \
-    && unzip /opt/telink/tools.zip -d ${TELINK_TOOLS_BASE} \
-    && rm /opt/telink/tools.zip \
-    && mv ${TELINK_TOOLS_BASE}/telink_riscv_linux_toolchain/* ${TELINK_TOOLS_BASE} \
-    && rm -rf ${TELINK_TOOLS_BASE}/telink_riscv_linux_toolchain \
-    && chmod +x ${TELINK_TOOLS_BASE}/flash/bin/SPI_burn \
-    && chmod +x ${TELINK_TOOLS_BASE}/ice/ICEman \
-    && : # last line
-
-# Add path to Telink tools
-ENV PATH="${TELINK_TOOLS_BASE}/flash/bin:${PATH}"
-ENV PATH="${TELINK_TOOLS_BASE}/ice:${PATH}"
-
-ARG ZEPHYR_PROJECT_DIR=/opt/telink/zephyrproject
-ENV TELINK_ZEPHYR_BASE=${ZEPHYR_PROJECT_DIR}/zephyr
-ENV ZEPHYR_BASE=${ZEPHYR_PROJECT_DIR}/zephyr
+ENV TELINK_ZEPHYR_BASE=/opt/telink/zephyrproject/zephyr
+ENV TELINK_ZEPHYR_SDK_DIR=/opt/telink/zephyr-sdk-0.16.1