Skip to content

Commit b88ac27

Browse files
Fix Dockerfile for chip-cert-bins (project-chip#34379)
1 parent e62582e commit b88ac27

File tree

1 file changed

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

1 file changed

+6
-6
lines changed

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

+6-6
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Stage 1: Setup dependencies (based on chip-build).
2-
FROM ubuntu:24.04 as chip-build-cert
3-
LABEL org.opencontainers.image.source https://github.com/project-chip/connectedhomeip
2+
FROM ubuntu:24.04 AS chip-build-cert
3+
LABEL org.opencontainers.image.source=https://github.com/project-chip/connectedhomeip
44
ARG TARGETPLATFORM
55
# COMMITHASH defines the target commit to build from. May be passed in using --build-arg.
66
ARG COMMITHASH=c1ec2d777456924dcaa59b53351b00d73caf378f
@@ -123,11 +123,11 @@ RUN set -x \
123123
software-properties-common \
124124
&& add-apt-repository universe \
125125
&& curl https://bootstrap.pypa.io/get-pip.py -o get-pip.py \
126-
&& python3 get-pip.py \
126+
&& python3 get-pip.py --break-system-packages \
127127
&& : # last line
128128

129129
RUN set -x \
130-
&& pip3 install attrs coloredlogs PyGithub pygit future portpicker mobly click cxxfilt ghapi pandas tabulate \
130+
&& pip3 install attrs coloredlogs PyGithub pygit future portpicker mobly click cxxfilt ghapi pandas tabulate --break-system-packages \
131131
&& : # last line
132132

133133
# build and install gn
@@ -162,7 +162,7 @@ RUN ./scripts/checkout_submodules.py --allow-changing-global-git-config --shallo
162162
RUN bash scripts/bootstrap.sh
163163

164164
# Stage 2: Build.
165-
FROM chip-build-cert as chip-build-cert-bins
165+
FROM chip-build-cert AS chip-build-cert-bins
166166

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

@@ -260,7 +260,7 @@ RUN case ${TARGETPLATFORM} in \
260260
RUN source scripts/activate.sh && scripts/build_python.sh -m platform -d true -i out/python_env
261261

262262
# Stage 3: Copy relevant cert bins to a minimal image to reduce size.
263-
FROM ubuntu:22.04
263+
FROM ubuntu:24.04
264264
ENV TZ=Etc/UTC
265265
RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
266266
RUN apt-get update -y

0 commit comments

Comments
 (0)