Skip to content

Commit

Permalink
dockerfile: upgrade ubuntu to noble
Browse files Browse the repository at this point in the history
We need a newer meson for the cross build.

Signed-off-by: Daniel Wagner <wagi@kernel.org>
  • Loading branch information
igaw committed Feb 17, 2025
1 parent f69ec01 commit 38e2755
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 9 deletions.
6 changes: 3 additions & 3 deletions Dockerfile.ubuntu.armhf
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
FROM ubuntu:jammy
FROM ubuntu:noble

ARG TARGETPLATFORM
ARG DEBIAN_FRONTEND=noninteractive
ENV LANG=en_US.utf8
RUN dpkg --add-architecture armhf && \
sed -i -e 's/deb http/deb [arch=amd64] http/g' /etc/apt/sources.list && \
echo "deb [arch=armhf] http://ports.ubuntu.com/ jammy main universe restricted" > /etc/apt/sources.list.d/armhf.list && \
echo "deb [arch=armhf] http://ports.ubuntu.com/ jammy-updates main universe restricted" >> /etc/apt/sources.list.d/armhf.list && \
echo "deb [arch=armhf] http://ports.ubuntu.com/ noble main universe restricted" > /etc/apt/sources.list.d/armhf.list && \
echo "deb [arch=armhf] http://ports.ubuntu.com/ noble-updates main universe restricted" >> /etc/apt/sources.list.d/armhf.list && \
apt-get update && \
apt-get install -y locales && \
localedef -i en_US -c -f UTF-8 -A /usr/share/locale/locale.alias en_US.UTF-8 && \
Expand Down
6 changes: 3 additions & 3 deletions Dockerfile.ubuntu.ppc64le
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
FROM ubuntu:jammy
FROM ubuntu:noble

ARG TARGETPLATFORM
ARG DEBIAN_FRONTEND=noninteractive
ENV LANG=en_US.utf8
RUN dpkg --add-architecture ppc64el && \
sed -i -e 's/deb http/deb [arch=amd64] http/g' /etc/apt/sources.list && \
echo "deb [arch=ppc64el] http://ports.ubuntu.com/ jammy main universe restricted" > /etc/apt/sources.list.d/ppc64le.list && \
echo "deb [arch=ppc64el] http://ports.ubuntu.com/ jammy-updates main universe restricted" >> /etc/apt/sources.list.d/ppc64le.list && \
echo "deb [arch=ppc64el] http://ports.ubuntu.com/ noble main universe restricted" > /etc/apt/sources.list.d/ppc64le.list && \
echo "deb [arch=ppc64el] http://ports.ubuntu.com/ noble-updates main universe restricted" >> /etc/apt/sources.list.d/ppc64le.list && \
apt-get update && \
apt-get install -y locales && \
localedef -i en_US -c -f UTF-8 -A /usr/share/locale/locale.alias en_US.UTF-8 && \
Expand Down
6 changes: 3 additions & 3 deletions Dockerfile.ubuntu.s390x
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
FROM ubuntu:jammy
FROM ubuntu:noble

ARG TARGETPLATFORM
ARG DEBIAN_FRONTEND=noninteractive
ENV LANG=en_US.utf8
RUN dpkg --add-architecture s390x && \
sed -i -e 's/deb http/deb [arch=amd64] http/g' /etc/apt/sources.list && \
echo "deb [arch=s390x] http://ports.ubuntu.com/ jammy main universe restricted" > /etc/apt/sources.list.d/armhf.list && \
echo "deb [arch=s390x] http://ports.ubuntu.com/ jammy-updates main universe restricted" >> /etc/apt/sources.list.d/armhf.list && \
echo "deb [arch=s390x] http://ports.ubuntu.com/ noble main universe restricted" > /etc/apt/sources.list.d/armhf.list && \
echo "deb [arch=s390x] http://ports.ubuntu.com/ noble-updates main universe restricted" >> /etc/apt/sources.list.d/armhf.list && \
apt-get update && \
apt-get install -y locales && \
localedef -i en_US -c -f UTF-8 -A /usr/share/locale/locale.alias en_US.UTF-8 && \
Expand Down

0 comments on commit 38e2755

Please sign in to comment.