From 1553505be1c0009b24c9da4d45d56f9a3254a32b Mon Sep 17 00:00:00 2001 From: Andrei Litvin Date: Thu, 29 Jun 2023 10:07:24 -0400 Subject: [PATCH] Fix efr32 dockerfile build (#27548) --- integrations/docker/images/chip-build-efr32/Dockerfile | 10 +++++----- integrations/docker/images/chip-build/version | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/integrations/docker/images/chip-build-efr32/Dockerfile b/integrations/docker/images/chip-build-efr32/Dockerfile index 12f63d89b156fd..816404444a34fb 100644 --- a/integrations/docker/images/chip-build-efr32/Dockerfile +++ b/integrations/docker/images/chip-build-efr32/Dockerfile @@ -22,18 +22,18 @@ RUN git clone --depth=1 --branch=v4.2.0 https://github.com/SiliconLabs/gecko_sdk ENV GSDK_ROOT=/gecko_sdk/ # SLC-cli install +# TODO: figure out a way to make this a fixed version. Currently a moving target. RUN wget https://www.silabs.com/documents/login/software/slc_cli_linux.zip && \ unzip ./slc_cli_linux.zip -d ./ && \ - rm ./slc_cli_linux.zip && \ - cd ./slc_cli && \ - pip3 install -r ./requirements.txt + rm ./slc_cli_linux.zip ENV PATH="${PATH}:/slc_cli/" # Install Python Packages -# SLC required Python Packages +# codegen.py build requirements +# TODO: why are these added here instead of build-env? RUN pip3 install lark jinja2 stringcase -# Sphinx required Python Packages +# Sphinx dependencies (for slc-cli) RUN pip3 install myst_parser sphinx_rtd_theme sphinx_tabs linkify-it-py diff --git a/integrations/docker/images/chip-build/version b/integrations/docker/images/chip-build/version index 64293fbaa0f15a..88b95cb83f35c2 100644 --- a/integrations/docker/images/chip-build/version +++ b/integrations/docker/images/chip-build/version @@ -1 +1 @@ -0.7.22 Version bump reason: Update Silicon Labs docker +0.7.23 Version bump reason: make slc-cli not use requirements.txt for efr32