diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2021-10-04 04:05:10 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-10-04 04:05:10 -0400 |
| commit | 36821d302e3787a42d6eefdbd0bdbb6d9da261fb (patch) | |
| tree | e113757c6fe78849c54e6caf2826193b5d640e20 | |
| parent | b9d8c638132654b1c40c18bc66620a5523267086 (diff) | |
| parent | d6b9451b49a2c508db93e1e19e80e51052f217e4 (diff) | |
| download | podman-36821d302e3787a42d6eefdbd0bdbb6d9da261fb.tar.gz podman-36821d302e3787a42d6eefdbd0bdbb6d9da261fb.tar.bz2 podman-36821d302e3787a42d6eefdbd0bdbb6d9da261fb.zip | |
Merge pull request #11834 from cevich/fix_gitlab_setup
Cirrus: Fix defunct package metadata breaking cache
| -rwxr-xr-x | contrib/cirrus/setup_environment.sh | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/contrib/cirrus/setup_environment.sh b/contrib/cirrus/setup_environment.sh index 1f594000f..f2afbfef5 100755 --- a/contrib/cirrus/setup_environment.sh +++ b/contrib/cirrus/setup_environment.sh @@ -254,11 +254,11 @@ case "$TEST_FLAVOR" in remove_packaged_podman_files make install PREFIX=/usr ETCDIR=/etc - # Need to re-build lists (removed during image production) - ooe.sh apt-get -qq -y update msg "Installing docker and containerd" # N/B: Tests check/expect `docker info` output, and this `!= podman info` - ooe.sh apt-get install --yes containerd.io docker-ce docker-ce-cli + ooe.sh dpkg -i \ + $PACKAGE_DOWNLOAD_DIR/containerd.io*.deb \ + $PACKAGE_DOWNLOAD_DIR/docker-ce*.deb msg "Disabling docker service and socket activation" systemctl stop docker.service docker.socket |