mirror of
https://github.com/containers/skopeo.git
synced 2025-08-02 07:17:46 +00:00
Cirrus: Use updated VM images
Mainly this is to confirm some changes needed for the podman-py CI setup don't disrupt operations here. Ref: https://github.com/containers/automation_images/pull/111 Note: Glibc resolver configuration has changed from previous images. An additional setup command was added to remove systemd-resolved from the chain. Signed-off-by: Chris Evich <cevich@redhat.com>
This commit is contained in:
parent
a2dccca2e6
commit
0f363498c2
@ -28,7 +28,7 @@ env:
|
||||
UBUNTU_NAME: "ubuntu-2110"
|
||||
|
||||
# Google-cloud VM Images
|
||||
IMAGE_SUFFIX: "c6226133906620416"
|
||||
IMAGE_SUFFIX: "c4764556961513472"
|
||||
FEDORA_CACHE_IMAGE_NAME: "fedora-${IMAGE_SUFFIX}"
|
||||
PRIOR_FEDORA_CACHE_IMAGE_NAME: "prior-fedora-${IMAGE_SUFFIX}"
|
||||
UBUNTU_CACHE_IMAGE_NAME: "ubuntu-${IMAGE_SUFFIX}"
|
||||
|
@ -64,6 +64,10 @@ _run_setup() {
|
||||
# Required for testing the SIF transport
|
||||
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
|
||||
# within the CI/Dev container image, but we want to run
|
||||
# things directly on the host VM. Fortunately they're all
|
||||
|
Loading…
Reference in New Issue
Block a user