Skip to content

Commit 4783603

Browse files
andy31415pull[bot]
authored andcommitted
Update cert bins: arm64 zap and all-clusters-minimal (#23882)
* CertBins: use devel zap, add back all-clusters-minimal * Also copy all-clusters-minimal to output * fix typo * Comments updated
1 parent de9188d commit 4783603

File tree

1 file changed

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

1 file changed

+12
-12
lines changed

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

+12-12
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
FROM ubuntu:22.04 as chip-build-cert
33
ARG TARGETPLATFORM
44
# COMMITHASH defines the target commit to build from. May be passed in using --build-arg.
5-
ARG COMMITHASH=21245f42393e63dbb16fb4d99d8bf96aef7ae0fc
5+
ARG COMMITHASH=1e06479f412b78eea0dfbeacf7cad51d005b649b
66

77
# Ensure TARGETPLATFORM is set
88
RUN case ${TARGETPLATFORM} in \
@@ -200,15 +200,13 @@ SHELL ["/bin/bash", "-c"]
200200
# Records Matter SDK commit hash to include in the image.
201201
RUN git rev-parse HEAD > /root/.sdk-sha-version
202202

203-
# TODO: below the build of linux-arm64-all-clusters-minimal-ipv6only/linux-x64-all-clusters-minimal-ipv6only
204-
# is NOT performed because the given SHA does not build minimal and
205-
# builds the regular all-clusters app instead.
206203
RUN case ${TARGETPLATFORM} in \
207204
"linux/amd64") \
208205
set -x \
209206
&& source scripts/activate.sh \
210207
&& scripts/build/build_examples.py \
211208
--target linux-x64-all-clusters-ipv6only \
209+
--target linux-x64-all-clusters-minimal-ipv6only \
212210
--target linux-x64-bridge-ipv6only \
213211
--target linux-x64-tv-app-ipv6only \
214212
--target linux-x64-tv-casting-app-ipv6only \
@@ -219,6 +217,7 @@ RUN case ${TARGETPLATFORM} in \
219217
--target linux-x64-lock-ipv6only \
220218
build \
221219
&& mv out/linux-x64-all-clusters-ipv6only/chip-all-clusters-app out/chip-all-clusters-app \
220+
&& mv out/linux-x64-all-clusters-minimal-ipv6only/chip-all-clusters-minimal-app out/chip-all-clusters-minimal-app \
222221
&& mv out/linux-x64-bridge-ipv6only/chip-bridge-app out/chip-bridge-app \
223222
&& mv out/linux-x64-tv-app-ipv6only/chip-tv-app out/chip-tv-app \
224223
&& mv out/linux-x64-tv-casting-app-ipv6only/chip-tv-casting-app out/chip-tv-casting-app \
@@ -233,6 +232,7 @@ RUN case ${TARGETPLATFORM} in \
233232
&& source scripts/activate.sh \
234233
&& scripts/build/build_examples.py \
235234
--target linux-arm64-all-clusters-ipv6only \
235+
--target linux-arm64-all-clusters-minimal-ipv6only \
236236
--target linux-arm64-bridge-ipv6only \
237237
--target linux-arm64-tv-app-ipv6only \
238238
--target linux-arm64-tv-casting-app-ipv6only \
@@ -243,6 +243,7 @@ RUN case ${TARGETPLATFORM} in \
243243
--target linux-arm64-lock-ipv6only \
244244
build \
245245
&& mv out/linux-arm64-all-clusters-ipv6only/chip-all-clusters-app out/chip-all-clusters-app \
246+
&& mv out/linux-arm64-all-clusters-minimal-ipv6only/chip-all-clusters-minimal-app out/chip-all-clusters-minimal-app \
246247
&& mv out/linux-arm64-bridge-ipv6only/chip-bridge-app out/chip-bridge-app \
247248
&& mv out/linux-arm64-tv-app-ipv6only/chip-tv-app out/chip-tv-app \
248249
&& mv out/linux-arm64-tv-casting-app-ipv6only/chip-tv-casting-app out/chip-tv-casting-app \
@@ -255,18 +256,16 @@ RUN case ${TARGETPLATFORM} in \
255256
*) ;; \
256257
esac
257258

258-
# Install a known ZAP release
259-
# Only keep the cli version, since `zap` is 143MB and not usable (UI)
259+
# ZAP Development install, so that it runs on both x64 and arm64
260260
ENV ZAP_VERSION=v2022.11.29-nightly
261261
RUN set -x \
262262
&& mkdir -p /opt/zap-${ZAP_VERSION} \
263+
&& git clone https://github.com/project-chip/zap.git /opt/zap-${ZAP_VERSION} \
263264
&& cd /opt/zap-${ZAP_VERSION} \
264-
&& wget https://github.com/project-chip/zap/releases/download/${ZAP_VERSION}/zap-linux.zip \
265-
&& unzip zap-linux.zip \
266-
&& rm zap-linux.zip \
267-
&& rm zap \
268-
&& ln -s /opt/zap-${ZAP_VERSION}/zap-cli /usr/bin/ \
269-
&& : # last line
265+
&& git checkout ${ZAP_VERSION} \
266+
&& npm config set user 0 \
267+
&& npm ci
268+
ENV ZAP_DEVELOPMENT_PATH=/opt/zap-${ZAP_VERSION}
270269
RUN scripts/examples/gn_build_test_example.sh app1
271270

272271
RUN source scripts/activate.sh && scripts/build_python.sh -m platform -d true -i no
@@ -283,6 +282,7 @@ COPY --from=chip-build-cert-bins /root/connectedhomeip/out/debug/chip-tool chip-
283282
COPY --from=chip-build-cert-bins /root/connectedhomeip/out/debug/chip-shell chip-shell
284283
COPY --from=chip-build-cert-bins /root/connectedhomeip/out/debug/chip-cert chip-cert
285284
COPY --from=chip-build-cert-bins /root/connectedhomeip/out/chip-all-clusters-app chip-all-clusters-app
285+
COPY --from=chip-build-cert-bins /root/connectedhomeip/out/chip-all-clusters-minimal-app chip-all-clusters-minimal-app
286286
COPY --from=chip-build-cert-bins /root/connectedhomeip/out/chip-lighting-app chip-lighting-app
287287
COPY --from=chip-build-cert-bins /root/connectedhomeip/out/chip-tv-casting-app chip-tv-casting-app
288288
COPY --from=chip-build-cert-bins /root/connectedhomeip/out/chip-tv-app chip-tv-app

0 commit comments

Comments
 (0)