diff options
| author | Panu Matilainen <pmatilai@redhat.com> | 2022-09-15 10:58:57 +0300 |
|---|---|---|
| committer | Panu Matilainen <pmatilai@redhat.com> | 2022-09-20 15:07:44 +0300 |
| commit | 12bcbee3c566d3e091183e378f27cc6fcae761dd (patch) | |
| tree | 75c56eb22ef43ad048e6c00bda2aa7913cfc3e0f | |
| parent | 20a6454b113a94ab017363d3b02782fb0cf8d869 (diff) | |
| download | rpm-12bcbee3c566d3e091183e378f27cc6fcae761dd.tar.gz | |
Bump CI to Fedora 36
It appears that some container deity somewhere has fixed the Docker
issue [1] that prevented us from upgrading beyond F34, but there was
another gotcha introduced in the meanwhile on Fedora side:
glibc-gconv-extras is now needed for our UTF-8 encoding check to work.
While at it, optimize the dnf side a bit: get rid of modularity repos
entirely so they don't come back via updates, and disable the H.264
repo too, we don't need *that* for building or testing rpm...
[1] https://github.com/moby/moby/pull/42681
(cherry picked from commit 6761c39063c88a79124e22e7484f9c70cefa3811)
| -rw-r--r-- | ci/Dockerfile | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/ci/Dockerfile b/ci/Dockerfile index 0d7ced383..096324e32 100644 --- a/ci/Dockerfile +++ b/ci/Dockerfile @@ -1,10 +1,11 @@ -FROM registry.fedoraproject.org/fedora:34 +FROM registry.fedoraproject.org/fedora:36 MAINTAINER rpm-maint@lists.rpm.org WORKDIR /srv/rpm RUN echo -e "deltarpm=0\ninstall_weak_deps=0\ntsflags=nodocs" >> /etc/dnf/dnf.conf -RUN rm -f /etc/yum.repos.d/*modular.repo +RUN rpm -e fedora-repos-modular +RUN sed -i -e "s:^enabled=.$:enabled=0:g" /etc/yum.repos.d/*openh264.repo # dummy for controlling per-repo gpgcheck via Semaphore setup RUN sed -i -e "s:^gpgcheck=.$:gpgcheck=1:g" /etc/yum.repos.d/*.repo RUN dnf -y update @@ -18,6 +19,7 @@ RUN dnf -y install \ make \ gcc \ git-core \ + glibc-gconv-extra \ zlib-devel \ bzip2-devel \ xz-devel \ |