greg/vms
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Do better with URL folders

Browse Source
This commit is contained in:
Greg Hellings
2024-07-12 21:15:01 -05:00
parent caf4f4f505
commit b646127875
5 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
nix/cache.nix
+3 -2
View File
@@ -29,11 +29,12 @@ in writeShellApplication {
map (d: '' map (d: ''
url=$(echo var.iso.url | packer console -var-file="${distroFile d}" -config-type=hcl2 sources/) url=$(echo var.iso.url | packer console -var-file="${distroFile d}" -config-type=hcl2 sources/)
sha=$(echo var.iso.checksum | packer console -var-file="${distroFile d}" -config-type=hcl2 sources/) sha=$(echo var.iso.checksum | packer console -var-file="${distroFile d}" -config-type=hcl2 sources/)
distro=$(echo var.distro | packer console -var-file="${distroFile d}" -config-type=hcl2 sources/)
# shellcheck disable=SC2143 # shellcheck disable=SC2143
if [ -z "$(mc ls storage/isos/cache/ | grep "$sha")" ]; then if [ -z "$(mc ls "storage/isos/cache/$distro" | grep "$sha")" ]; then
curl -L --retry 3 --retry-all-errors -o "cache/$sha.iso" "$url" curl -L --retry 3 --retry-all-errors -o "cache/$sha.iso" "$url"
if [ "$push" == "yes" ]; then if [ "$push" == "yes" ]; then
mc put "cache/$sha.iso" "storage/isos/cache/$sha.iso" mc put "cache/$sha.iso" "storage/isos/cache/$distro/$sha.iso"
fi fi
else else
echo "Skipping ${d.distro} - cache/$sha.iso" echo "Skipping ${d.distro} - cache/$sha.iso"
sources/hyperv-iso.pkr.hcl
+1 -1
View File
@@ -1,5 +1,5 @@
source "hyperv-iso" "amd64" { source "hyperv-iso" "amd64" {
iso_urls = [ "s3::${var.storage_url}/isos/cache/${var.iso.checksum}.iso?aws_access_key_id=root&aws_access_key_secret=${var.minio_secret}" ] iso_urls = [ local.iso_location ]
iso_target_path = "cache/${var.iso.checksum}.iso" iso_target_path = "cache/${var.iso.checksum}.iso"
iso_checksum = var.iso.checksum iso_checksum = var.iso.checksum
output_directory = "output/hyperv/${local.name}" output_directory = "output/hyperv/${local.name}"
sources/inputs.pkr.hcl
+1
View File
@@ -127,6 +127,7 @@ locals {
version = var.version version = var.version
build = var.build build = var.build
}) })
iso_location = "s3::${var.storage_url}/isos/cache/${var.distro}/${var.iso.checksum}.iso?aws_access_key_id=root&aws_access_key_secret=${var.minio_secret}"
cpus = var.cpus cpus = var.cpus
memory = var.memory memory = var.memory
sources/qemu.pkr.hcl
+1 -1
View File
@@ -4,7 +4,7 @@ variable "qemu_accelerator" {
} }
source "qemu" "amd64" { source "qemu" "amd64" {
iso_urls = [ "s3::${var.storage_url}/isos/cache/${var.iso.checksum}.iso?aws_access_key_id=root&aws_access_key_secret=${var.minio_secret}" ] iso_urls = [ local.iso_location ]
iso_target_path = "cache/${var.iso.checksum}.iso" iso_target_path = "cache/${var.iso.checksum}.iso"
iso_checksum = var.iso.checksum iso_checksum = var.iso.checksum
output_directory = "output/libvirt/${local.name}" output_directory = "output/libvirt/${local.name}"
sources/virtualbox-iso.pkr.hcl
+1 -1
View File
@@ -1,5 +1,5 @@
source "virtualbox-iso" "amd64" { source "virtualbox-iso" "amd64" {
iso_urls = [ "s3::${var.storage_url}/isos/cache/${var.iso.checksum}.iso?aws_access_key_id=root&aws_access_key_secret=${var.minio_secret}" ] iso_urls = [ local.iso_location ]
iso_target_path = "cache/${var.iso.checksum}.iso" iso_target_path = "cache/${var.iso.checksum}.iso"
iso_checksum = var.iso.checksum iso_checksum = var.iso.checksum
output_directory = "output/virtualbox/${local.name}" output_directory = "output/virtualbox/${local.name}"