From 1133176a82f787c2c73cdcd1a39b5ab24cce069c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mikael=20M=C3=B8ller?= Date: Tue, 25 Jul 2023 07:09:33 -0700 Subject: [PATCH] Remove zap development install. (#28223) `zap` is now available as arm64 binaries, and bootstrap will take care of installing it. --- .../docker/images/chip-cert-bins/Dockerfile | 44 ------------------- 1 file changed, 44 deletions(-) diff --git a/integrations/docker/images/chip-cert-bins/Dockerfile b/integrations/docker/images/chip-cert-bins/Dockerfile index 18ebd7263fc701..47d7cc0b606742 100644 --- a/integrations/docker/images/chip-cert-bins/Dockerfile +++ b/integrations/docker/images/chip-cert-bins/Dockerfile @@ -5,11 +5,6 @@ ARG TARGETPLATFORM # COMMITHASH defines the target commit to build from. May be passed in using --build-arg. 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 -# specified SHA -ARG ZAP_VERSION=v2023.07.21-nightly - # Ensure TARGETPLATFORM is set RUN case ${TARGETPLATFORM} in \ "linux/amd64") \ @@ -157,45 +152,6 @@ RUN set -x \ && rm -rf bloaty \ && : # last line -# NodeJS: install a newer version than what apt-get would read -# This installs the latest LTS version of nodejs -RUN case ${TARGETPLATFORM} in \ - "linux/amd64") \ - set -x \ - && mkdir node_js \ - && cd node_js \ - && wget https://nodejs.org/dist/v12.22.12/node-v12.22.12-linux-x64.tar.xz \ - && tar xfvJ node-v12.22.12-linux-x64.tar.xz \ - && mv node-v12.22.12-linux-x64 /opt/ \ - && ln -s /opt/node-v12.22.12-linux-x64 /opt/node \ - && ln -s /opt/node/bin/* /usr/bin \ - && cd .. \ - && rm -rf node_js \ - ;; \ - "linux/arm64")\ - set -x \ - && mkdir node_js \ - && cd node_js \ - && wget https://nodejs.org/dist/v12.22.12/node-v12.22.12-linux-arm64.tar.xz \ - && tar xfvJ node-v12.22.12-linux-arm64.tar.xz \ - && mv node-v12.22.12-linux-arm64 /opt/ \ - && ln -s /opt/node-v12.22.12-linux-arm64 /opt/node \ - && ln -s /opt/node/bin/* /usr/bin \ - && cd .. \ - && rm -rf node_js \ - ;; \ - *) ;; \ - 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