Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Make chip-cert-bins dockerfile be able to compile a more recent ToT #24598

Merged
merged 1 commit into from
Jan 23, 2023
Merged

Make chip-cert-bins dockerfile be able to compile a more recent ToT #24598

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 12 additions & 9 deletions integrations/docker/images/chip-cert-bins/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand All @@ -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

Expand Down Expand Up @@ -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
Expand Down