Skip to content

Commit e6d31f2

Browse files
committed
use ubuntu 24.04 base builder
1 parent 7d4da6d commit e6d31f2

File tree

1 file changed

+1
-30
lines changed

1 file changed

+1
-30
lines changed

projects/connectedhomeip/Dockerfile

Lines changed: 1 addition & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,7 @@
1414
#
1515
################################################################################
1616

17-
18-
FROM gcr.io/oss-fuzz-base/base-builder
17+
FROM gcr.io/oss-fuzz-base/base-builder:ubuntu-24-04
1918

2019
# Install prerequisite packages
2120
# See connectedhomeip/docs/guides/BUILDING.md#prerequisites
@@ -24,34 +23,6 @@ RUN apt-get update && \
2423
libavahi-client-dev ninja-build \
2524
unzip libgirepository1.0-dev libcairo2-dev libreadline-dev
2625

27-
# Build Python 3.10 from source (no more available in deadsnakes for Ubuntu 20.04)
28-
# ONCE OSS-Fuzz release Base image with Ubuntu 24.04, we can switch to that and stop building python from source
29-
RUN apt-get update && \
30-
apt-get install -y --no-install-recommends \
31-
build-essential zlib1g-dev libncurses5-dev libgdbm-dev libgdbm-compat-dev \
32-
libnss3-dev libffi-dev libsqlite3-dev wget curl ca-certificates \
33-
libbz2-dev liblzma-dev xz-utils uuid-dev && \
34-
rm -rf /var/lib/apt/lists/* && \
35-
cd /tmp && set -eux; \
36-
curl -fL https://www.python.org/ftp/python/3.10.14/Python-3.10.14.tgz -o Python-3.10.14.tgz && \
37-
tar -xf Python-3.10.14.tgz && \
38-
cd Python-3.10.14 && \
39-
./configure --prefix=/usr/local \
40-
--with-lto --enable-shared && \
41-
make -j"$(nproc)" && \
42-
make altinstall && \
43-
ln --force -s /usr/local/bin/python3.10 /usr/bin/python3 && \
44-
ln --force -s /usr/local/bin/pip3.10 /usr/bin/pip3 && \
45-
echo "/usr/local/lib" > /etc/ld.so.conf.d/python3.10.conf && ldconfig && \
46-
cd / && rm -rf /tmp/Python-3.10.14*
47-
48-
49-
# Reinstall GLib development headers (workaround needed for gio/gio.h)
50-
RUN apt-get update && \
51-
apt-get install -y --no-install-recommends libglib2.0-dev
52-
53-
RUN python3 -m ensurepip --upgrade
54-
5526
# PEP-517 needed for cryptography. Update pip
5627
RUN python3 -m pip install --upgrade pip setuptools wheel packaging
5728

0 commit comments

Comments
 (0)