diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2018-11-01 10:23:17 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-11-01 10:23:17 -0700 |
| commit | 7772350f525bb02316067733587833266382e47a (patch) | |
| tree | 4e1bae60e3d3de31e79ad5fccc505a3c2e73b4eb /contrib/cirrus/packer/ubuntu_setup.sh | |
| parent | 641dbda92657ef66c594c9265f10acde748635ae (diff) | |
| parent | 91f398db4c92056bc77c1c82fe9a61e2c8739e8d (diff) | |
| download | podman-7772350f525bb02316067733587833266382e47a.tar.gz podman-7772350f525bb02316067733587833266382e47a.tar.bz2 podman-7772350f525bb02316067733587833266382e47a.zip | |
Merge pull request #1603 from cevich/fix_cirrus_image_build
Fix Cirrus/Packer VM image building
Diffstat (limited to 'contrib/cirrus/packer/ubuntu_setup.sh')
| -rw-r--r-- | contrib/cirrus/packer/ubuntu_setup.sh | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/contrib/cirrus/packer/ubuntu_setup.sh b/contrib/cirrus/packer/ubuntu_setup.sh index ff20944dc..4cf1f335b 100644 --- a/contrib/cirrus/packer/ubuntu_setup.sh +++ b/contrib/cirrus/packer/ubuntu_setup.sh @@ -21,9 +21,10 @@ install_ooe export GOPATH="$(mktemp -d)" trap "sudo rm -rf $GOPATH" EXIT -ooe.sh sudo apt-get -qq update -ooe.sh sudo apt-get -qq update # sometimes it needs to get it twice :S -ooe.sh sudo apt-get -qq upgrade +# Try twice as workaround for minor networking problems +echo "Updating system and installing package dependencies" +ooe.sh sudo apt-get -qq update || sudo apt-get -qq update +ooe.sh sudo apt-get -qq upgrade || sudo apt-get -qq upgrade ooe.sh sudo apt-get -qq install --no-install-recommends \ apparmor \ autoconf \ |