From c0b5c0c7c286a2d88cde9bb42628d237f559176a Mon Sep 17 00:00:00 2001 From: Bart Geesink Date: Tue, 13 Dec 2022 10:24:51 +0100 Subject: [PATCH] GHA: Build on Ubuntu 20.04, which supports cgroups v2 --- .github/workflows/docker-build-image.yml | 2 +- tests/Dockerfile.centos-7-ga | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/.github/workflows/docker-build-image.yml b/.github/workflows/docker-build-image.yml index a9a60c76f..c91a144b5 100644 --- a/.github/workflows/docker-build-image.yml +++ b/.github/workflows/docker-build-image.yml @@ -11,7 +11,7 @@ on: jobs: build: - runs-on: ubuntu-latest + runs-on: ubuntu-20.04 steps: - uses: actions/checkout@v2 diff --git a/tests/Dockerfile.centos-7-ga b/tests/Dockerfile.centos-7-ga index 0942486a3..250787fba 100644 --- a/tests/Dockerfile.centos-7-ga +++ b/tests/Dockerfile.centos-7-ga @@ -16,9 +16,7 @@ rm -f /lib/systemd/system/anaconda.target.wants/*; RUN yum clean all && \ yum -y update && \ - yum -y install python3 wget && \ - wget https://copr.fedorainfracloud.org/coprs/jsynacek/systemd-backports-for-centos-7/repo/epel-7/jsynacek-systemd-backports-for-centos-7-epel-7.repo -O /etc/yum.repos.d/jsynacek-systemd-centos-7.repo && \ - yum -y update systemd + yum -y install python3 VOLUME [ "/sys/fs/cgroup" ]