Skip to content

Commit ba510d4

Browse files
Fix up chip-cert-bins Dockerfile. (#33015)
- 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>
1 parent 11f94c3 commit ba510d4

File tree

1 file changed

+9
-8
lines changed
  • integrations/docker/images/chip-cert-bins

1 file changed

+9
-8
lines changed

integrations/docker/images/chip-cert-bins/Dockerfile

+9-8
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,6 @@ RUN set -x \
8989
wget \
9090
git-lfs \
9191
zlib1g-dev \
92-
&& rm -rf /var/lib/apt/lists/ \
9392
&& git lfs install \
9493
&& : # last line
9594

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

120119
# Python 3 and PIP
121120
RUN set -x \
122-
&& DEBIAN_FRONTEND=noninteractive apt-get update \
123-
&& DEBIAN_FRONTEND=noninteractive apt-get install -y libgirepository1.0-dev \
124-
&& DEBIAN_FRONTEND=noninteractive apt-get install -y software-properties-common \
121+
&& DEBIAN_FRONTEND=noninteractive apt-get install -y \
122+
libgirepository1.0-dev \
123+
software-properties-common \
125124
&& add-apt-repository universe \
126125
&& curl https://bootstrap.pypa.io/get-pip.py -o get-pip.py \
127126
&& python3 get-pip.py \
128-
&& rm -rf /var/lib/apt/lists/ \
129127
&& : # last line
130128

131129
RUN set -x \
@@ -148,9 +146,9 @@ RUN set -x \
148146
&& git clone https://github.com/google/bloaty.git \
149147
&& mkdir -p bloaty/build \
150148
&& cd bloaty/build \
151-
&& cmake ../ \
152-
&& make -j8 \
153-
&& make install \
149+
&& cmake -G Ninja ../ \
150+
&& ninja \
151+
&& ninja install \
154152
&& cd ../.. \
155153
&& rm -rf bloaty \
156154
&& : # last line
@@ -299,4 +297,7 @@ RUN pip install -r /tmp/requirements.txt && rm /tmp/requirements.txt
299297
COPY --from=chip-build-cert-bins /root/connectedhomeip/src/python_testing/requirements.txt /tmp/requirements.txt
300298
RUN pip install -r /tmp/requirements.txt && rm /tmp/requirements.txt
301299

300+
# PIP requires MASON package compilation, which seems to require a JDK
301+
RUN set -x && DEBIAN_FRONTEND=noninteractive apt-get install -fy openjdk-8-jdk
302+
302303
RUN pip install --no-cache-dir python_lib/controller/python/chip*.whl

0 commit comments

Comments
 (0)