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

[Windows] Reorganize temporary file storage and separate cleanup activities (#11054)

Browse Source
This commit is contained in:
Alexey-Ayupov
2024-11-28 13:30:26 +01:00
committed by GitHub
parent 9b0a6c08c9
commit 5a263020f5
9 changed files with 119 additions and 99 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
images/windows/scripts/build/Configure-System.ps1
View File

@@ -3,12 +3,6 @@
## Desc: Applies various configuration settings to the final image ## Desc: Applies various configuration settings to the final image
################################################################################ ################################################################################
Write-Host "Cleanup WinSxS"
dism.exe /online /Cleanup-Image /StartComponentCleanup /ResetBase
if ($LASTEXITCODE -ne 0) {
throw "Failed to cleanup WinSxS"
}
# Set default version to 1 for WSL (aka LXSS - Linux Subsystem) # Set default version to 1 for WSL (aka LXSS - Linux Subsystem)
# The value should be set in the default user registry hive # The value should be set in the default user registry hive
# https://github.com/actions/runner-images/issues/5760 # https://github.com/actions/runner-images/issues/5760
@@ -31,53 +25,10 @@ if (Test-IsWin22) {
$key.SetValue("DefaultVersion", "1", "DWord") $key.SetValue("DefaultVersion", "1", "DWord")
$key.Handle.Close() $key.Handle.Close()
[System.GC]::Collect() [System.GC]::Collect()
Dismount-RegistryHive "HKLM\DEFAULT" Dismount-RegistryHive "HKLM\DEFAULT"
} }
Write-Host "Clean up various directories"
@(
"$env:SystemDrive\Recovery",
"$env:SystemRoot\logs",
"$env:SystemRoot\winsxs\manifestcache",
"$env:SystemRoot\Temp",
"$env:SystemDrive\Users\$env:INSTALL_USER\AppData\Local\Temp",
"$env:TEMP",
"$env:AZURE_CONFIG_DIR\logs",
"$env:AZURE_CONFIG_DIR\commands",
"$env:AZURE_CONFIG_DIR\telemetry"
) | ForEach-Object {
if (Test-Path $_) {
Write-Host "Removing $_"
cmd /c "takeown /d Y /R /f $_ 2>&1" | Out-Null
if ($LASTEXITCODE -ne 0) {
throw "Failed to take ownership of $_"
}
cmd /c "icacls $_ /grant:r administrators:f /t /c /q 2>&1" | Out-Null
if ($LASTEXITCODE -ne 0) {
throw "Failed to grant administrators full control of $_"
}
Remove-Item $_ -Recurse -Force -ErrorAction SilentlyContinue | Out-Null
}
}
$winInstallDir = "$env:SystemRoot\Installer"
New-Item -Path $winInstallDir -ItemType Directory -Force | Out-Null
# Remove AllUsersAllHosts profile
Remove-Item $profile.AllUsersAllHosts -Force -ErrorAction SilentlyContinue | Out-Null
# Clean yarn and npm cache
cmd /c "yarn cache clean 2>&1" | Out-Null
if ($LASTEXITCODE -ne 0) {
throw "Failed to clean yarn cache"
}
cmd /c "npm cache clean --force 2>&1" | Out-Null
if ($LASTEXITCODE -ne 0) {
throw "Failed to clean npm cache"
}
# allow msi to write to temp folder # allow msi to write to temp folder
# see https://github.com/actions/runner-images/issues/1704 # see https://github.com/actions/runner-images/issues/1704
cmd /c "icacls $env:SystemRoot\Temp /grant Users:f /t /c /q 2>&1" | Out-Null cmd /c "icacls $env:SystemRoot\Temp /grant Users:f /t /c /q 2>&1" | Out-Null

2
images/windows/scripts/build/Install-BizTalkBuildComponent.ps1
View File

