github/skopeo
1
0
Fork 0
mirror of https://github.com/containers/skopeo.git synced 2025-09-04 16:20:23 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #1558 from cevich/new_python_images

Browse Source 
Cirrus: Use updated VM images
This commit is contained in:
Daniel J Walsh
2022-02-10 14:23:18 -05:00
committed by GitHub
parent a2dccca2e6 0f363498c2
commit 59a452276b
2 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.cirrus.yml
View File

@@ -28,7 +28,7 @@ env:
UBUNTU_NAME: "ubuntu-2110" UBUNTU_NAME: "ubuntu-2110"
# Google-cloud VM Images # Google-cloud VM Images
IMAGE_SUFFIX: "c6226133906620416" IMAGE_SUFFIX: "c4764556961513472"
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}"

4
contrib/cirrus/runner.sh
View File

@@ -64,6 +64,10 @@ _run_setup() {
# Required for testing the SIF transport # Required for testing the SIF transport
dnf install -y fakeroot squashfs-tools dnf install -y fakeroot squashfs-tools
msg "Removing systemd-resolved from nsswitch.conf"
# /etc/resolv.conf is already set to bypass systemd-resolvd
sed -i -r -e 's/^(hosts.+)resolve.+dns/\1dns/' /etc/nsswitch.conf
# A slew of compiled binaries are pre-built and distributed # A slew of compiled binaries are pre-built and distributed
# within the CI/Dev container image, but we want to run # within the CI/Dev container image, but we want to run
# things directly on the host VM. Fortunately they're all # things directly on the host VM. Fortunately they're all