diff options
| author | Chris Evich <cevich@redhat.com> | 2019-08-09 09:16:09 -0400 |
|---|---|---|
| committer | Chris Evich <cevich@redhat.com> | 2019-09-20 14:34:13 -0400 |
| commit | 831a64393e1a0440efa3890410ff61ad908de6bd (patch) | |
| tree | 00675f0fd02c8253961c8369f182c074e6dc39db /contrib/cirrus/packer/libpod_base_images.yml | |
| parent | 9a2ae2442dc018444f73009e2faa513008f01128 (diff) | |
| download | podman-831a64393e1a0440efa3890410ff61ad908de6bd.tar.gz podman-831a64393e1a0440efa3890410ff61ad908de6bd.tar.bz2 podman-831a64393e1a0440efa3890410ff61ad908de6bd.zip | |
Cirrus: disable Evil Units in base-images
Also, minor update to prevent harmless 'Fatal: not a git repo' error.
Signed-off-by: Chris Evich <cevich@redhat.com>
Diffstat (limited to 'contrib/cirrus/packer/libpod_base_images.yml')
| -rw-r--r-- | contrib/cirrus/packer/libpod_base_images.yml | 16 |
1 files changed, 5 insertions, 11 deletions
diff --git a/contrib/cirrus/packer/libpod_base_images.yml b/contrib/cirrus/packer/libpod_base_images.yml index 722822837..bcca440ae 100644 --- a/contrib/cirrus/packer/libpod_base_images.yml +++ b/contrib/cirrus/packer/libpod_base_images.yml @@ -95,6 +95,7 @@ builders: source_image_project_id: 'ubuntu-os-cloud' project_id: '{{user `GCP_PROJECT_ID`}}' account_file: '{{user `GOOGLE_APPLICATION_CREDENTIALS`}}' + startup_script_file: "systemd_banish.sh" zone: 'us-central1-a' disk_size: 20 communicator: 'none' @@ -102,7 +103,7 @@ builders: - <<: *imgcopy name: 'prior-ubuntu' image_name: '{{user `PRIOR_UBUNTU_BASE_IMAGE`}}' - source_image: '{{user `UBUNTU_BASE_IMAGE`}}' + source_image: '{{user `PRIOR_UBUNTU_BASE_IMAGE`}}' provisioners: - type: 'shell' @@ -130,22 +131,15 @@ provisioners: only: ['fedora', 'prior-fedora'] type: 'shell' inline: - - 'chmod +x /tmp/libpod/{{user `PACKER_BASE`}}/{{build_name}}_base-setup.sh' - - '/tmp/libpod/{{user `PACKER_BASE`}}/{{build_name}}_base-setup.sh pre' - expect_disconnect: true # Allow this to reboot the VM + - 'chmod +x /tmp/libpod/{{user `PACKER_BASE`}}/*.sh' + - '/tmp/libpod/{{user `PACKER_BASE`}}/{{build_name}}_base-setup.sh' + expect_disconnect: true # Allow this to reboot the VM if needed environment_vars: - 'TIMESTAMP={{user `TIMESTAMP`}}' - 'GOSRC=/tmp/libpod' - 'SCRIPT_BASE={{user `SCRIPT_BASE`}}' - 'PACKER_BASE={{user `PACKER_BASE`}}' - - <<: *shell_script - inline: ['{{user `GOSRC`}}/{{user `PACKER_BASE`}}/{{build_name}}_base-setup.sh'] - expect_disconnect: false - pause_before: '10s' - inline: - - '/tmp/libpod/{{user `PACKER_BASE`}}/{{build_name}}_base-setup.sh post' - post-processors: - - type: "compress" only: ['fedora', 'prior-fedora'] |