github/skopeo
1
0
Fork 0
mirror of https://github.com/containers/skopeo.git synced 2025-06-02 03:35:38 +00:00
Code Issues Projects Releases Wiki Activity

CI: force Podman to use runc

Browse Source 
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 <rothberg@redhat.com>
This commit is contained in:
Valentin Rothberg 2020-03-03 11:07:30 +01:00
parent 4c4a4b611e
commit 2e65e64c06
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Dockerfile
View File

@ -9,7 +9,7 @@ RUN dnf -y update && dnf install -y make git golang golang-github-cpuguy83-md2ma
gnupg \ gnupg \
# OpenShift deps # OpenShift deps
which tar wget hostname util-linux bsdtar socat ethtool device-mapper iptables tree findutils nmap-ncat e2fsprogs xfsprogs lsof docker iproute \ 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 \ golint \
&& dnf clean all && dnf clean all

2
systemtest/helpers.bash
View File

@ -290,7 +290,7 @@ start_registry() {
# cgroup option necessary under podman-in-podman (CI tests), # cgroup option necessary under podman-in-podman (CI tests),
# and doesn't seem to do any harm otherwise. # 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 # Called with --testuser? Create an htpasswd file
if [[ -n $testuser ]]; then if [[ -n $testuser ]]; then