Skip to content

Commit 84a63b4

Browse files
committed
docker: update to use ubuntu 24.04
Signed-off-by: Anas Nashif <[email protected]>
1 parent 7ec90ab commit 84a63b4

File tree

2 files changed

+17
-9
lines changed

2 files changed

+17
-9
lines changed

Dockerfile.base

Lines changed: 16 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,13 @@
11
# Base Image (ci-base)
22

3-
FROM ubuntu:22.04
3+
FROM ubuntu:24.04
44

55
ARG UID=1000
66
ARG GID=1000
7+
ARG PYTHON_VENV_PATH=/opt/python/venv
8+
9+
# this conflicts with uid 1000, remove it
10+
RUN userdel -r ubuntu || true
711

812
# Set default shell during Docker image build to bash
913
SHELL ["/bin/bash", "-c"]
@@ -42,7 +46,6 @@ RUN apt-get -y update && \
4246
git-core \
4347
gnupg \
4448
gperf \
45-
gtk-sharp2 \
4649
help2man \
4750
iproute2 \
4851
lcov \
@@ -70,7 +73,7 @@ RUN apt-get -y update && \
7073
python3-ply \
7174
python3-setuptools \
7275
python-is-python3 \
73-
qemu \
76+
python3-venv \
7477
rsync \
7578
socat \
7679
srecord \
@@ -96,7 +99,7 @@ RUN if [ "${HOSTTYPE}" = "x86_64" ]; then \
9699
apt-get -y update && \
97100
apt-get -y upgrade && \
98101
apt-get install --no-install-recommends -y \
99-
libsdl2-dev:i386 libfuse-dev:i386 libc6-dbg:i386 \
102+
libsdl2-dev:i386 libfuse-dev:i386 libc6-dbg:i386 python3\
100103
; fi
101104

102105
# Initialise system locale
@@ -105,11 +108,16 @@ ENV LANG=en_US.UTF-8
105108
ENV LANGUAGE=en_US:en
106109
ENV LC_ALL=en_US.UTF-8
107110

111+
RUN mkdir -p ${PYTHON_VENV_PATH} && \
112+
python3 -m venv ${PYTHON_VENV_PATH}
113+
114+
ENV PATH=${PYTHON_VENV_PATH}/bin:$PATH
115+
116+
RUN cd ${PYTHON_VENV_PATH}/bin && \
117+
pip install --no-cache-dir --upgrade pip setuptools wheel
118+
108119
# Install Python dependencies
109-
RUN python3 -m pip install -U --no-cache-dir pip && \
110-
pip3 install -U --no-cache-dir wheel setuptools && \
111-
pip3 install --no-cache-dir pygobject && \
112-
pip3 install --no-cache-dir \
120+
RUN pip3 install --no-cache-dir \
113121
-r https://raw.githubusercontent.com/zephyrproject-rtos/zephyr/main/scripts/requirements.txt \
114122
-r https://raw.githubusercontent.com/zephyrproject-rtos/mcuboot/main/scripts/requirements.txt \
115123
GitPython imgtool junitparser junit2html numpy protobuf PyGithub \

Dockerfile.ci

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ ARG DOXYGEN_VERSION=1.9.4
1313
ENV DOXYGEN_VERSION=$DOXYGEN_VERSION
1414
ARG RENODE_VERSION=1.15.3
1515
ENV RENODE_VERSION=$RENODE_VERSION
16-
ARG LLVM_VERSION=16
16+
ARG LLVM_VERSION=20
1717
ENV LLVM_VERSION=$LLVM_VERSION
1818
ARG BSIM_VERSION=v2.5
1919
ENV BSIM_VERSION=$BSIM_VERSION

0 commit comments

Comments
 (0)