Skip to content

Commit

Permalink
Remove zap development install. (#28223)
Browse files Browse the repository at this point in the history
`zap` is now available as arm64 binaries, and bootstrap will take care of installing it.
  • Loading branch information
mikaelhm authored and pull[bot] committed Feb 2, 2024
1 parent ed923ab commit 3611187
Showing 1 changed file with 0 additions and 44 deletions.
44 changes: 0 additions & 44 deletions integrations/docker/images/chip-cert-bins/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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") \
Expand Down Expand Up @@ -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
Expand Down

0 comments on commit 3611187

Please sign in to comment.