From 13833108ebff59272c9e5e4d2f1c9e33770dca81 Mon Sep 17 00:00:00 2001 From: Jean-Francois Penven <67962328+jepenven-silabs@users.noreply.github.com> Date: Thu, 29 Jun 2023 09:20:13 -0400 Subject: [PATCH] Update Silicon Labs container (#27531) --- .../docker/images/chip-build-efr32/Dockerfile | 12 +++++++----- integrations/docker/images/chip-build/version | 2 +- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/integrations/docker/images/chip-build-efr32/Dockerfile b/integrations/docker/images/chip-build-efr32/Dockerfile index 3fa7a15500f435..12f63d89b156fd 100644 --- a/integrations/docker/images/chip-build-efr32/Dockerfile +++ b/integrations/docker/images/chip-build-efr32/Dockerfile @@ -8,7 +8,8 @@ RUN set -x \ gcc-arm-none-eabi=15:9-2019-q4-0ubuntu1 \ binutils-arm-none-eabi=2.34-4ubuntu1+13ubuntu1 \ git-lfs \ - openjdk-11-jdk \ + openjdk-17-jdk \ + python3-sphinx \ ccache=3.7.7-1 \ && apt-get clean \ && rm -rf /var/lib/apt/lists/ \ @@ -29,9 +30,10 @@ RUN wget https://www.silabs.com/documents/login/software/slc_cli_linux.zip && \ ENV PATH="${PATH}:/slc_cli/" -# TODO Fix me -# RUN slc configuration --sdk="$GSDK_ROOT" && \ -# slc signature trust --sdk "$GSDK_ROOT" - +# Install Python Packages +# SLC required Python Packages RUN pip3 install lark jinja2 stringcase + +# Sphinx required Python Packages +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 7dc47aac8efd00..64293fbaa0f15a 100644 --- a/integrations/docker/images/chip-build/version +++ b/integrations/docker/images/chip-build/version @@ -1 +1 @@ -0.7.21 Version bump reason: [Ameba] ota portinglayer api +0.7.22 Version bump reason: Update Silicon Labs docker