@@ -9,7 +9,7 @@ $signatureThumbprint = "8740DF4ACB749640AD318E4BE842F72EC651AD80"
Write-Host "Downloading BizTalk Project Build Component archive..." Write-Host "Downloading BizTalk Project Build Component archive..."
$zipFile = Invoke-DownloadWithRetry $downloadUrl $zipFile = Invoke-DownloadWithRetry $downloadUrl
$setupPath = Join-Path $env:TEMP "BizTalkBuildComponent" $setupPath = Join-Path $env:TEMP_DIR "BizTalkBuildComponent"
if (-not (Test-Path -Path $setupPath)) { if (-not (Test-Path -Path $setupPath)) {
New-Item -Path $setupPath -ItemType Directory -Force | Out-Null New-Item -Path $setupPath -ItemType Directory -Force | Out-Null
} }

6
images/windows/scripts/build/Install-Docker.ps1
View File

@@ -23,9 +23,9 @@ $mobyReleaseUrl = $dockerceUrl + $mobyRelease
Write-Host "Install Moby $mobyRelease..." Write-Host "Install Moby $mobyRelease..."
$mobyArchivePath = Invoke-DownloadWithRetry $mobyReleaseUrl $mobyArchivePath = Invoke-DownloadWithRetry $mobyReleaseUrl
Expand-Archive -Path $mobyArchivePath -DestinationPath $env:TEMP Expand-Archive -Path $mobyArchivePath -DestinationPath $env:TEMP_DIR
$dockerPath = "$env:TEMP\docker\docker.exe" $dockerPath = "$env:TEMP_DIR\docker\docker.exe"
$dockerdPath = "$env:TEMP\docker\dockerd.exe" $dockerdPath = "$env:TEMP_DIR\docker\dockerd.exe"
Write-Host "Install Docker CE" Write-Host "Install Docker CE"
$instScriptUrl = "https://raw.githubusercontent.com/microsoft/Windows-Containers/Main/helpful_tools/Install-DockerCE/install-docker-ce.ps1" $instScriptUrl = "https://raw.githubusercontent.com/microsoft/Windows-Containers/Main/helpful_tools/Install-DockerCE/install-docker-ce.ps1"

2
images/windows/scripts/build/Install-Toolset.ps1
View File

@@ -13,7 +13,7 @@ Function Install-Asset {
) )
$releaseAssetName = [System.IO.Path]::GetFileNameWithoutExtension($ReleaseAsset.filename) $releaseAssetName = [System.IO.Path]::GetFileNameWithoutExtension($ReleaseAsset.filename)
$assetFolderPath = Join-Path $env:TEMP $releaseAssetName $assetFolderPath = Join-Path $env:TEMP_DIR $releaseAssetName
$assetArchivePath = Invoke-DownloadWithRetry $ReleaseAsset.download_url $assetArchivePath = Invoke-DownloadWithRetry $ReleaseAsset.download_url
Write-Host "Extract $($ReleaseAsset.filename) content..." Write-Host "Extract $($ReleaseAsset.filename) content..."

51
images/windows/scripts/build/Invoke-Cleanup.ps1 Normal file
View File

@@ -0,0 +1,51 @@
################################################################################
## File: Invoke-Cleanup.ps1
## Desc: Cleanup WinSxS, temp, cache and compress some directories
################################################################################
Write-Host "Cleanup WinSxS"
dism.exe /online /Cleanup-Image /StartComponentCleanup /ResetBase
if ($LASTEXITCODE -ne 0) {
throw "Failed to cleanup WinSxS"
}
Write-Host "Clean up various directories"
@(
"$env:SystemDrive\Recovery",
"$env:SystemRoot\logs",
"$env:SystemRoot\winsxs\manifestcache",
"$env:SystemRoot\Temp",
"$env:SystemRoot\Installer",
"$env:SystemDrive\Users\$env:INSTALL_USER\AppData\Local\Temp",
"$env:TEMP",
"$env:AZURE_CONFIG_DIR\logs",
"$env:AZURE_CONFIG_DIR\commands",
"$env:AZURE_CONFIG_DIR\telemetry"
) | ForEach-Object {
if (Test-Path $_) {
Write-Host "Removing $_"
cmd /c "takeown /d Y /R /f $_ 2>&1" | Out-Null
if ($LASTEXITCODE -ne 0) {
throw "Failed to take ownership of $_"
}
cmd /c "icacls $_ /grant:r administrators:f /t /c /q 2>&1" | Out-Null
if ($LASTEXITCODE -ne 0) {
throw "Failed to grant administrators full control of $_"
}
Remove-Item $_ -Recurse -Force -ErrorAction SilentlyContinue | Out-Null
}
}
# Remove AllUsersAllHosts profile
Remove-Item $profile.AllUsersAllHosts -Force -ErrorAction SilentlyContinue | Out-Null
# Clean yarn and npm cache
cmd /c "yarn cache clean 2>&1" | Out-Null
if ($LASTEXITCODE -ne 0) {
throw "Failed to clean yarn cache"
}
cmd /c "npm cache clean --force 2>&1" | Out-Null
if ($LASTEXITCODE -ne 0) {
throw "Failed to clean npm cache"
}

