From 2e65e64c0612ed7de9b83334ba3a54d8cf89c44b Mon Sep 17 00:00:00 2001 From: Valentin Rothberg Date: Tue, 3 Mar 2020 11:07:30 +0100 Subject: [PATCH] CI: force Podman to use runc crun had a regression running on cgroupsv1 in containers. It has been fixed upstream but did not yet bubble up into the packages. Force using runc to unblock Skopeo's CI. Signed-off-by: Valentin Rothberg --- Dockerfile | 2 +- systemtest/helpers.bash | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index a34dda6c..3d5d054b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -9,7 +9,7 @@ RUN dnf -y update && dnf install -y make git golang golang-github-cpuguy83-md2ma gnupg \ # OpenShift deps which tar wget hostname util-linux bsdtar socat ethtool device-mapper iptables tree findutils nmap-ncat e2fsprogs xfsprogs lsof docker iproute \ - bats jq podman \ + bats jq podman runc \ golint \ && dnf clean all diff --git a/systemtest/helpers.bash b/systemtest/helpers.bash index 5e69d0d0..b70163a4 100644 --- a/systemtest/helpers.bash +++ b/systemtest/helpers.bash @@ -290,7 +290,7 @@ start_registry() { # cgroup option necessary under podman-in-podman (CI tests), # and doesn't seem to do any harm otherwise. - PODMAN="podman --cgroup-manager=cgroupfs" + PODMAN="podman --runtime runc --cgroup-manager=cgroupfs" # Called with --testuser? Create an htpasswd file if [[ -n $testuser ]]; then