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

[ubuntu] Fix static path in install.sh (#9138)

Browse Source
This commit is contained in:
Shamil Mubarakshin
2024-01-10 10:41:11 +01:00
committed by GitHub
parent ec4e51233f
commit c40faf56bf
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
images/ubuntu/scripts/helpers/install.sh
View File

@@ -46,7 +46,7 @@ download_with_retry() {
} }
get_toolset_value() { get_toolset_value() {
local toolset_path="/imagegeneration/installers/toolset.json" local toolset_path="${INSTALLER_SCRIPT_FOLDER}/toolset.json"
local query=$1 local query=$1
echo "$(jq -r "$query" $toolset_path)" echo "$(jq -r "$query" $toolset_path)"

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

@@ -259,7 +259,7 @@ build {
} }
provisioner "shell" { provisioner "shell" {
environment_vars = ["HELPER_SCRIPTS=${var.helper_script_folder}"] environment_vars = ["HELPER_SCRIPTS=${var.helper_script_folder}", "INSTALLER_SCRIPT_FOLDER=${var.installer_script_folder}"]
execute_command = "sudo sh -c '{{ .Vars }} {{ .Path }}'" execute_command = "sudo sh -c '{{ .Vars }} {{ .Path }}'"
scripts = ["${path.root}/../scripts/build/install-powershell.sh"] scripts = ["${path.root}/../scripts/build/install-powershell.sh"]
} }

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

@@ -259,7 +259,7 @@ build {
} }
provisioner "shell" { provisioner "shell" {
environment_vars = ["HELPER_SCRIPTS=${var.helper_script_folder}"] environment_vars = ["HELPER_SCRIPTS=${var.helper_script_folder}", "INSTALLER_SCRIPT_FOLDER=${var.installer_script_folder}"]
execute_command = "sudo sh -c '{{ .Vars }} {{ .Path }}'" execute_command = "sudo sh -c '{{ .Vars }} {{ .Path }}'"
scripts = ["${path.root}/../scripts/build/install-powershell.sh"] scripts = ["${path.root}/../scripts/build/install-powershell.sh"]
} }