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

Fix chip-cert-bin Dockerfile #28079

Merged
merged 4 commits into from
Jul 21, 2023
Merged

Fix chip-cert-bin Dockerfile #28079

Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f5040c5
Build all binaries using build_examples.py
ccruzagralopes Jul 19, 2023
3a43fa6
Merge branch 'master' into fix_chip_cert_bin_dockerfile
ccruzagralopes Jul 19, 2023
90e0cd4
Update integrations/docker/images/chip-cert-bins/Dockerfile
ccruzagralopes Jul 19, 2023
f9cbf21
Merge branch 'master' into fix_chip_cert_bin_dockerfile
ccruzagralopes Jul 20, 2023
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
27 changes: 17 additions & 10 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 @@ -203,14 +203,9 @@ WORKDIR /root/connectedhomeip/
RUN git checkout ${COMMITHASH}
RUN ./scripts/checkout_submodules.py --allow-changing-global-git-config --shallow --platform linux
RUN bash scripts/bootstrap.sh
SHELL ["/bin/bash", "-c"]
RUN set -x && \
source scripts/activate.sh \
&& gn gen out/debug --args='chip_mdns="platform" chip_inet_config_enable_ipv4=false' \
&& ninja -C out/debug

# Stage 2: Build.
from chip-build-cert as chip-build-cert-bins
FROM chip-build-cert as chip-build-cert-bins

SHELL ["/bin/bash", "-c"]

Expand All @@ -222,6 +217,9 @@ RUN case ${TARGETPLATFORM} in \
set -x \
&& source scripts/activate.sh \
&& scripts/build/build_examples.py \
--target linux-x64-chip-tool-ipv6only-platform-mdns \
--target linux-x64-shell-ipv6only-platform-mdns \
--target linux-x64-chip-cert-ipv6only-platform-mdns \
--target linux-x64-all-clusters-ipv6only \
--target linux-x64-all-clusters-minimal-ipv6only \
--target linux-x64-bridge-ipv6only \
Expand All @@ -234,6 +232,9 @@ RUN case ${TARGETPLATFORM} in \
--target linux-x64-lock-ipv6only \
--target linux-x64-simulated-app1-ipv6only \
build \
&& mv out/linux-x64-chip-tool-ipv6only-platform-mdns/chip-tool out/chip-tool \
&& mv out/linux-x64-shell-ipv6only-platform-mdns/chip-shell out/chip-shell \
&& mv out/linux-x64-chip-cert-ipv6only-platform-mdns/chip-cert out/chip-cert \
&& mv out/linux-x64-all-clusters-ipv6only/chip-all-clusters-app out/chip-all-clusters-app \
&& mv out/linux-x64-all-clusters-minimal-ipv6only/chip-all-clusters-minimal-app out/chip-all-clusters-minimal-app \
&& mv out/linux-x64-bridge-ipv6only/chip-bridge-app out/chip-bridge-app \
Expand All @@ -250,6 +251,9 @@ RUN case ${TARGETPLATFORM} in \
set -x \
&& source scripts/activate.sh \
&& scripts/build/build_examples.py \
--target linux-arm64-chip-tool-ipv6only-platform-mdns \
--target linux-arm64-chip-tool-ipv6only-platform-mdns \
--target linux-arm64-chip-cert-ipv6only-platform-mdns \
--target linux-arm64-all-clusters-ipv6only \
--target linux-arm64-all-clusters-minimal-ipv6only \
--target linux-arm64-bridge-ipv6only \
Expand All @@ -262,6 +266,9 @@ RUN case ${TARGETPLATFORM} in \
--target linux-arm64-lock-ipv6only \
--target linux-arm64-simulated-app1-ipv6only \
build \
&& mv out/linux-arm64-chip-tool-ipv6only-platform-mdns/chip-tool out/chip-tool \
&& mv out/linux-arm64-shell-ipv6only-platform-mdns/chip-shell out/chip-shell \
&& mv out/linux-arm64-chip-cert-ipv6only-platform-mdns/chip-cert out/chip-cert \
&& mv out/linux-arm64-all-clusters-ipv6only/chip-all-clusters-app out/chip-all-clusters-app \
&& mv out/linux-arm64-all-clusters-minimal-ipv6only/chip-all-clusters-minimal-app out/chip-all-clusters-minimal-app \
&& mv out/linux-arm64-bridge-ipv6only/chip-bridge-app out/chip-bridge-app \
Expand All @@ -277,7 +284,7 @@ RUN case ${TARGETPLATFORM} in \
*) ;; \
esac

RUN source scripts/activate.sh && scripts/build_python.sh -m platform -d true -i no
RUN source scripts/activate.sh && scripts/build_python.sh -m platform -d true

# Stage 3: Copy relevant cert bins to a minimal image to reduce size.
FROM ubuntu:22.04
Expand All @@ -287,9 +294,9 @@ RUN apt-get update -y
RUN apt-get install -y libssl-dev libdbus-1-dev libglib2.0-dev libavahi-client-dev avahi-utils iproute2 libcairo2-dev libgirepository1.0-dev python3-pip
WORKDIR /root/
COPY --from=chip-build-cert-bins /root/.sdk-sha-version .sdk-sha-version
COPY --from=chip-build-cert-bins /root/connectedhomeip/out/debug/chip-tool chip-tool
COPY --from=chip-build-cert-bins /root/connectedhomeip/out/debug/chip-shell chip-shell
COPY --from=chip-build-cert-bins /root/connectedhomeip/out/debug/chip-cert chip-cert
COPY --from=chip-build-cert-bins /root/connectedhomeip/out/chip-tool chip-tool
COPY --from=chip-build-cert-bins /root/connectedhomeip/out/chip-shell chip-shell
COPY --from=chip-build-cert-bins /root/connectedhomeip/out/chip-cert chip-cert
COPY --from=chip-build-cert-bins /root/connectedhomeip/out/chip-all-clusters-app chip-all-clusters-app
COPY --from=chip-build-cert-bins /root/connectedhomeip/out/chip-all-clusters-minimal-app chip-all-clusters-minimal-app
COPY --from=chip-build-cert-bins /root/connectedhomeip/out/chip-lighting-app chip-lighting-app
Expand Down