Skip to content

Commit 95ee157

Browse files
authored
Add apps to chip cert bins image (project-chip#35207)
* Add Apps to chip_cert_bins image * Minor fixes
1 parent 6837162 commit 95ee157

File tree

1 file changed

+16
-1
lines changed
  • integrations/docker/images/chip-cert-bins

1 file changed

+16
-1
lines changed

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

+16-1
Original file line numberDiff line numberDiff line change
@@ -193,6 +193,9 @@ RUN case ${TARGETPLATFORM} in \
193193
--target linux-x64-energy-management-ipv6only \
194194
--target linux-x64-microwave-oven-ipv6only \
195195
--target linux-x64-rvc-ipv6only \
196+
--target linux-x64-fabric-bridge-rpc-ipv6only \
197+
--target linux-x64-fabric-admin-rpc-ipv6only \
198+
--target linux-x64-network-manager-ipv6only \
196199
build \
197200
&& mv out/linux-x64-chip-tool-ipv6only-platform-mdns/chip-tool out/chip-tool \
198201
&& mv out/linux-x64-shell-ipv6only-platform-mdns/chip-shell out/chip-shell \
@@ -213,6 +216,9 @@ RUN case ${TARGETPLATFORM} in \
213216
&& mv out/linux-x64-energy-management-ipv6only/chip-energy-management-app out/chip-energy-management-app \
214217
&& mv out/linux-x64-microwave-oven-ipv6only/chip-microwave-oven-app out/chip-microwave-oven-app \
215218
&& mv out/linux-x64-rvc-ipv6only/chip-rvc-app out/chip-rvc-app \
219+
&& mv out/linux-x64-fabric-bridge-rpc-ipv6only/fabric-bridge-app out/fabric-bridge-app \
220+
&& mv out/linux-x64-fabric-admin-rpc-ipv6only/fabric-admin out/fabric-admin \
221+
&& mv out/linux-x64-network-manager-ipv6only/matter-network-manager-app out/matter-network-manager-app \
216222
;; \
217223
"linux/arm64")\
218224
set -x \
@@ -237,6 +243,9 @@ RUN case ${TARGETPLATFORM} in \
237243
--target linux-arm64-energy-management-ipv6only \
238244
--target linux-arm64-microwave-oven-ipv6only \
239245
--target linux-arm64-rvc-ipv6only \
246+
--target linux-arm64-fabric-bridge-rpc-ipv6only \
247+
--target linux-arm64-fabric-admin-rpc-ipv6only \
248+
--target linux-arm64-network-manager-ipv6only \
240249
build \
241250
&& mv out/linux-arm64-chip-tool-ipv6only-platform-mdns/chip-tool out/chip-tool \
242251
&& mv out/linux-arm64-shell-ipv6only-platform-mdns/chip-shell out/chip-shell \
@@ -257,6 +266,9 @@ RUN case ${TARGETPLATFORM} in \
257266
&& mv out/linux-arm64-energy-management-ipv6only/chip-energy-management-app out/chip-energy-management-app \
258267
&& mv out/linux-arm64-microwave-oven-ipv6only/chip-microwave-oven-app out/chip-microwave-oven-app \
259268
&& mv out/linux-arm64-rvc-ipv6only/chip-rvc-app out/chip-rvc-app \
269+
&& mv out/linux-arm64-fabric-bridge-rpc-ipv6only/fabric-bridge-app out/fabric-bridge-app \
270+
&& mv out/linux-arm64-fabric-admin-rpc-ipv6only/fabric-admin out/fabric-admin \
271+
&& mv out/linux-arm64-network-manager-ipv6only/matter-network-manager-app out/matter-network-manager-app \
260272
;; \
261273
*) ;; \
262274
esac
@@ -290,6 +302,9 @@ COPY --from=chip-build-cert-bins /root/connectedhomeip/out/lit-icd-app lit-icd-a
290302
COPY --from=chip-build-cert-bins /root/connectedhomeip/out/chip-energy-management-app chip-energy-management-app
291303
COPY --from=chip-build-cert-bins /root/connectedhomeip/out/chip-microwave-oven-app chip-microwave-oven-app
292304
COPY --from=chip-build-cert-bins /root/connectedhomeip/out/chip-rvc-app chip-rvc-app
305+
COPY --from=chip-build-cert-bins /root/connectedhomeip/out/fabric-bridge-app fabric-bridge-app
306+
COPY --from=chip-build-cert-bins /root/connectedhomeip/out/fabric-admin fabric-admin
307+
COPY --from=chip-build-cert-bins /root/connectedhomeip/out/matter-network-manager-app matter-network-manager-app
293308

294309
# Stage 3.1: Setup the Matter Python environment
295310
COPY --from=chip-build-cert-bins /root/connectedhomeip/out/python_lib python_lib
@@ -304,6 +319,6 @@ COPY --from=chip-build-cert-bins /root/connectedhomeip/src/python_testing/requir
304319
RUN pip install --break-system-packages -r /tmp/requirements.txt && rm /tmp/requirements.txt
305320

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

309324
RUN pip install --break-system-packages --no-cache-dir python_lib/controller/python/chip*.whl

0 commit comments

Comments
 (0)