Skip to content

Commit f99a2c3

Browse files
authored
Install chip-testing package in the final docker image (project-chip#36285)
* Install cmakeeee from APT * Install PIP from APT * Properly install chip-testing package * Install GI repository dev package
1 parent eb5da6e commit f99a2c3

File tree

1 file changed

+12
-39
lines changed
  • integrations/docker/images/chip-cert-bins

1 file changed

+12
-39
lines changed

integrations/docker/images/chip-cert-bins/Dockerfile

+12-39
Original file line numberDiff line numberDiff line change
@@ -40,11 +40,13 @@ RUN set -x \
4040
clang \
4141
clang-format \
4242
clang-tidy \
43+
cmake \
4344
curl \
4445
flex \
45-
gcc \
4646
g++ \
47+
gcc \
4748
git \
49+
git-lfs \
4850
gperf \
4951
iproute2 \
5052
jq \
@@ -54,11 +56,12 @@ RUN set -x \
5456
libcairo2-dev \
5557
libdbus-1-dev \
5658
libdbus-glib-1-dev \
59+
libdmalloc-dev \
5760
libgif-dev \
61+
libgirepository1.0-dev \
5862
libglib2.0-dev \
5963
libical-dev \
6064
libjpeg-dev \
61-
libdmalloc-dev \
6265
libmbedtls-dev \
6366
libncurses5-dev \
6467
libncursesw5-dev \
@@ -79,55 +82,23 @@ RUN set -x \
7982
pkg-config \
8083
python3 \
8184
python3-dev \
85+
python3-pip \
8286
python3-venv \
8387
rsync \
8488
shellcheck \
89+
software-properties-common \
8590
strace \
8691
systemd \
8792
udev \
8893
unzip \
8994
wget \
90-
git-lfs \
9195
zlib1g-dev \
9296
&& git lfs install \
9397
&& : # last line
9498

95-
# Cmake (Mbed OS requires >=3.19.0-rc3 version which is not available in Ubuntu 20.04 repository)
96-
RUN case ${TARGETPLATFORM} in \
97-
"linux/amd64") \
98-
set -x \
99-
&& (cd /tmp \
100-
&& wget --progress=dot:giga https://github.com/Kitware/CMake/releases/download/v3.19.3/cmake-3.19.3-Linux-x86_64.sh \
101-
&& sh cmake-3.19.3-Linux-x86_64.sh --exclude-subdir --prefix=/usr/local \
102-
&& rm -rf cmake-3.19.3-Linux-x86_64.sh) \
103-
&& exec bash \
104-
;; \
105-
"linux/arm64") \
106-
set -x \
107-
&& (cd /tmp \
108-
&& wget --progress=dot:giga https://github.com/Kitware/CMake/releases/download/v3.19.3/cmake-3.19.3-Linux-aarch64.sh \
109-
&& sh cmake-3.19.3-Linux-aarch64.sh --exclude-subdir --prefix=/usr/local \
110-
&& rm -rf cmake-3.19.3-Linux-aarch64.sh) \
111-
&& exec bash \
112-
;; \
113-
*) \
114-
test -n "$TARGETPLATFORM" \
115-
echo "Unsupported platform ${TARGETPLATFORM}" \
116-
;; \
117-
esac
118-
119-
# Python 3 and PIP
120-
RUN set -x \
121-
&& DEBIAN_FRONTEND=noninteractive apt-get install -y \
122-
libgirepository1.0-dev \
123-
software-properties-common \
124-
&& add-apt-repository universe \
125-
&& curl https://bootstrap.pypa.io/get-pip.py -o get-pip.py \
126-
&& python3 get-pip.py --break-system-packages \
127-
&& : # last line
128-
12999
RUN set -x \
130-
&& pip3 install attrs coloredlogs PyGithub pygit future portpicker mobly click cxxfilt ghapi pandas tabulate --break-system-packages \
100+
&& pip3 install --break-system-packages \
101+
attrs coloredlogs PyGithub pygit future portpicker mobly click cxxfilt ghapi pandas tabulate \
131102
&& : # last line
132103

133104
# build and install gn
@@ -327,4 +298,6 @@ RUN pip install --break-system-packages -r /tmp/requirements.txt && rm /tmp/requ
327298
# PIP requires MASON package compilation, which seems to require a JDK
328299
RUN set -x && DEBIAN_FRONTEND=noninteractive apt-get update; apt-get install -fy openjdk-8-jdk
329300

330-
RUN pip install --break-system-packages --no-cache-dir python_lib/controller/python/chip*.whl
301+
RUN pip install --break-system-packages --no-cache-dir \
302+
python_lib/python/obj/src/python_testing/matter_testing_infrastructure/chip-testing._build_wheel/chip_testing-*.whl \
303+
python_lib/controller/python/chip*.whl

0 commit comments

Comments
 (0)