Cirrus: Add packages that provide htpasswd

Mainly needed for buildah testing: the htpasswd command was removed from
the upstream registry container image.  Making it available on the
host-side enables configuring details needed by the registry during
it's initial setup.

Signed-off-by: Chris Evich <cevich@redhat.com>

contrib/cirrus/packer/fedora_packaging.sh

@@ -74,6 +74,7 @@ INSTALL_PACKAGES=(\
     gpgme-devel
     grubby
     hostname
+    httpd-tools
     iproute
     iptables
     jq

contrib/cirrus/packer/libpod_images.yml

@@ -65,7 +65,9 @@ builders:
 provisioners:
     - type: 'shell'
       inline:
-        - mkdir -p '${{user `GOSRC`}}'
+        - 'set -ex'
+        # The 'file' provisioner item (below) will create the final component
+        - 'mkdir -vp $(dirname {{user `GOSRC`}})'
 
     - type: 'file'
       source: '{{user `GOSRC`}}'

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,6 +154,7 @@ 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