46
images/windows/scripts/helpers/InstallHelpers.ps1
View File

@@ -70,7 +70,7 @@ function Install-Binary {
} else { } else {
$fileName = [System.IO.Path]::GetFileNameWithoutExtension([System.IO.Path]::GetRandomFileName()) + ".$Type".ToLower() $fileName = [System.IO.Path]::GetFileNameWithoutExtension([System.IO.Path]::GetRandomFileName()) + ".$Type".ToLower()
} }
$filePath = Invoke-DownloadWithRetry -Url $Url -Path "${env:Temp}\$fileName" $filePath = Invoke-DownloadWithRetry -Url $Url -Path "${env:TEMP_DIR}\$fileName"
} }
if ($PSBoundParameters.ContainsKey('ExpectedSignature')) { if ($PSBoundParameters.ContainsKey('ExpectedSignature')) {
@@ -92,7 +92,7 @@ function Install-Binary {
if ($ExtraInstallArgs -and $InstallArgs) { if ($ExtraInstallArgs -and $InstallArgs) {
throw "InstallArgs and ExtraInstallArgs parameters cannot be used together." throw "InstallArgs and ExtraInstallArgs parameters cannot be used together."
} }
if ($Type -eq "MSI") { if ($Type -eq "MSI") {
# MSI binaries should be installed via msiexec.exe # MSI binaries should be installed via msiexec.exe
if ($ExtraInstallArgs) { if ($ExtraInstallArgs) {
@@ -153,7 +153,7 @@ function Invoke-DownloadWithRetry {
.EXAMPLE .EXAMPLE
Invoke-DownloadWithRetry -Url "https://example.com/file.zip" Invoke-DownloadWithRetry -Url "https://example.com/file.zip"
Downloads the file from the specified URL and saves it to a temporary path. Downloads the file from the specified URL and saves it to a temporary path.
.OUTPUTS .OUTPUTS
The path where the downloaded file is saved. The path where the downloaded file is saved.
#> #>
@@ -174,7 +174,7 @@ function Invoke-DownloadWithRetry {
if ([String]::IsNullOrEmpty($fileName)) { if ([String]::IsNullOrEmpty($fileName)) {
$fileName = [System.IO.Path]::GetRandomFileName() $fileName = [System.IO.Path]::GetRandomFileName()
} }
$Path = Join-Path -Path "${env:Temp}" -ChildPath $fileName $Path = Join-Path -Path "${env:TEMP_DIR}" -ChildPath $fileName
} }
Write-Host "Downloading package from $Url to $Path..." Write-Host "Downloading package from $Url to $Path..."
@@ -198,7 +198,7 @@ function Invoke-DownloadWithRetry {
$retries = 0 $retries = 0
} }
} }
if ($retries -eq 0) { if ($retries -eq 0) {
$totalSeconds = [math]::Round(($(Get-Date) - $downloadStartTime).TotalSeconds, 2) $totalSeconds = [math]::Round(($(Get-Date) - $downloadStartTime).TotalSeconds, 2)
throw "Package download failed after $totalSeconds seconds" throw "Package download failed after $totalSeconds seconds"
@@ -519,7 +519,7 @@ function Get-GithubReleasesByVersion {
.PARAMETER AllowPrerelease .PARAMETER AllowPrerelease
Specifies whether to include prerelease versions in the results. By default, Specifies whether to include prerelease versions in the results. By default,
prerelease versions are excluded. prerelease versions are excluded.
.PARAMETER WithAssetsOnly .PARAMETER WithAssetsOnly
Specifies whether to exclude releases without assets. By default, releases without Specifies whether to exclude releases without assets. By default, releases without
assets are included. assets are included.
@@ -549,7 +549,7 @@ function Get-GithubReleasesByVersion {
[switch] $WithAssetsOnly [switch] $WithAssetsOnly
) )
$localCacheFile = Join-Path ${env:TEMP} "github-releases_$($Repository -replace "/", "_").json" $localCacheFile = Join-Path ${env:TEMP_DIR} "github-releases_$($Repository -replace "/", "_").json"
if (Test-Path $localCacheFile) { if (Test-Path $localCacheFile) {
$releases = Get-Content $localCacheFile | ConvertFrom-Json $releases = Get-Content $localCacheFile | ConvertFrom-Json
@@ -783,7 +783,7 @@ function Get-ChecksumFromGithubRelease {
} }
$hash = $matchedLine | Select-String -Pattern $pattern | ForEach-Object { $_.Matches.Value } $hash = $matchedLine | Select-String -Pattern $pattern | ForEach-Object { $_.Matches.Value }
if ([string]::IsNullOrEmpty($hash)) { if ([string]::IsNullOrEmpty($hash)) {
throw "Found '${FileName}' in body of release ${matchedVersion}, but failed to get hash from it.`nLine: ${matchedLine}" throw "Found '${FileName}' in body of release ${matchedVersion}, but failed to get hash from it.`nLine: ${matchedLine}"
} }
@@ -827,7 +827,7 @@ function Get-ChecksumFromUrl {
[string] $HashType [string] $HashType
) )
$tempFile = Join-Path -Path $env:TEMP -ChildPath ([System.IO.Path]::GetRandomFileName()) $tempFile = Join-Path -Path $env:TEMP_DIR -ChildPath ([System.IO.Path]::GetRandomFileName())
$checksums = (Invoke-DownloadWithRetry -Url $Url -Path $tempFile | Get-Item | Get-Content) -as [string[]] $checksums = (Invoke-DownloadWithRetry -Url $Url -Path $tempFile | Get-Item | Get-Content) -as [string[]]
Remove-Item -Path $tempFile Remove-Item -Path $tempFile
@@ -860,30 +860,30 @@ function Test-FileChecksum {
<# <#
.SYNOPSIS .SYNOPSIS
Verifies the checksum of a file. Verifies the checksum of a file.
.DESCRIPTION .DESCRIPTION
The Test-FileChecksum function verifies the SHA256 or SHA512 checksum of a file against an expected value. The Test-FileChecksum function verifies the SHA256 or SHA512 checksum of a file against an expected value.
If the checksum does not match the expected value, the function throws an error. If the checksum does not match the expected value, the function throws an error.
.PARAMETER Path .PARAMETER Path
The path to the file for which to verify the checksum. The path to the file for which to verify the checksum.
.PARAMETER ExpectedSHA256Sum .PARAMETER ExpectedSHA256Sum
The expected SHA256 checksum. If this parameter is provided, the function will calculate the SHA256 checksum of the file and compare it to this value. The expected SHA256 checksum. If this parameter is provided, the function will calculate the SHA256 checksum of the file and compare it to this value.
.PARAMETER ExpectedSHA512Sum .PARAMETER ExpectedSHA512Sum
The expected SHA512 checksum. If this parameter is provided, the function will calculate the SHA512 checksum of the file and compare it to this value. The expected SHA512 checksum. If this parameter is provided, the function will calculate the SHA512 checksum of the file and compare it to this value.
.EXAMPLE .EXAMPLE
Test-FileChecksum -Path "C:\temp\file.txt" -ExpectedSHA256Sum "ABC123" Test-FileChecksum -Path "C:\temp\file.txt" -ExpectedSHA256Sum "ABC123"
Verifies that the SHA256 checksum of the file at C:\temp\file.txt is ABC123. Verifies that the SHA256 checksum of the file at C:\temp\file.txt is ABC123.
.EXAMPLE .EXAMPLE
Test-FileChecksum -Path "C:\temp\file.txt" -ExpectedSHA512Sum "DEF456" Test-FileChecksum -Path "C:\temp\file.txt" -ExpectedSHA512Sum "DEF456"
Verifies that the SHA512 checksum of the file at C:\temp\file.txt is DEF456. Verifies that the SHA512 checksum of the file at C:\temp\file.txt is DEF456.
#> #>
param ( param (
@@ -944,7 +944,7 @@ function Test-FileSignature {
This example tests the signature of the file "C:\Path\To\File.exe" against the expected thumbprint "A1B2C3D4E5F6G7H8I9J0K1L2M3N4O5P6Q7R8S9T0". This example tests the signature of the file "C:\Path\To\File.exe" against the expected thumbprint "A1B2C3D4E5F6G7H8I9J0K1L2M3N4O5P6Q7R8S9T0".
#> #>
param( param(
[Parameter(Mandatory = $true, Position = 0)] [Parameter(Mandatory = $true, Position = 0)]
[string] $Path, [string] $Path,
@@ -957,7 +957,7 @@ function Test-FileSignature {
if ($signature.Status -ne "Valid") { if ($signature.Status -ne "Valid") {
throw "Signature status is not valid. Status: $($signature.Status)" throw "Signature status is not valid. Status: $($signature.Status)"
} }
foreach ($thumbprint in $ExpectedThumbprint) { foreach ($thumbprint in $ExpectedThumbprint) {
if ($signature.SignerCertificate.Thumbprint.Contains($thumbprint)) { if ($signature.SignerCertificate.Thumbprint.Contains($thumbprint)) {
Write-Output "Signature for $Path is valid" Write-Output "Signature for $Path is valid"
@@ -992,8 +992,8 @@ function Update-Environment {
) )
# Update PATH variable # Update PATH variable
$pathItems = $locations | ForEach-Object { $pathItems = $locations | ForEach-Object {
(Get-Item $_).GetValue('PATH').Split(';') (Get-Item $_).GetValue('PATH').Split(';')
} | Select-Object -Unique } | Select-Object -Unique
$env:PATH = $pathItems -join ';' $env:PATH = $pathItems -join ';'
@@ -1004,7 +1004,7 @@ function Update-Environment {
$value = $key.GetValue($name) $value = $key.GetValue($name)
if (-not ($name -ieq 'PATH')) { if (-not ($name -ieq 'PATH')) {
Set-Item -Path Env:$name -Value $value Set-Item -Path Env:$name -Value $value
} }
} }
} }
} }

8
images/windows/scripts/helpers/VisualStudioHelpers.ps1
View File

@@ -17,7 +17,7 @@ Function Install-VisualStudio {
.PARAMETER RequiredComponents .PARAMETER RequiredComponents
The list of required components. Required parameter. The list of required components. Required parameter.
.PARAMETER ExtraArgs .PARAMETER ExtraArgs
The extra arguments to pass to the bootstrapper. Optional parameter. The extra arguments to pass to the bootstrapper. Optional parameter.
#> #>
@@ -85,10 +85,10 @@ Function Install-VisualStudio {
} }
# Expand the zip file # Expand the zip file
Expand-Archive -Path "$env:TEMP\vslogs.zip" -DestinationPath "$env:TEMP\vslogs" Expand-Archive -Path "$env:TEMP_DIR\vslogs.zip" -DestinationPath "$env:TEMP_DIR\vslogs"
# Print logs # Print logs
$vsLogsPath = "$env:TEMP\vslogs" $vsLogsPath = "$env:TEMP_DIR\vslogs"
$vsLogs = Get-ChildItem -Path $vsLogsPath -Recurse | Where-Object { -not $_.PSIsContainer } | Select-Object -ExpandProperty FullName $vsLogs = Get-ChildItem -Path $vsLogsPath -Recurse | Where-Object { -not $_.PSIsContainer } | Select-Object -ExpandProperty FullName
foreach ($log in $vsLogs) { foreach ($log in $vsLogs) {
Write-Host "============================" Write-Host "============================"
@@ -96,7 +96,7 @@ Function Install-VisualStudio {
Write-Host "============================" Write-Host "============================"
Get-Content -Path $log -ErrorAction Continue Get-Content -Path $log -ErrorAction Continue
} }
exit $exitCode exit $exitCode
} }
} }

25
images/windows/templates/windows-2019.pkr.hcl
View File

@@ -72,6 +72,11 @@ variable "imagedata_file" {
default = "C:\\imagedata.json" default = "C:\\imagedata.json"
} }
variable "temp_dir" {
type = string
default = "D:\\temp"
}
variable "install_password" { variable "install_password" {
type = string type = string
default = "" default = ""
@@ -190,7 +195,10 @@ build {
sources = ["source.azure-arm.image"] sources = ["source.azure-arm.image"]
provisioner "powershell" { provisioner "powershell" {
inline = ["New-Item -Path ${var.image_folder} -ItemType Directory -Force"] inline = [
"New-Item -Path ${var.image_folder} -ItemType Directory -Force",
"New-Item -Path ${var.temp_dir} -ItemType Directory -Force"
]
} }
provisioner "file" { provisioner "file" {
@@ -253,7 +261,7 @@ build {
} }
provisioner "powershell" { provisioner "powershell" {
environment_vars = ["IMAGE_VERSION=${var.image_version}", "IMAGE_OS=${var.image_os}", "AGENT_TOOLSDIRECTORY=${var.agent_tools_directory}", "IMAGEDATA_FILE=${var.imagedata_file}", "IMAGE_FOLDER=${var.image_folder}"] environment_vars = ["IMAGE_VERSION=${var.image_version}", "IMAGE_OS=${var.image_os}", "AGENT_TOOLSDIRECTORY=${var.agent_tools_directory}", "IMAGEDATA_FILE=${var.imagedata_file}", "IMAGE_FOLDER=${var.image_folder}", "TEMP_DIR=${var.temp_dir}"]
execution_policy = "unrestricted" execution_policy = "unrestricted"
scripts = [ scripts = [
"${path.root}/../scripts/build/Configure-WindowsDefender.ps1", "${path.root}/../scripts/build/Configure-WindowsDefender.ps1",
@@ -277,7 +285,7 @@ build {
} }
provisioner "powershell" { provisioner "powershell" {
environment_vars = ["IMAGE_FOLDER=${var.image_folder}"] environment_vars = ["IMAGE_FOLDER=${var.image_folder}", "TEMP_DIR=${var.temp_dir}"]
scripts = [ scripts = [
"${path.root}/../scripts/build/Install-VCRedist.ps1", "${path.root}/../scripts/build/Install-VCRedist.ps1",
"${path.root}/../scripts/build/Install-Docker.ps1", "${path.root}/../scripts/build/Install-Docker.ps1",
@@ -297,7 +305,7 @@ build {
provisioner "powershell" { provisioner "powershell" {
elevated_password = "${var.install_password}" elevated_password = "${var.install_password}"
elevated_user = "${var.install_user}" elevated_user = "${var.install_user}"
environment_vars = ["IMAGE_FOLDER=${var.image_folder}"] environment_vars = ["IMAGE_FOLDER=${var.image_folder}", "TEMP_DIR=${var.temp_dir}"]
scripts = [ scripts = [
"${path.root}/../scripts/build/Install-VisualStudio.ps1", "${path.root}/../scripts/build/Install-VisualStudio.ps1",
"${path.root}/../scripts/build/Install-KubernetesTools.ps1", "${path.root}/../scripts/build/Install-KubernetesTools.ps1",
@@ -307,7 +315,7 @@ build {
} }
provisioner "powershell" { provisioner "powershell" {
environment_vars = ["IMAGE_FOLDER=${var.image_folder}"] environment_vars = ["IMAGE_FOLDER=${var.image_folder}", "TEMP_DIR=${var.temp_dir}"]
scripts = [ scripts = [
"${path.root}/../scripts/build/Install-Wix.ps1", "${path.root}/../scripts/build/Install-Wix.ps1",
"${path.root}/../scripts/build/Install-WDK.ps1", "${path.root}/../scripts/build/Install-WDK.ps1",
@@ -323,7 +331,7 @@ build {
provisioner "powershell" { provisioner "powershell" {
execution_policy = "remotesigned" execution_policy = "remotesigned"
environment_vars = ["IMAGE_FOLDER=${var.image_folder}"] environment_vars = ["IMAGE_FOLDER=${var.image_folder}", "TEMP_DIR=${var.temp_dir}"]
scripts = ["${path.root}/../scripts/build/Install-ServiceFabricSDK.ps1"] scripts = ["${path.root}/../scripts/build/Install-ServiceFabricSDK.ps1"]
} }
@@ -336,7 +344,7 @@ build {
} }
provisioner "powershell" { provisioner "powershell" {
environment_vars = ["IMAGE_FOLDER=${var.image_folder}"] environment_vars = ["IMAGE_FOLDER=${var.image_folder}", "TEMP_DIR=${var.temp_dir}"]
scripts = [ scripts = [
"${path.root}/../scripts/build/Install-ActionsCache.ps1", "${path.root}/../scripts/build/Install-ActionsCache.ps1",
"${path.root}/../scripts/build/Install-Ruby.ps1", "${path.root}/../scripts/build/Install-Ruby.ps1",
@@ -409,9 +417,10 @@ build {
provisioner "powershell" { provisioner "powershell" {
pause_before = "2m0s" pause_before = "2m0s"
environment_vars = ["IMAGE_FOLDER=${var.image_folder}"] environment_vars = ["IMAGE_FOLDER=${var.image_folder}", "TEMP_DIR=${var.temp_dir}"]
scripts = [ scripts = [
"${path.root}/../scripts/build/Install-WindowsUpdatesAfterReboot.ps1", "${path.root}/../scripts/build/Install-WindowsUpdatesAfterReboot.ps1",
"${path.root}/../scripts/build/Invoke-Cleanup.ps1",
"${path.root}/../scripts/tests/RunAll-Tests.ps1" "${path.root}/../scripts/tests/RunAll-Tests.ps1"
] ]
} }

27
images/windows/templates/windows-2022.pkr.hcl
View File

@@ -72,6 +72,11 @@ variable "imagedata_file" {
default = "C:\\imagedata.json" default = "C:\\imagedata.json"
} }
variable "temp_dir" {
type = string
default = "D:\\temp"
}
variable "install_password" { variable "install_password" {
type = string type = string
default = "" default = ""
@@ -190,7 +195,10 @@ build {
sources = ["source.azure-arm.image"] sources = ["source.azure-arm.image"]
provisioner "powershell" { provisioner "powershell" {
inline = ["New-Item -Path ${var.image_folder} -ItemType Directory -Force"] inline = [
"New-Item -Path ${var.image_folder} -ItemType Directory -Force",
"New-Item -Path ${var.temp_dir} -ItemType Directory -Force"
]
} }
provisioner "file" { provisioner "file" {
@@ -242,7 +250,7 @@ build {
} }
provisioner "powershell" { provisioner "powershell" {
environment_vars = ["IMAGE_VERSION=${var.image_version}", "IMAGE_OS=${var.image_os}", "AGENT_TOOLSDIRECTORY=${var.agent_tools_directory}", "IMAGEDATA_FILE=${var.imagedata_file}", "IMAGE_FOLDER=${var.image_folder}"] environment_vars = ["IMAGE_VERSION=${var.image_version}", "IMAGE_OS=${var.image_os}", "AGENT_TOOLSDIRECTORY=${var.agent_tools_directory}", "IMAGEDATA_FILE=${var.imagedata_file}", "IMAGE_FOLDER=${var.image_folder}", "TEMP_DIR=${var.temp_dir}"]
execution_policy = "unrestricted" execution_policy = "unrestricted"
scripts = [ scripts = [
"${path.root}/../scripts/build/Configure-WindowsDefender.ps1", "${path.root}/../scripts/build/Configure-WindowsDefender.ps1",
@@ -268,7 +276,7 @@ build {
} }
provisioner "powershell" { provisioner "powershell" {
environment_vars = ["IMAGE_FOLDER=${var.image_folder}"] environment_vars = ["IMAGE_FOLDER=${var.image_folder}", "TEMP_DIR=${var.temp_dir}"]
scripts = [ scripts = [
"${path.root}/../scripts/build/Install-Docker.ps1", "${path.root}/../scripts/build/Install-Docker.ps1",
"${path.root}/../scripts/build/Install-DockerWinCred.ps1", "${path.root}/../scripts/build/Install-DockerWinCred.ps1",
@@ -287,7 +295,7 @@ build {
provisioner "powershell" { provisioner "powershell" {
elevated_password = "${var.install_password}" elevated_password = "${var.install_password}"
elevated_user = "${var.install_user}" elevated_user = "${var.install_user}"
environment_vars = ["IMAGE_FOLDER=${var.image_folder}"] environment_vars = ["IMAGE_FOLDER=${var.image_folder}", "TEMP_DIR=${var.temp_dir}"]
scripts = [ scripts = [
"${path.root}/../scripts/build/Install-VisualStudio.ps1", "${path.root}/../scripts/build/Install-VisualStudio.ps1",
"${path.root}/../scripts/build/Install-KubernetesTools.ps1" "${path.root}/../scripts/build/Install-KubernetesTools.ps1"
@@ -302,7 +310,7 @@ build {
provisioner "powershell" { provisioner "powershell" {
pause_before = "2m0s" pause_before = "2m0s"
environment_vars = ["IMAGE_FOLDER=${var.image_folder}"] environment_vars = ["IMAGE_FOLDER=${var.image_folder}", "TEMP_DIR=${var.temp_dir}"]
scripts = [ scripts = [
"${path.root}/../scripts/build/Install-Wix.ps1", "${path.root}/../scripts/build/Install-Wix.ps1",
"${path.root}/../scripts/build/Install-WDK.ps1", "${path.root}/../scripts/build/Install-WDK.ps1",
@@ -318,7 +326,7 @@ build {
provisioner "powershell" { provisioner "powershell" {
execution_policy = "remotesigned" execution_policy = "remotesigned"
environment_vars = ["IMAGE_FOLDER=${var.image_folder}"] environment_vars = ["IMAGE_FOLDER=${var.image_folder}", "TEMP_DIR=${var.temp_dir}"]
scripts = ["${path.root}/../scripts/build/Install-ServiceFabricSDK.ps1"] scripts = ["${path.root}/../scripts/build/Install-ServiceFabricSDK.ps1"]
} }
@@ -331,7 +339,7 @@ build {
} }
provisioner "powershell" { provisioner "powershell" {
environment_vars = ["IMAGE_FOLDER=${var.image_folder}"] environment_vars = ["IMAGE_FOLDER=${var.image_folder}", "TEMP_DIR=${var.temp_dir}"]
scripts = [ scripts = [
"${path.root}/../scripts/build/Install-ActionsCache.ps1", "${path.root}/../scripts/build/Install-ActionsCache.ps1",
"${path.root}/../scripts/build/Install-Ruby.ps1", "${path.root}/../scripts/build/Install-Ruby.ps1",
@@ -385,7 +393,7 @@ build {
provisioner "powershell" { provisioner "powershell" {
elevated_password = "${var.install_password}" elevated_password = "${var.install_password}"
elevated_user = "${var.install_user}" elevated_user = "${var.install_user}"
environment_vars = ["IMAGE_FOLDER=${var.image_folder}"] environment_vars = ["IMAGE_FOLDER=${var.image_folder}", "TEMP_DIR=${var.temp_dir}"]
scripts = [ scripts = [
"${path.root}/../scripts/build/Install-WindowsUpdates.ps1", "${path.root}/../scripts/build/Install-WindowsUpdates.ps1",
"${path.root}/../scripts/build/Configure-DynamicPort.ps1", "${path.root}/../scripts/build/Configure-DynamicPort.ps1",
@@ -404,9 +412,10 @@ build {
provisioner "powershell" { provisioner "powershell" {
pause_before = "2m0s" pause_before = "2m0s"
environment_vars = ["IMAGE_FOLDER=${var.image_folder}"] environment_vars = ["IMAGE_FOLDER=${var.image_folder}", "TEMP_DIR=${var.temp_dir}"]
scripts = [ scripts = [
"${path.root}/../scripts/build/Install-WindowsUpdatesAfterReboot.ps1", "${path.root}/../scripts/build/Install-WindowsUpdatesAfterReboot.ps1",
"${path.root}/../scripts/build/Invoke-Cleanup.ps1",
"${path.root}/../scripts/tests/RunAll-Tests.ps1" "${path.root}/../scripts/tests/RunAll-Tests.ps1"
] ]
} }