Adds requirements file for pip freeze

project-chip · Oct 12, 2023 · 35a7ba9 · 35a7ba9
1 parent b196e93
commit 35a7ba9
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 23 deletions.
diff --git a/integrations/docker/images/stage-2/chip-build-efr32/Dockerfile b/integrations/docker/images/stage-2/chip-build-efr32/Dockerfile
@@ -14,7 +14,7 @@ RUN set -x \
 
 
 # Clone Gecko SDK 4.3.2 (1228a95)
-RUN git clone --depth=1 --branch=v4.3.2 https://github.com/SiliconLabs/gecko_sdk.git /tmp/gecko_sdk && \
+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 \
     && : # last line
@@ -41,29 +41,21 @@ RUN wget https://www.silabs.com/documents/login/software/slc_cli_linux.zip && \
 # Final SDK container for compiling using Silabs SDK
 FROM ghcr.io/project-chip/chip-build:${VERSION}
 
+ADD requirements.txt /tmp/requirements.txt
+
 # GNU ARM Embedded toolchain, cross compiler for various platform builds
 RUN set -x \
     && apt-get update \
     && DEBIAN_FRONTEND=noninteractive apt-get install -fy --no-install-recommends \
     gcc-arm-none-eabi \
     binutils-arm-none-eabi \
     openjdk-17-jdk-headless \
-    python3-sphinx \
     ccache \
     && apt-get clean \
     && rm -rf /var/lib/apt/lists/ \
     # Install Python Packages
-    && pip3 install \
-    # codegen.py build requirements
-    # TODO: why are these added here instead of build-env?
-    lark \
-    jinja2 \
-    stringcase \
-    # Sphinx dependencies (for slc-cli)
-    myst_parser \
-    sphinx_rtd_theme \
-    sphinx_tabs \
-    linkify-it-py \
+    && pip3 install -r /tmp/requirements.txt \
+    && rm /tmp/requirements.txt \
     && : # last line
 
 ENV GSDK_ROOT=/opt/silabs/gecko_sdk/

diff --git a/integrations/docker/images/stage-2/chip-build-efr32/requirements.txt b/integrations/docker/images/stage-2/chip-build-efr32/requirements.txt
@@ -0,0 +1 @@
+../../../../../scripts/setup/requirements.silabs_docker.txt
diff --git a/scripts/setup/requirements.silabs_docker.txt b/scripts/setup/requirements.silabs_docker.txt
@@ -1,10 +1,10 @@
-# The below dependencies are being installed by apt inside docker
-# adding the list here for book keeping if things start breaking in future
-# Jinja2==3.1.2
-# lark==1.1.7
-# 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
-# stringcase==1.2.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
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		../../../../../scripts/setup/requirements.silabs_docker.txt