Merge pull request #6822 from cevich/add_htpasswd

Cirrus: Add packages that provide htpasswd

4 files changed, 24 insertions, 3 deletions

diff --git a/contrib/cirrus/packer/Makefile b/contrib/cirrus/packer/Makefile
index a911cafdb..c5a8e4cac 100644
--- a/contrib/cirrus/packer/Makefile
+++ b/contrib/cirrus/packer/Makefile
@@ -5,7 +5,8 @@ PACKER_DIST_FILENAME := packer_${PACKER_VER}_linux_${GOARCH}.zip
 
 # Only needed for libpod_base_images target
 TIMESTAMP := $(shell date +%s)
-GOSRC ?= $(shell realpath "./../../../")
+GOPATH ?= /var/tmp/go
+GOSRC ?= $(GOPATH)/src/github.com/containers/libpod
 PACKER_BASE ?= contrib/cirrus/packer
 SCRIPT_BASE ?= contrib/cirrus
 POST_MERGE_BUCKET_SUFFIX ?=
@@ -54,6 +55,7 @@ libpod_images: guard-PACKER_BUILDS libpod_images.json packer
 	./packer build \
 		-force \
 		$(shell test -z "${PACKER_BUILDS}" || echo "-only=${PACKER_BUILDS}") \
+		-var GOPATH=$(GOPATH) \
 		-var GOSRC=$(GOSRC) \
 		-var PACKER_BASE=$(PACKER_BASE) \
 		-var SCRIPT_BASE=$(SCRIPT_BASE) \
diff --git a/contrib/cirrus/packer/fedora_packaging.sh b/contrib/cirrus/packer/fedora_packaging.sh
index aecaaef93..b4a3a2062 100644
--- a/contrib/cirrus/packer/fedora_packaging.sh
+++ b/contrib/cirrus/packer/fedora_packaging.sh
@@ -74,6 +74,7 @@ INSTALL_PACKAGES=(\
     gpgme-devel
     grubby
     hostname
+    httpd-tools
     iproute
     iptables
     jq
@@ -168,5 +169,9 @@ 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 make install.tools
 $SUDO $GOSRC/hack/install_catatonit.sh
diff --git a/contrib/cirrus/packer/libpod_images.yml b/contrib/cirrus/packer/libpod_images.yml
index 754626a2e..38f5a8250 100644
--- a/contrib/cirrus/packer/libpod_images.yml
+++ b/contrib/cirrus/packer/libpod_images.yml
@@ -3,6 +3,7 @@
 # All of these are required
 variables:
     BUILT_IMAGE_SUFFIX: '{{env `BUILT_IMAGE_SUFFIX`}}'
+    GOPATH: '{{env `GOPATH`}}'
     GOSRC: '{{env `GOSRC`}}'
     PACKER_BASE: '{{env `PACKER_BASE`}}'
     SCRIPT_BASE: '{{env `SCRIPT_BASE`}}'
@@ -62,15 +63,22 @@ builders:
 
 # The brains of the operation, making actual modifications to the base-image.
 provisioners:
+    - type: 'shell'
+      inline:
+        - 'set -ex'
+        # The 'file' provisioner item (below) will create the final component
+        - 'mkdir -vp $(dirname {{user `GOSRC`}})'
+
     - type: 'file'
       source: '{{user `GOSRC`}}'
-      destination: '/tmp/libpod'
+      destination: '{{user `GOSRC`}}'
 
     - type: 'shell'
       script: '{{user `GOSRC`}}/{{user `PACKER_BASE`}}/{{split build_name "-" 0}}_setup.sh'
       environment_vars:
           - 'PACKER_BUILDER_NAME={{build_name}}'
-          - 'GOSRC=/tmp/libpod'
+          - 'GOPATH={{user `GOPATH`}}'
+          - 'GOSRC={{user `GOSRC`}}'
           - 'PACKER_BASE={{user `PACKER_BASE`}}'
           - 'SCRIPT_BASE={{user `SCRIPT_BASE`}}'
 
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