From 23967606e2f0d43680efdedff3065dc2ba4036ae Mon Sep 17 00:00:00 2001
From: Andrei Litvin <andy314@gmail.com>
Date: Mon, 23 Jan 2023 18:25:16 -0500
Subject: [PATCH] Move zap update to earlier since codegen at all levels
 depends on it (#24598)

---
 .../docker/images/chip-cert-bins/Dockerfile   | 21 +++++++++++--------
 1 file changed, 12 insertions(+), 9 deletions(-)

diff --git a/integrations/docker/images/chip-cert-bins/Dockerfile b/integrations/docker/images/chip-cert-bins/Dockerfile
index 69c50a005ba191..0514668098f7d2 100644
--- a/integrations/docker/images/chip-cert-bins/Dockerfile
+++ b/integrations/docker/images/chip-cert-bins/Dockerfile
@@ -2,7 +2,7 @@
 FROM ubuntu:22.04 as chip-build-cert
 ARG TARGETPLATFORM
 # COMMITHASH defines the target commit to build from. May be passed in using --build-arg.
-ARG COMMITHASH=451e602649b8b37ba6c9aab8ba5e30747293f778
+ARG COMMITHASH=7b99e6399c6069037c613782d78132c69b9dcabb
 
 # ZAP Development install, so that it runs on both x64 and arm64
 # Generally this should match with the ZAP version that is used for codegen within the
@@ -186,6 +186,15 @@ RUN case ${TARGETPLATFORM} in \
         *) ;; \
     esac
 
+RUN set -x \
+    && mkdir -p /opt/zap-${ZAP_VERSION} \
+    && git clone https://github.com/project-chip/zap.git /opt/zap-${ZAP_VERSION} \
+    && cd /opt/zap-${ZAP_VERSION} \
+    && git checkout ${ZAP_VERSION} \
+    && npm config set user 0 \
+    && npm ci
+ENV ZAP_DEVELOPMENT_PATH=/opt/zap-${ZAP_VERSION}
+
 # Stage 1.5: Bootstrap Matter.
 RUN mkdir /root/connectedhomeip
 RUN git clone https://github.com/project-chip/connectedhomeip.git /root/connectedhomeip
@@ -201,7 +210,9 @@ RUN set -x && \
 
 # Stage 2: Build.
 from chip-build-cert as chip-build-cert-bins
+
 SHELL ["/bin/bash", "-c"]
+
 # Records Matter SDK commit hash to include in the image.
 RUN git rev-parse HEAD > /root/.sdk-sha-version
 
@@ -261,14 +272,6 @@ RUN case ${TARGETPLATFORM} in \
         *) ;; \
     esac
 
-RUN set -x \
-    && mkdir -p /opt/zap-${ZAP_VERSION} \
-    && git clone https://github.com/project-chip/zap.git /opt/zap-${ZAP_VERSION} \
-    && cd /opt/zap-${ZAP_VERSION} \
-    && git checkout ${ZAP_VERSION} \
-    && npm config set user 0 \
-    && npm ci
-ENV ZAP_DEVELOPMENT_PATH=/opt/zap-${ZAP_VERSION}
 RUN scripts/examples/gn_build_test_example.sh app1
 
 RUN source scripts/activate.sh && scripts/build_python.sh -m platform -d true -i no