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

Merge pull request #2459 from Luap99/ci-update

Browse Source 
update CI images to f41
This commit is contained in:
Miloslav Trmač 2024-11-12 19:30:31 +01:00 committed by GitHub
commit 78d7940b94
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.cirrus.yml
View File

@ -21,7 +21,7 @@ env:
SCRIPT_BASE: "./contrib/cirrus" SCRIPT_BASE: "./contrib/cirrus"
# Google-cloud VM Images # Google-cloud VM Images
IMAGE_SUFFIX: "c20241010t105554z-f40f39d13" IMAGE_SUFFIX: "c20241107t210000z-f41f40d13"
FEDORA_CACHE_IMAGE_NAME: "fedora-${IMAGE_SUFFIX}" FEDORA_CACHE_IMAGE_NAME: "fedora-${IMAGE_SUFFIX}"
# Container FQIN's # Container FQIN's
@ -67,7 +67,7 @@ doccheck_task:
# TODO: Can't use 'runner.sh setup' inside container. However, # TODO: Can't use 'runner.sh setup' inside container. However,
# removing the pre-installed package is the only necessary step # removing the pre-installed package is the only necessary step
# at the time of this comment. # at the time of this comment.
dnf erase -y skopeo # Guarantee non-interference dnf remove -y skopeo # Guarantee non-interference
"${SKOPEO_PATH}/${SCRIPT_BASE}/runner.sh" build "${SKOPEO_PATH}/${SCRIPT_BASE}/runner.sh" build
"${SKOPEO_PATH}/${SCRIPT_BASE}/runner.sh" doccheck "${SKOPEO_PATH}/${SCRIPT_BASE}/runner.sh" doccheck

2
contrib/cirrus/runner.sh
View File

@ -53,7 +53,7 @@ _run_setup() {
fi fi
# VM's come with the distro. skopeo package pre-installed # VM's come with the distro. skopeo package pre-installed
dnf erase -y skopeo dnf remove -y skopeo
msg "Removing systemd-resolved from nsswitch.conf" msg "Removing systemd-resolved from nsswitch.conf"
# /etc/resolv.conf is already set to bypass systemd-resolvd # /etc/resolv.conf is already set to bypass systemd-resolvd