Skip to content

Commit 03a9627

Browse files
committed
ci: Update build container images to Ubuntu 24.04
Signed-off-by: Andrei Gherzan <[email protected]>
1 parent cd558f7 commit 03a9627

File tree

1 file changed

+9
-11
lines changed
  • .github/workflows/docker-images/yocto-builder

1 file changed

+9
-11
lines changed

Diff for: .github/workflows/docker-images/yocto-builder/Dockerfile

+9-11
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
#
33
# SPDX-License-Identifier: MIT
44

5-
FROM ubuntu:20.04
5+
FROM ubuntu:24.04
66

77
ARG DEBIAN_FRONTEND="noninteractive"
88
RUN apt-get update -qq
@@ -12,28 +12,26 @@ RUN apt-get install -y eatmydata
1212
# Keep this in sync with
1313
# https://git.yoctoproject.org/poky/tree/documentation/poky.yaml
1414
RUN eatmydata apt-get install -qq -y \
15-
gawk wget git diffstat unzip texinfo gcc build-essential chrpath \
16-
socat cpio python3 python3-pip python3-pexpect xz-utils debianutils \
17-
iputils-ping python3-git python3-jinja2 libegl1-mesa libsdl1.2-dev \
18-
pylint3 xterm python3-subunit mesa-common-dev zstd liblz4-tool
15+
build-essential chrpath cpio debianutils diffstat file gawk gcc git \
16+
iputils-ping libacl1 liblz4-tool locales python3 python3-git \
17+
python3-jinja2 python3-pexpect python3-pip python3-subunit socat \
18+
texinfo unzip wget xz-utils zstd
1919

2020
# en_US.UTF-8 is required by the build system
2121
RUN eatmydata apt-get install -qq -y locales \
2222
&& echo "en_US.UTF-8 UTF-8" > /etc/locale.gen \
2323
&& locale-gen
24-
ENV LANG en_US.utf8
24+
ENV LANG=en_US.utf8
2525

2626
RUN eatmydata apt-get clean && rm -rf /var/lib/apt/lists/*
2727

28-
# Have bash as shell
29-
RUN echo "dash dash/sh boolean false" | debconf-set-selections \
30-
&& dpkg-reconfigure dash
31-
3228
# Run under normal user called 'ci'
33-
RUN useradd --create-home --uid 1000 --shell /usr/bin/bash ci
29+
RUN useradd --create-home --uid 2000 --shell /bin/bash ci
3430
USER ci
3531
WORKDIR /home/ci
3632

3733
COPY ./yocto-builder/entrypoint-yocto-check-layer.sh /
3834
COPY ./yocto-builder/entrypoint-build.sh /
3935
COPY ./utils.sh /
36+
37+
ENTRYPOINT ["/bin/bash"]

0 commit comments

Comments
 (0)