diff --git a/integrations/docker/images/base/chip-build/version b/integrations/docker/images/base/chip-build/version index 16af969338a72c..956aab67064756 100644 --- a/integrations/docker/images/base/chip-build/version +++ b/integrations/docker/images/base/chip-build/version @@ -1 +1 @@ -17 : [Silabs] Update Docker image (WiseConnect and GECKO SDK(s) update) +18 : [Silabs] Adds bugfix for symlink for docker use and optimize SDK download diff --git a/integrations/docker/images/stage-2/chip-build-efr32/Dockerfile b/integrations/docker/images/stage-2/chip-build-efr32/Dockerfile index c528d74c621161..e8004c77c46929 100644 --- a/integrations/docker/images/stage-2/chip-build-efr32/Dockerfile +++ b/integrations/docker/images/stage-2/chip-build-efr32/Dockerfile @@ -14,19 +14,19 @@ RUN set -x \ # Clone Gecko SDK 4.3.2 (1228a95) -RUN git clone --single-branch --depth=1 --branch=v4.3.2 https://github.com/SiliconLabs/gecko_sdk.git /tmp/gecko_sdk && \ - cd /tmp/gecko_sdk && \ - rm -rf .git \ +RUN wget https://github.com/SiliconLabs/gecko_sdk/releases/download/v4.3.2/gecko-sdk.zip -O /tmp/gecko_sdk.zip \ + && unzip /tmp/gecko_sdk.zip -d /tmp/gecko_sdk \ + && rm -rf /tmp/gecko_sdk.zip \ && : # last line # Clone WiSeConnect Wi-Fi and Bluetooth Software 2.8.2 (4fa5c5f) -RUN git clone --depth=1 --branch=2.8.2 https://github.com/SiliconLabs/wiseconnect-wifi-bt-sdk.git /tmp/wiseconnect-wifi-bt-sdk && \ +RUN git clone --depth=1 --single-branch --branch=2.8.2 https://github.com/SiliconLabs/wiseconnect-wifi-bt-sdk.git /tmp/wiseconnect-wifi-bt-sdk && \ cd /tmp/wiseconnect-wifi-bt-sdk && \ rm -rf .git \ && : # last line # Clone WiSeConnect SDK 3.1.0 (58a2404) -RUN git clone --depth=1 --branch=v3.1.0 https://github.com/SiliconLabs/wiseconnect.git /tmp/wifi_sdk && \ +RUN git clone --depth=1 --single-branch --branch=v3.1.0 https://github.com/SiliconLabs/wiseconnect.git /tmp/wifi_sdk && \ cd /tmp/wifi_sdk && \ rm -rf .git \ && : # last line diff --git a/integrations/docker/images/stage-2/chip-build-efr32/requirements.txt b/integrations/docker/images/stage-2/chip-build-efr32/requirements.txt deleted file mode 120000 index 5a41777fc21cb7..00000000000000 --- a/integrations/docker/images/stage-2/chip-build-efr32/requirements.txt +++ /dev/null @@ -1 +0,0 @@ -../../../../../scripts/setup/requirements.silabs_docker.txt \ No newline at end of file diff --git a/integrations/docker/images/stage-2/chip-build-efr32/requirements.txt b/integrations/docker/images/stage-2/chip-build-efr32/requirements.txt new file mode 100644 index 00000000000000..9879603494656a --- /dev/null +++ b/integrations/docker/images/stage-2/chip-build-efr32/requirements.txt @@ -0,0 +1,10 @@ +# codegen.py build requirements +Jinja2==3.1.2 +lark==1.1.7 +stringcase==1.2.0 +# Sphinx dependencies (for slc-cli) +linkify-it-py==2.0.2 +myst-parser==2.0.0 +Sphinx==7.2.6 +sphinx-rtd-theme==1.3.0 +sphinx-tabs==3.4.1 diff --git a/scripts/setup/requirements.silabs_docker.txt b/scripts/setup/requirements.silabs_docker.txt deleted file mode 100644 index 9879603494656a..00000000000000 --- a/scripts/setup/requirements.silabs_docker.txt +++ /dev/null @@ -1,10 +0,0 @@ -# codegen.py build requirements -Jinja2==3.1.2 -lark==1.1.7 -stringcase==1.2.0 -# Sphinx dependencies (for slc-cli) -linkify-it-py==2.0.2 -myst-parser==2.0.0 -Sphinx==7.2.6 -sphinx-rtd-theme==1.3.0 -sphinx-tabs==3.4.1 diff --git a/scripts/setup/requirements.silabs_docker.txt b/scripts/setup/requirements.silabs_docker.txt new file mode 120000 index 00000000000000..ecb770063dfde6 --- /dev/null +++ b/scripts/setup/requirements.silabs_docker.txt @@ -0,0 +1 @@ +../../integrations/docker/images/stage-2/chip-build-efr32/requirements.txt \ No newline at end of file