summaryrefslogtreecommitdiff
path: root/contrib/cirrus/packer
diff options
context:
space:
mode:
authorDaniel J Walsh <dwalsh@redhat.com>2019-02-22 14:27:43 -0500
committerGitHub <noreply@github.com>2019-02-22 14:27:43 -0500
commit8039ccf4d560acbc308066cf8996bc4e6167a4a9 (patch)
tree01e2e4c937a51c2eaf62bc712d358c3925df3876 /contrib/cirrus/packer
parent1788addd047310ee8b8c7a62d8949953b93cfca7 (diff)
parent69c91e044a41455b9d089767f4094c8f992faa7e (diff)
downloadpodman-8039ccf4d560acbc308066cf8996bc4e6167a4a9.tar.gz
podman-8039ccf4d560acbc308066cf8996bc4e6167a4a9.tar.bz2
podman-8039ccf4d560acbc308066cf8996bc4e6167a4a9.zip
Merge pull request #2411 from cevich/ubuntu_go111
Cirrus: Install Go 1.11 on Ubuntu VMs
Diffstat (limited to 'contrib/cirrus/packer')
-rw-r--r--contrib/cirrus/packer/ubuntu_setup.sh8
1 files changed, 7 insertions, 1 deletions
diff --git a/contrib/cirrus/packer/ubuntu_setup.sh b/contrib/cirrus/packer/ubuntu_setup.sh
index af5671c90..7d49c5dc7 100644
--- a/contrib/cirrus/packer/ubuntu_setup.sh
+++ b/contrib/cirrus/packer/ubuntu_setup.sh
@@ -28,7 +28,13 @@ export DEBIAN_FRONTEND=noninteractive
echo "Updating system and installing package dependencies"
ooe.sh sudo -E apt-get -qq update || sudo -E apt-get -qq update
ooe.sh sudo -E apt-get -qq upgrade || sudo -E apt-get -qq upgrade
-ooe.sh sudo -E apt-get -qq install --no-install-recommends \
+ooe.sh sudo -E apt-get -qq install software-properties-common
+
+# Required to have Go 1.11 on Ubuntu 18.0.4
+ooe.sh sudo -E add-apt-repository --yes ppa:longsleep/golang-backports
+ooe.sh sudo -E apt-get -qq update || sudo -E apt-get -qq update
+
+ooe.sh sudo -E apt-get -qq install \
apparmor \
autoconf \
automake \