summaryrefslogtreecommitdiff
path: root/contrib/cirrus/packer/ubuntu_packaging.sh
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2020-07-22 20:25:14 +0200
committerGitHub <noreply@github.com>2020-07-22 20:25:14 +0200
commit0da4fa280be192516f37e081cb5c428147817924 (patch)
tree74d32e4fbc146a75645ee61a23b045216f332c76 /contrib/cirrus/packer/ubuntu_packaging.sh
parent80add2902cf3561d2c9f91dc045076519cd297d5 (diff)
parent6acea29a8069b6c6c35822c461a75efea95c7c8b (diff)
downloadpodman-0da4fa280be192516f37e081cb5c428147817924.tar.gz
podman-0da4fa280be192516f37e081cb5c428147817924.tar.bz2
podman-0da4fa280be192516f37e081cb5c428147817924.zip
Merge pull request #6822 from cevich/add_htpasswd
Cirrus: Add packages that provide htpasswd
Diffstat (limited to 'contrib/cirrus/packer/ubuntu_packaging.sh')
-rw-r--r--contrib/cirrus/packer/ubuntu_packaging.sh6
1 files changed, 6 insertions, 0 deletions
diff --git a/contrib/cirrus/packer/ubuntu_packaging.sh b/contrib/cirrus/packer/ubuntu_packaging.sh
index 09f9aab9f..d11c612c5 100644
--- a/contrib/cirrus/packer/ubuntu_packaging.sh
+++ b/contrib/cirrus/packer/ubuntu_packaging.sh
@@ -36,6 +36,7 @@ ooe.sh curl -L -o /tmp/Release.key "https://download.opensuse.org/repositories/d
ooe.sh $SUDO apt-key add - < /tmp/Release.key
INSTALL_PACKAGES=(\
+ apache2-utils
apparmor
aufs-tools
autoconf
@@ -153,7 +154,12 @@ if [[ ${#DOWNLOAD_PACKAGES[@]} -gt 0 ]]; then
fi
echo "Installing runtime tooling"
+# Save some runtime by having these already available
cd $GOSRC
+# Required since initially go was not installed
+source $GOSRC/$SCRIPT_BASE/lib.sh
+echo "Go environment has been setup:"
+go env
$SUDO hack/install_catatonit.sh
$SUDO make install.libseccomp.sudo
$SUDO make install.tools