opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-07-03 09:17:15 +08:00
Code Issues Packages Projects Releases Wiki Activity

Cirrus: Freshen VM images

Browse Source 
Specifically, this brings in `crun 1.4-1` allowing removal of a
temporary workaround.  Ref:

https://github.com/containers/podman/pull/12759

Signed-off-by: Chris Evich <cevich@redhat.com>
This commit is contained in:
Chris Evich
2022-01-10 14:25:42 -05:00
parent 0e4e5cf990
commit 799078216b
2 changed files with 1 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.cirrus.yml
View File

@ -29,7 +29,7 @@ env:
UBUNTU_NAME: "ubuntu-2110" UBUNTU_NAME: "ubuntu-2110"
# Google-cloud VM Images # Google-cloud VM Images
IMAGE_SUFFIX: "c6015869890330624" IMAGE_SUFFIX: "c6454758209748992"
FEDORA_CACHE_IMAGE_NAME: "fedora-${IMAGE_SUFFIX}" FEDORA_CACHE_IMAGE_NAME: "fedora-${IMAGE_SUFFIX}"
PRIOR_FEDORA_CACHE_IMAGE_NAME: "prior-fedora-${IMAGE_SUFFIX}" PRIOR_FEDORA_CACHE_IMAGE_NAME: "prior-fedora-${IMAGE_SUFFIX}"
UBUNTU_CACHE_IMAGE_NAME: "ubuntu-${IMAGE_SUFFIX}" UBUNTU_CACHE_IMAGE_NAME: "ubuntu-${IMAGE_SUFFIX}"

6
contrib/cirrus/setup_environment.sh
View File

@ -118,12 +118,6 @@ fi
case "$OS_RELEASE_ID" in case "$OS_RELEASE_ID" in
ubuntu) ;; ubuntu) ;;
fedora) fedora)
# Force a crun version that has this fix: https://github.com/containers/crun/pull/819
# FIXME: Remove once a fixed crun made its way into Fedora
if test "$OS_RELEASE_VER" == "35"; then
yum upgrade -y crun
fi
if ((CONTAINER==0)); then if ((CONTAINER==0)); then
# All SELinux distros need this for systemd-in-a-container # All SELinux distros need this for systemd-in-a-container
msg "Enabling container_manage_cgroup" msg "Enabling container_manage_cgroup"