Updated chip-cert-bins Dockerfile (#33448)
diff --git a/integrations/docker/images/chip-cert-bins/Dockerfile b/integrations/docker/images/chip-cert-bins/Dockerfile
index b04679d..ef26e30 100644
--- a/integrations/docker/images/chip-cert-bins/Dockerfile
+++ b/integrations/docker/images/chip-cert-bins/Dockerfile
@@ -89,7 +89,6 @@
wget \
git-lfs \
zlib1g-dev \
- && rm -rf /var/lib/apt/lists/ \
&& git lfs install \
&& : # last line
@@ -119,13 +118,12 @@
# Python 3 and PIP
RUN set -x \
- && DEBIAN_FRONTEND=noninteractive apt-get update \
- && DEBIAN_FRONTEND=noninteractive apt-get install -y libgirepository1.0-dev \
- && DEBIAN_FRONTEND=noninteractive apt-get install -y software-properties-common \
+ && DEBIAN_FRONTEND=noninteractive apt-get install -y \
+ libgirepository1.0-dev \
+ software-properties-common \
&& add-apt-repository universe \
&& curl https://bootstrap.pypa.io/get-pip.py -o get-pip.py \
&& python3 get-pip.py \
- && rm -rf /var/lib/apt/lists/ \
&& : # last line
RUN set -x \
@@ -148,9 +146,9 @@
&& git clone https://github.com/google/bloaty.git \
&& mkdir -p bloaty/build \
&& cd bloaty/build \
- && cmake ../ \
- && make -j8 \
- && make install \
+ && cmake -G Ninja ../ \
+ && ninja \
+ && ninja install \
&& cd ../.. \
&& rm -rf bloaty \
&& : # last line
@@ -194,7 +192,6 @@
--target linux-x64-lit-icd-ipv6only \
--target linux-x64-energy-management-ipv6only \
--target linux-x64-microwave-oven-ipv6only \
- --target linux-x64-rvc-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 \
@@ -214,7 +211,6 @@
&& mv out/linux-x64-lit-icd-ipv6only/lit-icd-app out/lit-icd-app \
&& mv out/linux-x64-energy-management-ipv6only/chip-energy-management-app out/chip-energy-management-app \
&& mv out/linux-x64-microwave-oven-ipv6only/chip-microwave-oven-app out/chip-microwave-oven-app \
- && mv out/linux-x64-rvc-ipv6only/chip-rvc-app out/chip-rvc-app \
;; \
"linux/arm64")\
set -x \
@@ -257,7 +253,6 @@
&& mv out/linux-arm64-lit-icd-ipv6only/lit-icd-app out/lit-icd-app \
&& mv out/linux-arm64-energy-management-ipv6only/chip-energy-management-app out/chip-energy-management-app \
&& mv out/linux-arm64-microwave-oven-ipv6only/chip-microwave-oven-app out/chip-microwave-oven-app \
- && mv out/linux-arm64-rvc-ipv6only/chip-rvc-app out/chip-rvc-app \
;; \
*) ;; \
esac
@@ -290,13 +285,11 @@
COPY --from=chip-build-cert-bins /root/connectedhomeip/out/lit-icd-app lit-icd-app
COPY --from=chip-build-cert-bins /root/connectedhomeip/out/chip-energy-management-app chip-energy-management-app
COPY --from=chip-build-cert-bins /root/connectedhomeip/out/chip-microwave-oven-app chip-microwave-oven-app
-COPY --from=chip-build-cert-bins /root/connectedhomeip/out/chip-rvc-app chip-rvc-app
# Stage 3.1: Setup the Matter Python environment
COPY --from=chip-build-cert-bins /root/connectedhomeip/out/python_lib python_lib
COPY --from=chip-build-cert-bins /root/connectedhomeip/out/python_env python_env
-COPY --from=chip-build-cert-bins /root/connectedhomeip/src/python_testing python_testing/scripts/sdk
-COPY --from=chip-build-cert-bins /root/connectedhomeip/data_model python_testing/data_model
+COPY --from=chip-build-cert-bins /root/connectedhomeip/src/python_testing python_testing
COPY --from=chip-build-cert-bins /root/connectedhomeip/scripts/tests/requirements.txt /tmp/requirements.txt
RUN pip install -r /tmp/requirements.txt && rm /tmp/requirements.txt
@@ -304,4 +297,7 @@
COPY --from=chip-build-cert-bins /root/connectedhomeip/src/python_testing/requirements.txt /tmp/requirements.txt
RUN pip install -r /tmp/requirements.txt && rm /tmp/requirements.txt
+# PIP requires MASON package compilation, which seems to require a JDK
+RUN set -x && DEBIAN_FRONTEND=noninteractive apt-get install -fy openjdk-8-jdk
+
RUN pip install --no-cache-dir python_lib/controller/python/chip*.whl
