containers
/
podman
mirror of https://github.com/containers/podman.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #11834 from cevich/fix_gitlab_setup 

Cirrus: Fix defunct package metadata breaking cache
This commit is contained in:
OpenShift Merge Robot 2021-10-04 04:05:10 -04:00 committed by GitHub
parent b9d8c63813 d6b9451b49
commit 36821d302e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
contrib/cirrus/setup_environment.sh
View File

@ -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