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/libpod_images.yml | |
| 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/libpod_images.yml')
| -rw-r--r-- | contrib/cirrus/packer/libpod_images.yml | 12 |
1 files changed, 10 insertions, 2 deletions
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`}}' |