luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-01-25 21:46:14 +01:00
Code Issues Packages Projects Releases Wiki Activity

ci: Upgrade CI images to the new oldest-supported OS versions

Browse Source 
That means Debian Bookworm and Fedora 37.

Also rework the mingw Dockerfile to be based on the Fedora one, so that
the underlying layers can be shared. This should reduce the disk
consumption of the registry a little.

`.gitlab-ci.yml` has not been updated to use the new images in this
commit, as the images will be modified further in the following commit.

Signed-off-by: Philip Withnall <pwithnall@endlessos.org>
This commit is contained in:
Philip Withnall 2023-10-11 13:51:50 +01:00
parent 9b51346237
commit 13c3595363
3 changed files with 8 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
.gitlab-ci/debian-stable.Dockerfile
View File

@ -1,4 +1,4 @@
FROM debian:bullseye FROM debian:bookworm
RUN apt-get update -qq && apt-get install --no-install-recommends -qq -y \ RUN apt-get update -qq && apt-get install --no-install-recommends -qq -y \
bindfs \ bindfs \
@ -37,6 +37,7 @@ RUN apt-get update -qq && apt-get install --no-install-recommends -qq -y \
python3-pip \ python3-pip \
python3-setuptools \ python3-setuptools \
python3-wheel \ python3-wheel \
reuse \
shared-mime-info \ shared-mime-info \
shellcheck \ shellcheck \
systemtap-sdt-dev \ systemtap-sdt-dev \
@ -66,10 +67,7 @@ RUN locale-gen de_DE.UTF-8 \
ENV LANG=C.UTF-8 LANGUAGE=C.UTF-8 LC_ALL=C.UTF-8 ENV LANG=C.UTF-8 LANGUAGE=C.UTF-8 LC_ALL=C.UTF-8
RUN pip3 install meson==0.60.3 RUN pip3 install --break-system-packages meson==0.60.3
# FIXME: Once we use Debian Bookworm, we can just install the `reuse` package
RUN pip3 install reuse==1.0.0
ARG HOST_USER_ID=5555 ARG HOST_USER_ID=5555
ENV HOST_USER_ID ${HOST_USER_ID} ENV HOST_USER_ID ${HOST_USER_ID}

2
.gitlab-ci/fedora.Dockerfile
View File

@ -1,4 +1,4 @@
FROM fedora:34 FROM fedora:37
RUN dnf -y update \ RUN dnf -y update \
&& dnf -y install \ && dnf -y install \

61
.gitlab-ci/mingw.Dockerfile
View File

@ -1,72 +1,17 @@
FROM fedora:34 FROM registry.gitlab.gnome.org/gnome/glib/fedora:v21
USER root
RUN dnf -y install \ RUN dnf -y install \
bindfs \
clang \
clang-analyzer \
desktop-file-utils \
elfutils-libelf-devel \
findutils \
fuse \
gcc \
gcc-c++ \
gettext \
git \
glibc-devel \
glibc-headers \
glibc-langpack-de \
glibc-langpack-el \
glibc-langpack-el \
glibc-langpack-en \
glibc-langpack-es \
glibc-langpack-es \
glibc-langpack-fa \
glibc-langpack-fr \
glibc-langpack-hr \
glibc-langpack-ja \
glibc-langpack-lt \
glibc-langpack-pl \
glibc-langpack-ru \
glibc-langpack-tr \
gtk-doc \
itstool \
lcov \
libattr-devel \
libffi-devel \
libmount-devel \
libselinux-devel \
libxslt \
mingw64-gcc \ mingw64-gcc \
mingw64-gcc-c++ \ mingw64-gcc-c++ \
mingw64-gettext \ mingw64-gettext \
mingw64-libffi \ mingw64-libffi \
mingw64-zlib \ mingw64-zlib \
ncurses-compat-libs \
ninja-build \
pcre2-devel \
python3 \
python3-pip \
python3-wheel \
systemtap-sdt-devel \
unzip \
wget \
xz \
zlib-devel \
&& dnf clean all && dnf clean all
WORKDIR /opt WORKDIR /opt
COPY cross_file_mingw64.txt /opt COPY cross_file_mingw64.txt /opt
RUN pip3 install meson==0.60.3
ARG HOST_USER_ID=5555
ENV HOST_USER_ID ${HOST_USER_ID}
RUN useradd -u $HOST_USER_ID -ms /bin/bash user
USER user USER user
WORKDIR /home/user WORKDIR /home/user
COPY cache-subprojects.sh .
RUN ./cache-subprojects.sh
ENV LANG C.UTF-8