diff --git a/images/ubuntu/templates/ubuntu-20.04.pkr.hcl b/images/ubuntu/templates/ubuntu-20.04.pkr.hcl index fd3a295b7..101c5a3bf 100644 --- a/images/ubuntu/templates/ubuntu-20.04.pkr.hcl +++ b/images/ubuntu/templates/ubuntu-20.04.pkr.hcl @@ -183,13 +183,18 @@ build { inline = ["mkdir ${var.image_folder}", "chmod 777 ${var.image_folder}"] } + provisioner "file" { + destination = "${var.helper_script_folder}" + source = "${path.root}/../scripts/helpers" + } + provisioner "shell" { execute_command = "sudo sh -c '{{ .Vars }} {{ .Path }}'" script = "${path.root}/../scripts/build/configure-apt-mock.sh" } provisioner "shell" { - environment_vars = ["DEBIAN_FRONTEND=noninteractive"] + environment_vars = ["HELPER_SCRIPTS=${var.helper_script_folder}","DEBIAN_FRONTEND=noninteractive"] execute_command = "sudo sh -c '{{ .Vars }} {{ .Path }}'" scripts = [ "${path.root}/../scripts/build/install-ms-repos.sh", @@ -203,11 +208,6 @@ build { script = "${path.root}/../scripts/build/configure-limits.sh" } - provisioner "file" { - destination = "${var.helper_script_folder}" - source = "${path.root}/../scripts/helpers" - } - provisioner "file" { destination = "${var.installer_script_folder}" source = "${path.root}/../scripts/build" diff --git a/images/ubuntu/templates/ubuntu-22.04.pkr.hcl b/images/ubuntu/templates/ubuntu-22.04.pkr.hcl index 473e597cd..9b881a686 100644 --- a/images/ubuntu/templates/ubuntu-22.04.pkr.hcl +++ b/images/ubuntu/templates/ubuntu-22.04.pkr.hcl @@ -183,13 +183,18 @@ build { inline = ["mkdir ${var.image_folder}", "chmod 777 ${var.image_folder}"] } + provisioner "file" { + destination = "${var.helper_script_folder}" + source = "${path.root}/../scripts/helpers" + } + provisioner "shell" { execute_command = "sudo sh -c '{{ .Vars }} {{ .Path }}'" script = "${path.root}/../scripts/build/configure-apt-mock.sh" } provisioner "shell" { - environment_vars = ["DEBIAN_FRONTEND=noninteractive"] + environment_vars = ["HELPER_SCRIPTS=${var.helper_script_folder}","DEBIAN_FRONTEND=noninteractive"] execute_command = "sudo sh -c '{{ .Vars }} {{ .Path }}'" scripts = [ "${path.root}/../scripts/build/install-ms-repos.sh", @@ -203,11 +208,6 @@ build { script = "${path.root}/../scripts/build/configure-limits.sh" } - provisioner "file" { - destination = "${var.helper_script_folder}" - source = "${path.root}/../scripts/helpers" - } - provisioner "file" { destination = "${var.installer_script_folder}" source = "${path.root}/../scripts/build" diff --git a/images/ubuntu/templates/ubuntu-minimal.pkr.hcl b/images/ubuntu/templates/ubuntu-minimal.pkr.hcl index f2cef0e0d..9a3c34299 100644 --- a/images/ubuntu/templates/ubuntu-minimal.pkr.hcl +++ b/images/ubuntu/templates/ubuntu-minimal.pkr.hcl @@ -170,6 +170,11 @@ build { inline = ["mkdir ${local.image_folder}", "chmod 777 ${local.image_folder}"] } + provisioner "file" { + destination = "${local.helper_script_folder}" + source = "${path.root}/../scripts/helpers" + } + // Add apt wrapper to implement retries provisioner "shell" { execute_command = "sudo sh -c '{{ .Vars }} {{ .Path }}'" @@ -178,7 +183,7 @@ build { // Install MS package repos, Configure apt provisioner "shell" { - environment_vars = ["DEBIAN_FRONTEND=noninteractive"] + environment_vars = ["HELPER_SCRIPTS=${var.helper_script_folder}","DEBIAN_FRONTEND=noninteractive"] execute_command = "sudo sh -c '{{ .Vars }} {{ .Path }}'" scripts = [ "${path.root}/../scripts/build/install-ms-repos.sh", @@ -192,11 +197,6 @@ build { script = "${path.root}/../scripts/build/configure-limits.sh" } - provisioner "file" { - destination = "${local.helper_script_folder}" - source = "${path.root}/../scripts/helpers" - } - provisioner "file" { destination = "${local.installer_script_folder}" source = "${path.root}/../scripts/build"