actions/runner-images-sangeeth
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'main' into releases/macos-13-arm64/20240728-docs

Browse Source
This commit is contained in:
Actions service account
2024-08-01 15:53:47 +00:00
parent 7a96efa872 051836e832
commit 869f895d83
11 changed files with 57 additions and 90 deletions
Download Patch File Download Diff File Expand all files Collapse all files
images.CI/linux-and-win/build-image.ps1
+3 -1
View File
@@ -10,7 +10,8 @@ param(
[String] [Parameter (Mandatory=$true)] $TenantId, [String] [Parameter (Mandatory=$true)] $TenantId,
[String] [Parameter (Mandatory=$false)] $VirtualNetworkName, [String] [Parameter (Mandatory=$false)] $VirtualNetworkName,
[String] [Parameter (Mandatory=$false)] $VirtualNetworkRG, [String] [Parameter (Mandatory=$false)] $VirtualNetworkRG,
[String] [Parameter (Mandatory=$false)] $VirtualNetworkSubnet [String] [Parameter (Mandatory=$false)] $VirtualNetworkSubnet,
[String] [Parameter (Mandatory=$false)] $AllowedInboundIpAddresses = "[]"
) )
if (-not (Test-Path $TemplatePath)) if (-not (Test-Path $TemplatePath))
@@ -54,6 +55,7 @@ packer build -var "client_id=$ClientId" `
-var "virtual_network_name=$VirtualNetworkName" ` -var "virtual_network_name=$VirtualNetworkName" `
-var "virtual_network_resource_group_name=$VirtualNetworkRG" ` -var "virtual_network_resource_group_name=$VirtualNetworkRG" `
-var "virtual_network_subnet_name=$VirtualNetworkSubnet" ` -var "virtual_network_subnet_name=$VirtualNetworkSubnet" `
-var "allowed_inbound_ip_addresses=$($AllowedInboundIpAddresses)" `
-color=false ` -color=false `
$TemplatePath ` $TemplatePath `
| Where-Object { | Where-Object {
images/macos/macos-13-Readme.md
+24 -25
View File
@@ -1,12 +1,11 @@
| Announcements | | Announcements |
|-| |-|
| [[macOS] GCC 11 will be removed from all macOS images on August 12](https://github.com/actions/runner-images/issues/10213) | | [[macOS] GCC 11 will be removed from all macOS images on August 12](https://github.com/actions/runner-images/issues/10213) |
| [[macOS] Default Xcode on macOS 14 Sonoma will be set to Xcode 15.4 on July, 22](https://github.com/actions/runner-images/issues/10121) |
*** ***
# macOS 13 # macOS 13
- OS Version: macOS 13.6.7 (22G720) - OS Version: macOS 13.6.7 (22G720)
- Kernel Version: Darwin 22.6.0 - Kernel Version: Darwin 22.6.0
- Image Version: 20240721.3 - Image Version: 20240728.2
## Installed Software ## Installed Software
@@ -39,10 +38,10 @@
- Homebrew 4.3.10 - Homebrew 4.3.10
- NPM 10.7.0 - NPM 10.7.0
- NuGet 6.3.1.1 - NuGet 6.3.1.1
- Pip3 24.1.2 (python 3.12) - Pip3 24.2 (python 3.12)
- Pipx 1.6.0 - Pipx 1.6.0
- RubyGems 3.5.16 - RubyGems 3.5.16
- Vcpkg 2024 (build from commit 821100d96) - Vcpkg 2024 (build from commit cacf59943)
- Yarn 1.22.22 - Yarn 1.22.22
### Project Management ### Project Management
@@ -57,7 +56,7 @@
- bazel 7.2.1 - bazel 7.2.1
- bazelisk 1.20.0 - bazelisk 1.20.0
- bsdtar 3.5.3 - available by 'tar' alias - bsdtar 3.5.3 - available by 'tar' alias
- Curl 8.8.0 - Curl 8.9.0
- Git 2.45.2 - Git 2.45.2
- Git LFS 3.5.1 - Git LFS 3.5.1
- GitHub CLI 2.53.0 - GitHub CLI 2.53.0
@@ -72,17 +71,17 @@
- zstd 1.5.6 - zstd 1.5.6
### Tools ### Tools
- AWS CLI 2.17.14 - AWS CLI 2.17.18
- AWS SAM CLI 1.120.0 - AWS SAM CLI 1.120.0
- AWS Session Manager CLI 1.2.650.0 - AWS Session Manager CLI 1.2.650.0
- Azure CLI 2.62.0 - Azure CLI 2.62.0
- Azure CLI (azure-devops) 1.0.1 - Azure CLI (azure-devops) 1.0.1
- Bicep CLI 0.29.45 - Bicep CLI 0.29.47
- Cmake 3.30.1 - Cmake 3.30.1
- CodeQL Action Bundle 2.18.0 - CodeQL Action Bundle 2.18.1
- Fastlane 2.221.1 - Fastlane 2.222.0
- SwiftFormat 0.54.1 - SwiftFormat 0.54.3
- Xcbeautify 2.4.1 - Xcbeautify 2.5.0
- Xcode Command Line Tools 14.3.1.0.1.1683849156 - Xcode Command Line Tools 14.3.1.0.1.1683849156
- Xcodes 1.5.0 - Xcodes 1.5.0
@@ -92,12 +91,12 @@
### Browsers ### Browsers
- Safari 17.5 (18618.2.12.111.5) - Safari 17.5 (18618.2.12.111.5)
- SafariDriver 17.5 (18618.2.12.111.5) - SafariDriver 17.5 (18618.2.12.111.5)
- Google Chrome 126.0.6478.183 - Google Chrome 127.0.6533.73
- Google Chrome for Testing 126.0.6478.182 - Google Chrome for Testing 127.0.6533.72
- ChromeDriver 126.0.6478.182 - ChromeDriver 127.0.6533.72
- Microsoft Edge 126.0.2592.113 - Microsoft Edge 127.0.2651.74
- Microsoft Edge WebDriver 126.0.2592.102 - Microsoft Edge WebDriver 127.0.2651.78
- Mozilla Firefox 128.0 - Mozilla Firefox 128.0.3
- geckodriver 0.34.0 - geckodriver 0.34.0
- Selenium server 4.23.0 - Selenium server 4.23.0
@@ -111,7 +110,7 @@
### Java ### Java
| Version | Environment Variable | | Version | Environment Variable |
| ------------------- | -------------------- | | ------------------- | -------------------- |
| 8.0.422+5 | JAVA_HOME_8_X64 | | 8.0.422+5.1 | JAVA_HOME_8_X64 |
| 11.0.24+8 | JAVA_HOME_11_X64 | | 11.0.24+8 | JAVA_HOME_11_X64 |
| 17.0.12+7 (default) | JAVA_HOME_17_X64 | | 17.0.12+7 (default) | JAVA_HOME_17_X64 |
| 21.0.4+7.0 | JAVA_HOME_21_X64 | | 21.0.4+7.0 | JAVA_HOME_21_X64 |
@@ -139,7 +138,7 @@
#### Node.js #### Node.js
- 16.20.2 - 16.20.2
- 18.20.4 - 18.20.4
- 20.15.1 - 20.16.0
#### Go #### Go
- 1.20.14 - 1.20.14
@@ -147,17 +146,17 @@
- 1.22.5 - 1.22.5
### Rust Tools ### Rust Tools
- Cargo 1.79.0 - Cargo 1.80.0
- Rust 1.79.0 - Rust 1.80.0
- Rustdoc 1.79.0 - Rustdoc 1.80.0
- Rustup 1.27.1 - Rustup 1.27.1
#### Packages #### Packages
- Clippy 0.1.79 - Clippy 0.1.80
- Rustfmt 1.7.0-stable - Rustfmt 1.7.0-stable
### PowerShell Tools ### PowerShell Tools
- PowerShell 7.4.3 - PowerShell 7.4.4
#### PowerShell Modules #### PowerShell Modules
- Az: 12.1.0 - Az: 12.1.0
@@ -211,8 +210,8 @@
| Simulator - visionOS 1.0 | xrsimulator1.0 | 15.2 | | Simulator - visionOS 1.0 | xrsimulator1.0 | 15.2 |
| visionOS 1.0 | xros1.0 | 15.2 | | visionOS 1.0 | xros1.0 | 15.2 |
| Asset Runtime SDK for macOS hosts targeting watchOS 9.4 | assetruntime.host.macosx.target.watchos9.4 | 14.3.1 | | Asset Runtime SDK for macOS hosts targeting watchOS 9.4 | assetruntime.host.macosx.target.watchos9.4 | 14.3.1 |
| Asset Runtime SDK for macOS hosts targeting tvOS 16.4 | assetruntime.host.macosx.target.appletvos16.4 | 14.3.1 |
| Asset Runtime SDK for macOS hosts targeting iOS 16.4 | assetruntime.host.macosx.target.iphoneos16.4 | 14.3.1 | | Asset Runtime SDK for macOS hosts targeting iOS 16.4 | assetruntime.host.macosx.target.iphoneos16.4 | 14.3.1 |
| Asset Runtime SDK for macOS hosts targeting tvOS 16.4 | assetruntime.host.macosx.target.appletvos16.4 | 14.3.1 |
| DriverKit 22.1 | driverkit22.1 | 14.1 | | DriverKit 22.1 | driverkit22.1 | 14.1 |
| DriverKit 22.2 | driverkit22.2 | 14.2 | | DriverKit 22.2 | driverkit22.2 | 14.2 |
| DriverKit 22.4 | driverkit22.4 | 14.3.1 | | DriverKit 22.4 | driverkit22.4 | 14.3.1 |
images/macos/macos-14-Readme.md
+24 -25
View File
@@ -1,12 +1,11 @@
| Announcements | | Announcements |
|-| |-|
| [[macOS] GCC 11 will be removed from all macOS images on August 12](https://github.com/actions/runner-images/issues/10213) | | [[macOS] GCC 11 will be removed from all macOS images on August 12](https://github.com/actions/runner-images/issues/10213) |
| [[macOS] Default Xcode on macOS 14 Sonoma will be set to Xcode 15.4 on July, 22](https://github.com/actions/runner-images/issues/10121) |
*** ***
# macOS 14 # macOS 14
- OS Version: macOS 14.5 (23F79) - OS Version: macOS 14.5 (23F79)
- Kernel Version: Darwin 23.5.0 - Kernel Version: Darwin 23.5.0
- Image Version: 20240722.3 - Image Version: 20240728.1
## Installed Software ## Installed Software
@@ -39,7 +38,7 @@
- Homebrew 4.3.10 - Homebrew 4.3.10
- NPM 10.7.0 - NPM 10.7.0
- NuGet 6.3.1.1 - NuGet 6.3.1.1
- Pip3 24.1.2 (python 3.12) - Pip3 24.2 (python 3.12)
- Pipx 1.6.0 - Pipx 1.6.0
- RubyGems 3.5.16 - RubyGems 3.5.16
- Yarn 1.22.22 - Yarn 1.22.22
@@ -56,7 +55,7 @@
- bazel 7.2.1 - bazel 7.2.1
- bazelisk 1.20.0 - bazelisk 1.20.0
- bsdtar 3.5.3 - available by 'tar' alias - bsdtar 3.5.3 - available by 'tar' alias
- Curl 8.8.0 - Curl 8.9.0
- Git 2.45.2 - Git 2.45.2
- Git LFS 3.5.1 - Git LFS 3.5.1
- GitHub CLI 2.53.0 - GitHub CLI 2.53.0
@@ -71,17 +70,17 @@
- zstd 1.5.6 - zstd 1.5.6
### Tools ### Tools
- AWS CLI 2.17.14 - AWS CLI 2.17.18
- AWS SAM CLI 1.120.0 - AWS SAM CLI 1.120.0
- AWS Session Manager CLI 1.2.650.0 - AWS Session Manager CLI 1.2.650.0
- Azure CLI 2.62.0 - Azure CLI 2.62.0
- Azure CLI (azure-devops) 1.0.1 - Azure CLI (azure-devops) 1.0.1
- Bicep CLI 0.29.45 - Bicep CLI 0.29.47
- Cmake 3.30.1 - Cmake 3.30.1
- CodeQL Action Bundle 2.18.0 - CodeQL Action Bundle 2.18.1
- Fastlane 2.221.1 - Fastlane 2.222.0
- SwiftFormat 0.54.2 - SwiftFormat 0.54.2
- Xcbeautify 2.4.1 - Xcbeautify 2.5.0
- Xcode Command Line Tools 15.3.0.0.1.1708646388 - Xcode Command Line Tools 15.3.0.0.1.1708646388
- Xcodes 1.5.0 - Xcodes 1.5.0
@@ -91,12 +90,12 @@
### Browsers ### Browsers
- Safari 17.5 (19618.2.12.11.6) - Safari 17.5 (19618.2.12.11.6)
- SafariDriver 17.5 (19618.2.12.11.6) - SafariDriver 17.5 (19618.2.12.11.6)
- Google Chrome 126.0.6478.183 - Google Chrome 127.0.6533.73
- Google Chrome for Testing 126.0.6478.182 - Google Chrome for Testing 127.0.6533.72
- ChromeDriver 126.0.6478.182 - ChromeDriver 127.0.6533.72
- Microsoft Edge 126.0.2592.113 - Microsoft Edge 127.0.2651.74
- Microsoft Edge WebDriver 126.0.2592.102 - Microsoft Edge WebDriver 127.0.2651.78
- Mozilla Firefox 128.0 - Mozilla Firefox 128.0.3
- geckodriver 0.34.0 - geckodriver 0.34.0
- Selenium server 4.23.0 - Selenium server 4.23.0
@@ -110,7 +109,7 @@
### Java ### Java
| Version | Environment Variable | | Version | Environment Variable |
| -------------------- | -------------------- | | -------------------- | -------------------- |
| 8.0.422+5 | JAVA_HOME_8_X64 | | 8.0.422+5.1 | JAVA_HOME_8_X64 |
| 11.0.24+8 | JAVA_HOME_11_X64 | | 11.0.24+8 | JAVA_HOME_11_X64 |
| 17.0.12+7 | JAVA_HOME_17_X64 | | 17.0.12+7 | JAVA_HOME_17_X64 |
| 21.0.4+7.0 (default) | JAVA_HOME_21_X64 | | 21.0.4+7.0 (default) | JAVA_HOME_21_X64 |
@@ -129,7 +128,7 @@
#### Node.js #### Node.js
- 18.20.4 - 18.20.4
- 20.15.1 - 20.16.0
#### Go #### Go
- 1.20.14 - 1.20.14
@@ -137,17 +136,17 @@
- 1.22.5 - 1.22.5
### Rust Tools ### Rust Tools
- Cargo 1.79.0 - Cargo 1.80.0
- Rust 1.79.0 - Rust 1.80.0
- Rustdoc 1.79.0 - Rustdoc 1.80.0
- Rustup 1.27.1 - Rustup 1.27.1
#### Packages #### Packages
- Clippy 0.1.79 - Clippy 0.1.80
- Rustfmt 1.7.0-stable - Rustfmt 1.7.0-stable
### PowerShell Tools ### PowerShell Tools
- PowerShell 7.4.3 - PowerShell 7.4.4
#### PowerShell Modules #### PowerShell Modules
- Az: 12.1.0 - Az: 12.1.0
@@ -157,7 +156,7 @@
### Xcode ### Xcode
| Version | Build | Path | | Version | Build | Path |
| -------------- | -------- | --------------------------------- | | -------------- | -------- | --------------------------------- |
| 16.0 (beta) | 16A5202i | /Applications/Xcode_16_beta_3.app | | 16.0 (beta) | 16A5211f | /Applications/Xcode_16_beta_4.app |
| 15.4 (default) | 15F31d | /Applications/Xcode_15.4.app | | 15.4 (default) | 15F31d | /Applications/Xcode_15.4.app |
| 15.3 | 15E204a | /Applications/Xcode_15.3.app | | 15.3 | 15E204a | /Applications/Xcode_15.3.app |
| 15.2 | 15C500b | /Applications/Xcode_15.2.app | | 15.2 | 15C500b | /Applications/Xcode_15.2.app |
@@ -210,8 +209,8 @@
| Simulator - watchOS 10.4 | watchsimulator10.4 | 15.3 | | Simulator - watchOS 10.4 | watchsimulator10.4 | 15.3 |
| Simulator - watchOS 10.5 | watchsimulator10.5 | 15.4 | | Simulator - watchOS 10.5 | watchsimulator10.5 | 15.4 |
| Simulator - watchOS 11.0 | watchsimulator11.0 | 16.0 | | Simulator - watchOS 11.0 | watchsimulator11.0 | 16.0 |
| Simulator - visionOS 1.0 | xrsimulator1.0 | 15.2 |
| visionOS 1.0 | xros1.0 | 15.2 | | visionOS 1.0 | xros1.0 | 15.2 |
| Simulator - visionOS 1.0 | xrsimulator1.0 | 15.2 |
| visionOS 1.1 | xros1.1 | 15.3 | | visionOS 1.1 | xros1.1 | 15.3 |
| Simulator - visionOS 1.1 | xrsimulator1.1 | 15.3 | | Simulator - visionOS 1.1 | xrsimulator1.1 | 15.3 |
| Simulator - visionOS 1.2 | xrsimulator1.2 | 15.4 | | Simulator - visionOS 1.2 | xrsimulator1.2 | 15.4 |
@@ -219,8 +218,8 @@
| visionOS 2.0 | xros2.0 | 16.0 | | visionOS 2.0 | xros2.0 | 16.0 |
| Simulator - visionOS 2.0 | xrsimulator2.0 | 16.0 | | Simulator - visionOS 2.0 | xrsimulator2.0 | 16.0 |
| Asset Runtime SDK for macOS hosts targeting watchOS 9.4 | assetruntime.host.macosx.target.watchos9.4 | 14.3.1 | | Asset Runtime SDK for macOS hosts targeting watchOS 9.4 | assetruntime.host.macosx.target.watchos9.4 | 14.3.1 |
| Asset Runtime SDK for macOS hosts targeting iOS 16.4 | assetruntime.host.macosx.target.iphoneos16.4 | 14.3.1 |
| Asset Runtime SDK for macOS hosts targeting tvOS 16.4 | assetruntime.host.macosx.target.appletvos16.4 | 14.3.1 | | Asset Runtime SDK for macOS hosts targeting tvOS 16.4 | assetruntime.host.macosx.target.appletvos16.4 | 14.3.1 |
| Asset Runtime SDK for macOS hosts targeting iOS 16.4 | assetruntime.host.macosx.target.iphoneos16.4 | 14.3.1 |
| DriverKit 22.4 | driverkit22.4 | 14.3.1 | | DriverKit 22.4 | driverkit22.4 | 14.3.1 |
| DriverKit 23.0 | driverkit23.0 | 15.0.1 | | DriverKit 23.0 | driverkit23.0 | 15.0.1 |
| DriverKit 23.2 | driverkit23.2 | 15.1, 15.2 | | DriverKit 23.2 | driverkit23.2 | 15.1, 15.2 |
images/ubuntu/scripts/build/install-docker-compose.sh
-21
View File
@@ -1,21 +0,0 @@
#!/bin/bash -e
################################################################################
## File: install-docker-compose.sh
## Desc: Install Docker Compose v1
## Supply chain security: Docker Compose v1 - checksum validation
################################################################################
# Source the helpers for use with the script
source $HELPER_SCRIPTS/install.sh
# Download docker-compose v1 from releases
binary_path=$(download_with_retry "https://github.com/docker/compose/releases/download/1.29.2/docker-compose-Linux-x86_64")
# Supply chain security - Docker Compose v1
external_hash="f3f10cf3dbb8107e9ba2ea5f23c1d2159ff7321d16f0a23051d68d8e2547b323"
use_checksum_comparison "${binary_path}" "${external_hash}"
# Install docker-compose v1
install "${binary_path}" "/usr/local/bin/docker-compose"
invoke_tests "Tools" "Docker-compose v1"
images/ubuntu/scripts/docs-gen/Generate-SoftwareReport.ps1
-3
View File
@@ -111,9 +111,6 @@ $tools.AddToolVersion("Buildah", $(Get-BuildahVersion))
$tools.AddToolVersion("CMake", $(Get-CMakeVersion)) $tools.AddToolVersion("CMake", $(Get-CMakeVersion))
$tools.AddToolVersion("CodeQL Action Bundle", $(Get-CodeQLBundleVersion)) $tools.AddToolVersion("CodeQL Action Bundle", $(Get-CodeQLBundleVersion))
$tools.AddToolVersion("Docker Amazon ECR Credential Helper", $(Get-DockerAmazonECRCredHelperVersion)) $tools.AddToolVersion("Docker Amazon ECR Credential Helper", $(Get-DockerAmazonECRCredHelperVersion))
if ((Test-IsUbuntu20) -or (Test-IsUbuntu22)) {
$tools.AddToolVersion("Docker Compose v1", $(Get-DockerComposeV1Version))
}
$tools.AddToolVersion("Docker Compose v2", $(Get-DockerComposeV2Version)) $tools.AddToolVersion("Docker Compose v2", $(Get-DockerComposeV2Version))
$tools.AddToolVersion("Docker-Buildx", $(Get-DockerBuildxVersion)) $tools.AddToolVersion("Docker-Buildx", $(Get-DockerBuildxVersion))
$tools.AddToolVersion("Docker Client", $(Get-DockerClientVersion)) $tools.AddToolVersion("Docker Client", $(Get-DockerClientVersion))
images/ubuntu/scripts/docs-gen/SoftwareReport.Common.psm1
+1 -1
View File
@@ -131,7 +131,7 @@ function Get-LernaVersion {
} }
function Get-HomebrewVersion { function Get-HomebrewVersion {
$result = Get-CommandResult "/home/linuxbrew/.linuxbrew/bin/brew -v" $result = Get-CommandResult "/home/linuxbrew/.linuxbrew/bin/brew --version"
$result.Output -match "Homebrew (?<version>\d+\.\d+\.\d+)" | Out-Null $result.Output -match "Homebrew (?<version>\d+\.\d+\.\d+)" | Out-Null
return $Matches.version return $Matches.version
} }
images/ubuntu/scripts/docs-gen/SoftwareReport.Tools.psm1
+1 -4
View File
@@ -58,10 +58,7 @@ function Get-CMakeVersion {
return $cmakeVersion return $cmakeVersion
} }
function Get-DockerComposeV1Version {
$composeVersion = docker-compose -v | Get-StringPart -Part 2 | Get-StringPart -Part 0 -Delimiter ","
return $composeVersion
}
function Get-DockerComposeV2Version { function Get-DockerComposeV2Version {
$composeVersion = docker compose version | Get-StringPart -Part 3 | Get-StringPart -Part 0 -Delimiter "v" $composeVersion = docker compose version | Get-StringPart -Part 3 | Get-StringPart -Part 0 -Delimiter "v"
images/ubuntu/scripts/tests/Tools.Tests.ps1
-6
View File
@@ -121,12 +121,6 @@ Describe "Docker images" {
} }
} }
Describe "Docker-compose v1" -Skip:((-not (Test-IsUbuntu20)) -and (-not (Test-IsUbuntu22))) {
It "docker-compose" {
"docker-compose --version"| Should -ReturnZeroExitCode
}
}
Describe "Ansible" { Describe "Ansible" {
It "Ansible" { It "Ansible" {
"ansible --version" | Should -ReturnZeroExitCode "ansible --version" | Should -ReturnZeroExitCode
images/ubuntu/templates/ubuntu-20.04.pkr.hcl
+1 -1
View File
@@ -344,7 +344,7 @@ build {
provisioner "shell" { provisioner "shell" {
environment_vars = ["HELPER_SCRIPTS=${var.helper_script_folder}", "INSTALLER_SCRIPT_FOLDER=${var.installer_script_folder}", "DOCKERHUB_LOGIN=${var.dockerhub_login}", "DOCKERHUB_PASSWORD=${var.dockerhub_password}"] environment_vars = ["HELPER_SCRIPTS=${var.helper_script_folder}", "INSTALLER_SCRIPT_FOLDER=${var.installer_script_folder}", "DOCKERHUB_LOGIN=${var.dockerhub_login}", "DOCKERHUB_PASSWORD=${var.dockerhub_password}"]
execute_command = "sudo sh -c '{{ .Vars }} {{ .Path }}'" execute_command = "sudo sh -c '{{ .Vars }} {{ .Path }}'"
scripts = ["${path.root}/../scripts/build/install-docker-compose.sh", "${path.root}/../scripts/build/install-docker.sh"] scripts = ["${path.root}/../scripts/build/install-docker.sh"]
} }
provisioner "shell" { provisioner "shell" {
images/ubuntu/templates/ubuntu-22.04.pkr.hcl
+1 -1
View File
@@ -340,7 +340,7 @@ build {
provisioner "shell" { provisioner "shell" {
environment_vars = ["HELPER_SCRIPTS=${var.helper_script_folder}", "INSTALLER_SCRIPT_FOLDER=${var.installer_script_folder}", "DOCKERHUB_LOGIN=${var.dockerhub_login}", "DOCKERHUB_PASSWORD=${var.dockerhub_password}"] environment_vars = ["HELPER_SCRIPTS=${var.helper_script_folder}", "INSTALLER_SCRIPT_FOLDER=${var.installer_script_folder}", "DOCKERHUB_LOGIN=${var.dockerhub_login}", "DOCKERHUB_PASSWORD=${var.dockerhub_password}"]
execute_command = "sudo sh -c '{{ .Vars }} {{ .Path }}'" execute_command = "sudo sh -c '{{ .Vars }} {{ .Path }}'"
scripts = ["${path.root}/../scripts/build/install-docker-compose.sh", "${path.root}/../scripts/build/install-docker.sh"] scripts = ["${path.root}/../scripts/build/install-docker.sh"]
} }
provisioner "shell" { provisioner "shell" {
images/windows/toolsets/toolset-2019.json
+2 -2
View File
@@ -84,7 +84,7 @@
{"name": "PowerShellGet"}, {"name": "PowerShellGet"},
{"name": "PSScriptAnalyzer"}, {"name": "PSScriptAnalyzer"},
{"name": "PSWindowsUpdate"}, {"name": "PSWindowsUpdate"},
{"name": "SqlServer"}, {"name": "SqlServer", "versions": ["22.2.0"]},
{"name": "VSSetup"}, {"name": "VSSetup"},
{"name": "Microsoft.Graph"}, {"name": "Microsoft.Graph"},
{"name": "AWSPowershell"} {"name": "AWSPowershell"}
@@ -424,7 +424,7 @@
{ "name": "aria2" }, { "name": "aria2" },
{ "name": "azcopy10" }, { "name": "azcopy10" },
{ "name": "Bicep" }, { "name": "Bicep" },
{ "name": "gitversion.portable" }, { "name": "gitversion.portable", "args": [ "--version", "5.12.0"] },
{ "name": "innosetup" }, { "name": "innosetup" },
{ "name": "jq" }, { "name": "jq" },
{ "name": "NuGet.CommandLine" }, { "name": "NuGet.CommandLine" },