actions/runner-images
1
0
Fork 0
mirror of https://github.com/actions/runner-images.git synced 2025-12-17 15:20:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

[Ubuntu] move source scripts earlier (#9951)

Browse Source
This commit is contained in:
Mikhail Koliada
2024-05-28 19:43:30 +02:00
committed by GitHub
parent 903d127138
commit 24c7b7b9d8
3 changed files with 18 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
images/ubuntu/templates/ubuntu-20.04.pkr.hcl
View File

@@ -183,13 +183,18 @@ build {
inline = ["mkdir ${var.image_folder}", "chmod 777 ${var.image_folder}"] inline = ["mkdir ${var.image_folder}", "chmod 777 ${var.image_folder}"]
} }
provisioner "file" {
destination = "${var.helper_script_folder}"
source = "${path.root}/../scripts/helpers"
}
provisioner "shell" { provisioner "shell" {
execute_command = "sudo sh -c '{{ .Vars }} {{ .Path }}'" execute_command = "sudo sh -c '{{ .Vars }} {{ .Path }}'"
script = "${path.root}/../scripts/build/configure-apt-mock.sh" script = "${path.root}/../scripts/build/configure-apt-mock.sh"
} }
provisioner "shell" { 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 }}'" execute_command = "sudo sh -c '{{ .Vars }} {{ .Path }}'"
scripts = [ scripts = [
"${path.root}/../scripts/build/install-ms-repos.sh", "${path.root}/../scripts/build/install-ms-repos.sh",
@@ -203,11 +208,6 @@ build {
script = "${path.root}/../scripts/build/configure-limits.sh" script = "${path.root}/../scripts/build/configure-limits.sh"
} }
provisioner "file" {
destination = "${var.helper_script_folder}"
source = "${path.root}/../scripts/helpers"
}
provisioner "file" { provisioner "file" {
destination = "${var.installer_script_folder}" destination = "${var.installer_script_folder}"
source = "${path.root}/../scripts/build" source = "${path.root}/../scripts/build"

12
images/ubuntu/templates/ubuntu-22.04.pkr.hcl
View File

@@ -183,13 +183,18 @@ build {
inline = ["mkdir ${var.image_folder}", "chmod 777 ${var.image_folder}"] inline = ["mkdir ${var.image_folder}", "chmod 777 ${var.image_folder}"]
} }
provisioner "file" {
destination = "${var.helper_script_folder}"
source = "${path.root}/../scripts/helpers"
}
provisioner "shell" { provisioner "shell" {
execute_command = "sudo sh -c '{{ .Vars }} {{ .Path }}'" execute_command = "sudo sh -c '{{ .Vars }} {{ .Path }}'"
script = "${path.root}/../scripts/build/configure-apt-mock.sh" script = "${path.root}/../scripts/build/configure-apt-mock.sh"
} }
provisioner "shell" { 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 }}'" execute_command = "sudo sh -c '{{ .Vars }} {{ .Path }}'"
scripts = [ scripts = [
"${path.root}/../scripts/build/install-ms-repos.sh", "${path.root}/../scripts/build/install-ms-repos.sh",
@@ -203,11 +208,6 @@ build {
script = "${path.root}/../scripts/build/configure-limits.sh" script = "${path.root}/../scripts/build/configure-limits.sh"
} }
provisioner "file" {
destination = "${var.helper_script_folder}"
source = "${path.root}/../scripts/helpers"
}
provisioner "file" { provisioner "file" {
destination = "${var.installer_script_folder}" destination = "${var.installer_script_folder}"
source = "${path.root}/../scripts/build" source = "${path.root}/../scripts/build"

12
images/ubuntu/templates/ubuntu-minimal.pkr.hcl
View File

@@ -170,6 +170,11 @@ build {
inline = ["mkdir ${local.image_folder}", "chmod 777 ${local.image_folder}"] 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 // Add apt wrapper to implement retries
provisioner "shell" { provisioner "shell" {
execute_command = "sudo sh -c '{{ .Vars }} {{ .Path }}'" execute_command = "sudo sh -c '{{ .Vars }} {{ .Path }}'"
@@ -178,7 +183,7 @@ build {
// Install MS package repos, Configure apt // Install MS package repos, Configure apt
provisioner "shell" { 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 }}'" execute_command = "sudo sh -c '{{ .Vars }} {{ .Path }}'"
scripts = [ scripts = [
"${path.root}/../scripts/build/install-ms-repos.sh", "${path.root}/../scripts/build/install-ms-repos.sh",
@@ -192,11 +197,6 @@ build {
script = "${path.root}/../scripts/build/configure-limits.sh" script = "${path.root}/../scripts/build/configure-limits.sh"
} }
provisioner "file" {
destination = "${local.helper_script_folder}"
source = "${path.root}/../scripts/helpers"
}
provisioner "file" { provisioner "file" {
destination = "${local.installer_script_folder}" destination = "${local.installer_script_folder}"
source = "${path.root}/../scripts/build" source = "${path.root}/../scripts/build"