diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-07-22 20:25:14 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-07-22 20:25:14 +0200 |
| commit | 0da4fa280be192516f37e081cb5c428147817924 (patch) | |
| tree | 74d32e4fbc146a75645ee61a23b045216f332c76 /contrib/cirrus/packer/Makefile | |
| parent | 80add2902cf3561d2c9f91dc045076519cd297d5 (diff) | |
| parent | 6acea29a8069b6c6c35822c461a75efea95c7c8b (diff) | |
| download | podman-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/Makefile')
| -rw-r--r-- | contrib/cirrus/packer/Makefile | 4 |
1 files changed, 3 insertions, 1 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) \ |