Skip to content

Commit 1534155

Browse files
ccruzagralopespull[bot]
authored andcommitted
Fix chip-cert-bin Dockerfile (#28079)
* Build all binaries using build_examples.py * Update integrations/docker/images/chip-cert-bins/Dockerfile
1 parent da46288 commit 1534155

File tree

1 file changed

+17
-10
lines changed
  • integrations/docker/images/chip-cert-bins

1 file changed

+17
-10
lines changed

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

+17-10
Original file line numberDiff line numberDiff line change
@@ -203,14 +203,9 @@ WORKDIR /root/connectedhomeip/
203203
RUN git checkout ${COMMITHASH}
204204
RUN ./scripts/checkout_submodules.py --allow-changing-global-git-config --shallow --platform linux
205205
RUN bash scripts/bootstrap.sh
206-
SHELL ["/bin/bash", "-c"]
207-
RUN set -x && \
208-
source scripts/activate.sh \
209-
&& gn gen out/debug --args='chip_mdns="platform" chip_inet_config_enable_ipv4=false' \
210-
&& ninja -C out/debug
211206

212207
# Stage 2: Build.
213-
from chip-build-cert as chip-build-cert-bins
208+
FROM chip-build-cert as chip-build-cert-bins
214209

215210
SHELL ["/bin/bash", "-c"]
216211

@@ -222,6 +217,9 @@ RUN case ${TARGETPLATFORM} in \
222217
set -x \
223218
&& source scripts/activate.sh \
224219
&& scripts/build/build_examples.py \
220+
--target linux-x64-chip-tool-ipv6only-platform-mdns \
221+
--target linux-x64-shell-ipv6only-platform-mdns \
222+
--target linux-x64-chip-cert-ipv6only-platform-mdns \
225223
--target linux-x64-all-clusters-ipv6only \
226224
--target linux-x64-all-clusters-minimal-ipv6only \
227225
--target linux-x64-bridge-ipv6only \
@@ -234,6 +232,9 @@ RUN case ${TARGETPLATFORM} in \
234232
--target linux-x64-lock-ipv6only \
235233
--target linux-x64-simulated-app1-ipv6only \
236234
build \
235+
&& mv out/linux-x64-chip-tool-ipv6only-platform-mdns/chip-tool out/chip-tool \
236+
&& mv out/linux-x64-shell-ipv6only-platform-mdns/chip-shell out/chip-shell \
237+
&& mv out/linux-x64-chip-cert-ipv6only-platform-mdns/chip-cert out/chip-cert \
237238
&& mv out/linux-x64-all-clusters-ipv6only/chip-all-clusters-app out/chip-all-clusters-app \
238239
&& mv out/linux-x64-all-clusters-minimal-ipv6only/chip-all-clusters-minimal-app out/chip-all-clusters-minimal-app \
239240
&& mv out/linux-x64-bridge-ipv6only/chip-bridge-app out/chip-bridge-app \
@@ -250,6 +251,9 @@ RUN case ${TARGETPLATFORM} in \
250251
set -x \
251252
&& source scripts/activate.sh \
252253
&& scripts/build/build_examples.py \
254+
--target linux-arm64-chip-tool-ipv6only-platform-mdns \
255+
--target linux-arm64-shell-ipv6only-platform-mdns \
256+
--target linux-arm64-chip-cert-ipv6only-platform-mdns \
253257
--target linux-arm64-all-clusters-ipv6only \
254258
--target linux-arm64-all-clusters-minimal-ipv6only \
255259
--target linux-arm64-bridge-ipv6only \
@@ -262,6 +266,9 @@ RUN case ${TARGETPLATFORM} in \
262266
--target linux-arm64-lock-ipv6only \
263267
--target linux-arm64-simulated-app1-ipv6only \
264268
build \
269+
&& mv out/linux-arm64-chip-tool-ipv6only-platform-mdns/chip-tool out/chip-tool \
270+
&& mv out/linux-arm64-shell-ipv6only-platform-mdns/chip-shell out/chip-shell \
271+
&& mv out/linux-arm64-chip-cert-ipv6only-platform-mdns/chip-cert out/chip-cert \
265272
&& mv out/linux-arm64-all-clusters-ipv6only/chip-all-clusters-app out/chip-all-clusters-app \
266273
&& mv out/linux-arm64-all-clusters-minimal-ipv6only/chip-all-clusters-minimal-app out/chip-all-clusters-minimal-app \
267274
&& mv out/linux-arm64-bridge-ipv6only/chip-bridge-app out/chip-bridge-app \
@@ -277,7 +284,7 @@ RUN case ${TARGETPLATFORM} in \
277284
*) ;; \
278285
esac
279286

280-
RUN source scripts/activate.sh && scripts/build_python.sh -m platform -d true -i no
287+
RUN source scripts/activate.sh && scripts/build_python.sh -m platform -d true
281288

282289
# Stage 3: Copy relevant cert bins to a minimal image to reduce size.
283290
FROM ubuntu:22.04
@@ -287,9 +294,9 @@ RUN apt-get update -y
287294
RUN apt-get install -y libssl-dev libdbus-1-dev libglib2.0-dev libavahi-client-dev avahi-utils iproute2 libcairo2-dev libgirepository1.0-dev python3-pip
288295
WORKDIR /root/
289296
COPY --from=chip-build-cert-bins /root/.sdk-sha-version .sdk-sha-version
290-
COPY --from=chip-build-cert-bins /root/connectedhomeip/out/debug/chip-tool chip-tool
291-
COPY --from=chip-build-cert-bins /root/connectedhomeip/out/debug/chip-shell chip-shell
292-
COPY --from=chip-build-cert-bins /root/connectedhomeip/out/debug/chip-cert chip-cert
297+
COPY --from=chip-build-cert-bins /root/connectedhomeip/out/chip-tool chip-tool
298+
COPY --from=chip-build-cert-bins /root/connectedhomeip/out/chip-shell chip-shell
299+
COPY --from=chip-build-cert-bins /root/connectedhomeip/out/chip-cert chip-cert
293300
COPY --from=chip-build-cert-bins /root/connectedhomeip/out/chip-all-clusters-app chip-all-clusters-app
294301
COPY --from=chip-build-cert-bins /root/connectedhomeip/out/chip-all-clusters-minimal-app chip-all-clusters-minimal-app
295302
COPY --from=chip-build-cert-bins /root/connectedhomeip/out/chip-lighting-app chip-lighting-app

0 commit comments

Comments
 (0)