Skip to content

Commit

Permalink
Fix up chip-cert-bins Dockerfile. (#33015)
Browse files Browse the repository at this point in the history
- Update compile of bloaty to use ninja, so we do not hardcode -j8
- Install openjdk8 before installing chip whl, since apparently
  we depend on mason which depends on the jdk

Co-authored-by: Andrei Litvin <andreilitvin@google.com>
  • Loading branch information
andy31415 and andreilitvin authored Apr 16, 2024
1 parent 11f94c3 commit ba510d4
Showing 1 changed file with 9 additions and 8 deletions.
17 changes: 9 additions & 8 deletions integrations/docker/images/chip-cert-bins/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,6 @@ RUN set -x \
wget \
git-lfs \
zlib1g-dev \
&& rm -rf /var/lib/apt/lists/ \
&& git lfs install \
&& : # last line

Expand Down Expand Up @@ -119,13 +118,12 @@ RUN case ${TARGETPLATFORM} in \

# Python 3 and PIP
RUN set -x \
&& DEBIAN_FRONTEND=noninteractive apt-get update \
&& DEBIAN_FRONTEND=noninteractive apt-get install -y libgirepository1.0-dev \
&& DEBIAN_FRONTEND=noninteractive apt-get install -y software-properties-common \
&& DEBIAN_FRONTEND=noninteractive apt-get install -y \
libgirepository1.0-dev \
software-properties-common \
&& add-apt-repository universe \
&& curl https://bootstrap.pypa.io/get-pip.py -o get-pip.py \
&& python3 get-pip.py \
&& rm -rf /var/lib/apt/lists/ \
&& : # last line

RUN set -x \
Expand All @@ -148,9 +146,9 @@ RUN set -x \
&& git clone https://github.com/google/bloaty.git \
&& mkdir -p bloaty/build \
&& cd bloaty/build \
&& cmake ../ \
&& make -j8 \
&& make install \
&& cmake -G Ninja ../ \
&& ninja \
&& ninja install \
&& cd ../.. \
&& rm -rf bloaty \
&& : # last line
Expand Down Expand Up @@ -299,4 +297,7 @@ RUN pip install -r /tmp/requirements.txt && rm /tmp/requirements.txt
COPY --from=chip-build-cert-bins /root/connectedhomeip/src/python_testing/requirements.txt /tmp/requirements.txt
RUN pip install -r /tmp/requirements.txt && rm /tmp/requirements.txt

# PIP requires MASON package compilation, which seems to require a JDK
RUN set -x && DEBIAN_FRONTEND=noninteractive apt-get install -fy openjdk-8-jdk

RUN pip install --no-cache-dir python_lib/controller/python/chip*.whl

0 comments on commit ba510d4

Please sign in to comment.