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

Merge pull request #1635 from hutson/refactor/formatting

Browse Source 
refactor: auto format JSON using VSC
This commit is contained in:
Maxim Lobanov
2020-09-27 13:26:25 +03:00
committed by GitHub
parent decb9c9b65 43d9476a37
commit e1bd620104
5 changed files with 111 additions and 97 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
images/linux/ubuntu1604.json
View File

@@ -24,7 +24,10 @@
"run_validation_diskspace": "false", "run_validation_diskspace": "false",
"announcements": "{{env `ANNOUNCEMENTS`}}" "announcements": "{{env `ANNOUNCEMENTS`}}"
}, },
"sensitive-variables": ["client_secret", "github_feed_token"], "sensitive-variables": [
"client_secret",
"github_feed_token"
],
"builders": [ "builders": [
{ {
"type": "azure-arm", "type": "azure-arm",
@@ -32,7 +35,6 @@
"client_secret": "{{user `client_secret`}}", "client_secret": "{{user `client_secret`}}",
"subscription_id": "{{user `subscription_id`}}", "subscription_id": "{{user `subscription_id`}}",
"tenant_id": "{{user `tenant_id`}}", "tenant_id": "{{user `tenant_id`}}",
"location": "{{user `location`}}", "location": "{{user `location`}}",
"vm_size": "{{user `vm_size`}}", "vm_size": "{{user `vm_size`}}",
"resource_group_name": "{{user `resource_group`}}", "resource_group_name": "{{user `resource_group`}}",
@@ -62,7 +64,7 @@
}, },
{ {
"type": "shell", "type": "shell",
"scripts":[ "scripts": [
"{{template_dir}}/scripts/base/repos.sh" "{{template_dir}}/scripts/base/repos.sh"
], ],
"execute_command": "sudo sh -c '{{ .Vars }} {{ .Path }}'" "execute_command": "sudo sh -c '{{ .Vars }} {{ .Path }}'"
@@ -104,7 +106,7 @@
}, },
{ {
"type": "shell", "type": "shell",
"scripts":[ "scripts": [
"{{template_dir}}/scripts/installers/preimagedata.sh" "{{template_dir}}/scripts/installers/preimagedata.sh"
], ],
"environment_vars": [ "environment_vars": [
@@ -218,7 +220,7 @@
}, },
{ {
"type": "shell", "type": "shell",
"scripts":[ "scripts": [
"{{template_dir}}/scripts/installers/Install-Toolset.ps1", "{{template_dir}}/scripts/installers/Install-Toolset.ps1",
"{{template_dir}}/scripts/installers/Configure-Toolset.ps1", "{{template_dir}}/scripts/installers/Configure-Toolset.ps1",
"{{template_dir}}/scripts/installers/Validate-Toolset.ps1" "{{template_dir}}/scripts/installers/Validate-Toolset.ps1"
@@ -270,14 +272,14 @@
}, },
{ {
"type": "shell", "type": "shell",
"scripts":[ "scripts": [
"{{template_dir}}/scripts/installers/cleanup.sh" "{{template_dir}}/scripts/installers/cleanup.sh"
], ],
"execute_command": "sudo sh -c '{{ .Vars }} {{ .Path }}'" "execute_command": "sudo sh -c '{{ .Vars }} {{ .Path }}'"
}, },
{ {
"type": "shell", "type": "shell",
"scripts":[ "scripts": [
"{{template_dir}}/scripts/installers/Install-PowerShellModules.ps1" "{{template_dir}}/scripts/installers/Install-PowerShellModules.ps1"
], ],
"environment_vars": [ "environment_vars": [
@@ -290,7 +292,7 @@
"inline": [ "inline": [
"pwsh -File {{user `image_folder`}}/SoftwareReport/SoftwareReport.Generator.ps1 -OutputDirectory {{user `image_folder`}}" "pwsh -File {{user `image_folder`}}/SoftwareReport/SoftwareReport.Generator.ps1 -OutputDirectory {{user `image_folder`}}"
], ],
"environment_vars":[ "environment_vars": [
"IMAGE_VERSION={{user `image_version`}}", "IMAGE_VERSION={{user `image_version`}}",
"INSTALLER_SCRIPT_FOLDER={{user `installer_script_folder`}}", "INSTALLER_SCRIPT_FOLDER={{user `installer_script_folder`}}",
"ANNOUNCEMENTS={{user `announcements`}}" "ANNOUNCEMENTS={{user `announcements`}}"
@@ -316,7 +318,7 @@
}, },
{ {
"type": "shell", "type": "shell",
"scripts":[ "scripts": [
"{{template_dir}}/scripts/installers/validate-disk-space.sh" "{{template_dir}}/scripts/installers/validate-disk-space.sh"
], ],
"environment_vars": [ "environment_vars": [

20
images/linux/ubuntu1804.json
View File

@@ -24,7 +24,10 @@
"run_validation_diskspace": "false", "run_validation_diskspace": "false",
"announcements": "{{env `ANNOUNCEMENTS`}}" "announcements": "{{env `ANNOUNCEMENTS`}}"
}, },
"sensitive-variables": ["client_secret", "github_feed_token"], "sensitive-variables": [
"client_secret",
"github_feed_token"
],
"builders": [ "builders": [
{ {
"type": "azure-arm", "type": "azure-arm",
@@ -32,7 +35,6 @@
"client_secret": "{{user `client_secret`}}", "client_secret": "{{user `client_secret`}}",
"subscription_id": "{{user `subscription_id`}}", "subscription_id": "{{user `subscription_id`}}",
"tenant_id": "{{user `tenant_id`}}", "tenant_id": "{{user `tenant_id`}}",
"location": "{{user `location`}}", "location": "{{user `location`}}",
"vm_size": "{{user `vm_size`}}", "vm_size": "{{user `vm_size`}}",
"resource_group_name": "{{user `resource_group`}}", "resource_group_name": "{{user `resource_group`}}",
@@ -62,7 +64,7 @@
}, },
{ {
"type": "shell", "type": "shell",
"scripts":[ "scripts": [
"{{template_dir}}/scripts/base/repos.sh" "{{template_dir}}/scripts/base/repos.sh"
], ],
"environment_vars": [ "environment_vars": [
@@ -107,7 +109,7 @@
}, },
{ {
"type": "shell", "type": "shell",
"scripts":[ "scripts": [
"{{template_dir}}/scripts/installers/preimagedata.sh" "{{template_dir}}/scripts/installers/preimagedata.sh"
], ],
"environment_vars": [ "environment_vars": [
@@ -222,7 +224,7 @@
}, },
{ {
"type": "shell", "type": "shell",
"scripts":[ "scripts": [
"{{template_dir}}/scripts/installers/Install-Toolset.ps1", "{{template_dir}}/scripts/installers/Install-Toolset.ps1",
"{{template_dir}}/scripts/installers/Configure-Toolset.ps1", "{{template_dir}}/scripts/installers/Configure-Toolset.ps1",
"{{template_dir}}/scripts/installers/Validate-Toolset.ps1" "{{template_dir}}/scripts/installers/Validate-Toolset.ps1"
@@ -274,14 +276,14 @@
}, },
{ {
"type": "shell", "type": "shell",
"scripts":[ "scripts": [
"{{template_dir}}/scripts/installers/cleanup.sh" "{{template_dir}}/scripts/installers/cleanup.sh"
], ],
"execute_command": "sudo sh -c '{{ .Vars }} {{ .Path }}'" "execute_command": "sudo sh -c '{{ .Vars }} {{ .Path }}'"
}, },
{ {
"type": "shell", "type": "shell",
"scripts":[ "scripts": [
"{{template_dir}}/scripts/installers/Install-PowerShellModules.ps1" "{{template_dir}}/scripts/installers/Install-PowerShellModules.ps1"
], ],
"environment_vars": [ "environment_vars": [
@@ -294,7 +296,7 @@
"inline": [ "inline": [
"pwsh -File {{user `image_folder`}}/SoftwareReport/SoftwareReport.Generator.ps1 -OutputDirectory {{user `image_folder`}}" "pwsh -File {{user `image_folder`}}/SoftwareReport/SoftwareReport.Generator.ps1 -OutputDirectory {{user `image_folder`}}"
], ],
"environment_vars":[ "environment_vars": [
"IMAGE_VERSION={{user `image_version`}}", "IMAGE_VERSION={{user `image_version`}}",
"INSTALLER_SCRIPT_FOLDER={{user `installer_script_folder`}}", "INSTALLER_SCRIPT_FOLDER={{user `installer_script_folder`}}",
"ANNOUNCEMENTS={{user `announcements`}}" "ANNOUNCEMENTS={{user `announcements`}}"
@@ -320,7 +322,7 @@
}, },
{ {
"type": "shell", "type": "shell",
"scripts":[ "scripts": [
"{{template_dir}}/scripts/installers/validate-disk-space.sh" "{{template_dir}}/scripts/installers/validate-disk-space.sh"
], ],
"environment_vars": [ "environment_vars": [

18
images/linux/ubuntu2004.json
View File

@@ -26,7 +26,10 @@
"go_versions": "1.14", "go_versions": "1.14",
"announcements": "{{env `ANNOUNCEMENTS`}}" "announcements": "{{env `ANNOUNCEMENTS`}}"
}, },
"sensitive-variables": ["client_secret", "github_feed_token"], "sensitive-variables": [
"client_secret",
"github_feed_token"
],
"builders": [ "builders": [
{ {
"type": "azure-arm", "type": "azure-arm",
@@ -34,7 +37,6 @@
"client_secret": "{{user `client_secret`}}", "client_secret": "{{user `client_secret`}}",
"subscription_id": "{{user `subscription_id`}}", "subscription_id": "{{user `subscription_id`}}",
"tenant_id": "{{user `tenant_id`}}", "tenant_id": "{{user `tenant_id`}}",
"location": "{{user `location`}}", "location": "{{user `location`}}",
"vm_size": "{{user `vm_size`}}", "vm_size": "{{user `vm_size`}}",
"resource_group_name": "{{user `resource_group`}}", "resource_group_name": "{{user `resource_group`}}",
@@ -64,7 +66,7 @@
}, },
{ {
"type": "shell", "type": "shell",
"scripts":[ "scripts": [
"{{template_dir}}/scripts/base/repos.sh" "{{template_dir}}/scripts/base/repos.sh"
], ],
"environment_vars": [ "environment_vars": [
@@ -109,7 +111,7 @@
}, },
{ {
"type": "shell", "type": "shell",
"scripts":[ "scripts": [
"{{template_dir}}/scripts/installers/preimagedata.sh" "{{template_dir}}/scripts/installers/preimagedata.sh"
], ],
"environment_vars": [ "environment_vars": [
@@ -224,7 +226,7 @@
}, },
{ {
"type": "shell", "type": "shell",
"scripts":[ "scripts": [
"{{template_dir}}/scripts/installers/Install-Toolset.ps1", "{{template_dir}}/scripts/installers/Install-Toolset.ps1",
"{{template_dir}}/scripts/installers/Configure-Toolset.ps1", "{{template_dir}}/scripts/installers/Configure-Toolset.ps1",
"{{template_dir}}/scripts/installers/Validate-Toolset.ps1" "{{template_dir}}/scripts/installers/Validate-Toolset.ps1"
@@ -276,14 +278,14 @@
}, },
{ {
"type": "shell", "type": "shell",
"scripts":[ "scripts": [
"{{template_dir}}/scripts/installers/cleanup.sh" "{{template_dir}}/scripts/installers/cleanup.sh"
], ],
"execute_command": "sudo sh -c '{{ .Vars }} {{ .Path }}'" "execute_command": "sudo sh -c '{{ .Vars }} {{ .Path }}'"
}, },
{ {
"type": "shell", "type": "shell",
"scripts":[ "scripts": [
"{{template_dir}}/scripts/installers/Install-PowerShellModules.ps1" "{{template_dir}}/scripts/installers/Install-PowerShellModules.ps1"
], ],
"environment_vars": [ "environment_vars": [
@@ -296,7 +298,7 @@
"inline": [ "inline": [
"pwsh -File {{user `image_folder`}}/SoftwareReport/SoftwareReport.Generator.ps1 -OutputDirectory {{user `image_folder`}}" "pwsh -File {{user `image_folder`}}/SoftwareReport/SoftwareReport.Generator.ps1 -OutputDirectory {{user `image_folder`}}"
], ],
"environment_vars":[ "environment_vars": [
"IMAGE_VERSION={{user `image_version`}}", "IMAGE_VERSION={{user `image_version`}}",
"INSTALLER_SCRIPT_FOLDER={{user `installer_script_folder`}}", "INSTALLER_SCRIPT_FOLDER={{user `installer_script_folder`}}",
"ANNOUNCEMENTS={{user `announcements`}}" "ANNOUNCEMENTS={{user `announcements`}}"

74
images/win/Windows2016-Azure.json
View File

@@ -15,7 +15,6 @@
"private_virtual_network_with_public_ip": "{{env `PRIVATE_VIRTUAL_NETWORK_WITH_PUBLIC_IP`}}", "private_virtual_network_with_public_ip": "{{env `PRIVATE_VIRTUAL_NETWORK_WITH_PUBLIC_IP`}}",
"vm_size": "Standard_DS4_v2", "vm_size": "Standard_DS4_v2",
"run_scan_antivirus": "false", "run_scan_antivirus": "false",
"root_folder": "C:", "root_folder": "C:",
"toolset_json_path": "{{env `TEMP`}}\\toolset.json", "toolset_json_path": "{{env `TEMP`}}\\toolset.json",
"image_folder": "C:\\image", "image_folder": "C:\\image",
@@ -30,7 +29,11 @@
"github_feed_token": "{{env `GITHUB_FEED_TOKEN`}}", "github_feed_token": "{{env `GITHUB_FEED_TOKEN`}}",
"announcements": "{{env `ANNOUNCEMENTS`}}" "announcements": "{{env `ANNOUNCEMENTS`}}"
}, },
"sensitive-variables": ["install_password", "client_secret", "github_feed_token"], "sensitive-variables": [
"install_password",
"client_secret",
"github_feed_token"
],
"builders": [ "builders": [
{ {
"name": "vhd", "name": "vhd",
@@ -65,7 +68,7 @@
"provisioners": [ "provisioners": [
{ {
"type": "powershell", "type": "powershell",
"inline":[ "inline": [
"New-Item -Path {{user `image_folder`}} -ItemType Directory -Force" "New-Item -Path {{user `image_folder`}} -ItemType Directory -Force"
] ]
}, },
@@ -97,7 +100,7 @@
{ {
"type": "windows-shell", "type": "windows-shell",
"inline": [ "inline": [
"net user {{user `install_user`}} {{user `install_password`}} /add /passwordchg:no /passwordreq:yes /active:yes /Y" , "net user {{user `install_user`}} {{user `install_password`}} /add /passwordchg:no /passwordreq:yes /active:yes /Y",
"net localgroup Administrators {{user `install_user`}} /add", "net localgroup Administrators {{user `install_user`}} /add",
"winrm set winrm/config/service/auth @{Basic=\"true\"}", "winrm set winrm/config/service/auth @{Basic=\"true\"}",
"winrm get winrm/config/service/auth" "winrm get winrm/config/service/auth"
@@ -116,7 +119,7 @@
"TOOLSET_JSON_PATH={{user `toolset_json_path`}}", "TOOLSET_JSON_PATH={{user `toolset_json_path`}}",
"PSMODULES_ROOT_FOLDER={{user `psmodules_root_folder`}}" "PSMODULES_ROOT_FOLDER={{user `psmodules_root_folder`}}"
], ],
"scripts":[ "scripts": [
"{{ template_dir }}/scripts/Installers/Install-PowerShellModules.ps1", "{{ template_dir }}/scripts/Installers/Install-PowerShellModules.ps1",
"{{ template_dir }}/scripts/Installers/Initialize-VM.ps1", "{{ template_dir }}/scripts/Installers/Initialize-VM.ps1",
"{{ template_dir }}/scripts/Installers/Install-WebPlatformInstaller.ps1" "{{ template_dir }}/scripts/Installers/Install-WebPlatformInstaller.ps1"
@@ -125,7 +128,7 @@
}, },
{ {
"type": "powershell", "type": "powershell",
"scripts":[ "scripts": [
"{{ template_dir }}/scripts/Installers/Update-DotnetTLS.ps1", "{{ template_dir }}/scripts/Installers/Update-DotnetTLS.ps1",
"{{ template_dir }}/scripts/Installers/Install-ContainersFeature.ps1" "{{ template_dir }}/scripts/Installers/Install-ContainersFeature.ps1"
] ]
@@ -137,8 +140,8 @@
{ {
"type": "powershell", "type": "powershell",
"inline": [ "inline": [
"setx ImageVersion {{user `image_version` }} /m", "setx ImageVersion {{user `image_version` }} /m",
"setx ImageOS {{user `image_os` }} /m" "setx ImageOS {{user `image_os` }} /m"
] ]
}, },
{ {
@@ -147,7 +150,7 @@
"IMAGE_VERSION={{user `image_version`}}", "IMAGE_VERSION={{user `image_version`}}",
"IMAGEDATA_FILE={{user `imagedata_file`}}" "IMAGEDATA_FILE={{user `imagedata_file`}}"
], ],
"scripts":[ "scripts": [
"{{ template_dir }}/scripts/Installers/Update-ImageData.ps1", "{{ template_dir }}/scripts/Installers/Update-ImageData.ps1",
"{{ template_dir }}/scripts/Installers/Install-Docker.ps1", "{{ template_dir }}/scripts/Installers/Install-Docker.ps1",
"{{ template_dir }}/scripts/Installers/Install-PowershellCore.ps1" "{{ template_dir }}/scripts/Installers/Install-PowershellCore.ps1"
@@ -159,7 +162,7 @@
}, },
{ {
"type": "powershell", "type": "powershell",
"scripts":[ "scripts": [
"{{ template_dir }}/scripts/Installers/Update-DockerImages.ps1" "{{ template_dir }}/scripts/Installers/Update-DockerImages.ps1"
] ]
}, },
@@ -169,10 +172,10 @@
0, 0,
3010 3010
], ],
"environment_vars":[ "environment_vars": [
"TOOLSET_JSON_PATH={{user `toolset_json_path`}}" "TOOLSET_JSON_PATH={{user `toolset_json_path`}}"
], ],
"scripts":[ "scripts": [
"{{ template_dir }}/scripts/Installers/Install-VS.ps1", "{{ template_dir }}/scripts/Installers/Install-VS.ps1",
"{{ template_dir }}/scripts/Installers/Install-NET48.ps1", "{{ template_dir }}/scripts/Installers/Install-NET48.ps1",
"{{ template_dir }}/scripts/Installers/Windows2016/Install-SSDT.ps1" "{{ template_dir }}/scripts/Installers/Windows2016/Install-SSDT.ps1"
@@ -182,10 +185,10 @@
}, },
{ {
"type": "powershell", "type": "powershell",
"environment_vars":[ "environment_vars": [
"TOOLSET_JSON_PATH={{user `toolset_json_path`}}" "TOOLSET_JSON_PATH={{user `toolset_json_path`}}"
], ],
"scripts":[ "scripts": [
"{{ template_dir }}/scripts/Installers/Install-Nuget.ps1", "{{ template_dir }}/scripts/Installers/Install-Nuget.ps1",
"{{ template_dir }}/scripts/Installers/Install-Wix.ps1", "{{ template_dir }}/scripts/Installers/Install-Wix.ps1",
"{{ template_dir }}/scripts/Installers/Install-WDK.ps1", "{{ template_dir }}/scripts/Installers/Install-WDK.ps1",
@@ -194,7 +197,7 @@
}, },
{ {
"type": "powershell", "type": "powershell",
"scripts":[ "scripts": [
"{{ template_dir }}/scripts/Installers/Install-ServiceFabricSDK.ps1" "{{ template_dir }}/scripts/Installers/Install-ServiceFabricSDK.ps1"
], ],
"execution_policy": "remotesigned" "execution_policy": "remotesigned"
@@ -205,7 +208,7 @@
}, },
{ {
"type": "powershell", "type": "powershell",
"scripts":[ "scripts": [
"{{ template_dir }}/scripts/Installers/Install-AzureCli.ps1", "{{ template_dir }}/scripts/Installers/Install-AzureCli.ps1",
"{{ template_dir }}/scripts/Installers/Install-AzureDevOpsCli.ps1", "{{ template_dir }}/scripts/Installers/Install-AzureDevOpsCli.ps1",
"{{ template_dir }}/scripts/Installers/Install-AzCopy.ps1", "{{ template_dir }}/scripts/Installers/Install-AzCopy.ps1",
@@ -222,12 +225,12 @@
}, },
{ {
"type": "powershell", "type": "powershell",
"environment_vars":[ "environment_vars": [
"GITHUB_FEED_TOKEN={{ user `github_feed_token` }}", "GITHUB_FEED_TOKEN={{ user `github_feed_token` }}",
"TOOLSET_JSON_PATH={{user `toolset_json_path`}}", "TOOLSET_JSON_PATH={{user `toolset_json_path`}}",
"ROOT_FOLDER={{user `root_folder`}}" "ROOT_FOLDER={{user `root_folder`}}"
], ],
"scripts":[ "scripts": [
"{{ template_dir }}/scripts/Installers/Download-ToolCache.ps1", "{{ template_dir }}/scripts/Installers/Download-ToolCache.ps1",
"{{ template_dir }}/scripts/Installers/Install-PyPy.ps1", "{{ template_dir }}/scripts/Installers/Install-PyPy.ps1",
"{{ template_dir }}/scripts/Installers/Install-Toolset.ps1", "{{ template_dir }}/scripts/Installers/Install-Toolset.ps1",
@@ -238,7 +241,7 @@
}, },
{ {
"type": "powershell", "type": "powershell",
"scripts":[ "scripts": [
"{{ template_dir }}/scripts/Installers/Install-Sbt.ps1", "{{ template_dir }}/scripts/Installers/Install-Sbt.ps1",
"{{ template_dir }}/scripts/Installers/Install-OpenSSL.ps1", "{{ template_dir }}/scripts/Installers/Install-OpenSSL.ps1",
"{{ template_dir }}/scripts/Installers/Install-Perl.ps1", "{{ template_dir }}/scripts/Installers/Install-Perl.ps1",
@@ -257,7 +260,7 @@
}, },
{ {
"type": "powershell", "type": "powershell",
"scripts":[ "scripts": [
"{{ template_dir }}/scripts/Installers/Enable-DeveloperMode.ps1" "{{ template_dir }}/scripts/Installers/Enable-DeveloperMode.ps1"
], ],
"elevated_user": "{{user `install_user`}}", "elevated_user": "{{user `install_user`}}",
@@ -265,21 +268,23 @@
}, },
{ {
"type": "windows-shell", "type": "windows-shell",
"inline": ["wmic product where \"name like '%%microsoft azure powershell%%'\" call uninstall /nointeractive"] "inline": [
"wmic product where \"name like '%%microsoft azure powershell%%'\" call uninstall /nointeractive"
]
}, },
{ {
"type": "powershell", "type": "powershell",
"environment_vars":[ "environment_vars": [
"TOOLSET_JSON_PATH={{user `toolset_json_path`}}", "TOOLSET_JSON_PATH={{user `toolset_json_path`}}",
"PSMODULES_ROOT_FOLDER={{user `psmodules_root_folder`}}" "PSMODULES_ROOT_FOLDER={{user `psmodules_root_folder`}}"
], ],
"scripts":[ "scripts": [
"{{ template_dir }}/scripts/Installers/Install-AzureModules.ps1" "{{ template_dir }}/scripts/Installers/Install-AzureModules.ps1"
] ]
}, },
{ {
"type": "powershell", "type": "powershell",
"scripts":[ "scripts": [
"{{ template_dir }}/scripts/Installers/Install-VSWhere.ps1", "{{ template_dir }}/scripts/Installers/Install-VSWhere.ps1",
"{{ template_dir }}/scripts/Installers/Install-WinAppDriver.ps1", "{{ template_dir }}/scripts/Installers/Install-WinAppDriver.ps1",
"{{ template_dir }}/scripts/Installers/Install-Cmake.ps1", "{{ template_dir }}/scripts/Installers/Install-Cmake.ps1",
@@ -291,18 +296,17 @@
"{{ template_dir }}/scripts/Installers/Install-DotnetSDK.ps1" "{{ template_dir }}/scripts/Installers/Install-DotnetSDK.ps1"
] ]
}, },
{ {
"type": "powershell", "type": "powershell",
"elevated_user": "SYSTEM", "elevated_user": "SYSTEM",
"elevated_password": "", "elevated_password": "",
"scripts":[ "scripts": [
"{{ template_dir }}/scripts/Installers/Install-Msys2.ps1" "{{ template_dir }}/scripts/Installers/Install-Msys2.ps1"
] ]
}, },
{ {
"type": "powershell", "type": "powershell",
"scripts":[ "scripts": [
"{{ template_dir }}/scripts/Installers/Install-Mingw64.ps1", "{{ template_dir }}/scripts/Installers/Install-Mingw64.ps1",
"{{ template_dir }}/scripts/Installers/Install-TypeScript.ps1", "{{ template_dir }}/scripts/Installers/Install-TypeScript.ps1",
"{{ template_dir }}/scripts/Installers/Install-Haskell.ps1", "{{ template_dir }}/scripts/Installers/Install-Haskell.ps1",
@@ -326,7 +330,7 @@
}, },
{ {
"type": "powershell", "type": "powershell",
"scripts":[ "scripts": [
"{{ template_dir }}/scripts/Installers/Install-WindowsUpdates.ps1", "{{ template_dir }}/scripts/Installers/Install-WindowsUpdates.ps1",
"{{ template_dir }}/scripts/Installers/Configure-DynamicPort.ps1" "{{ template_dir }}/scripts/Installers/Configure-DynamicPort.ps1"
], ],
@@ -339,10 +343,10 @@
}, },
{ {
"type": "powershell", "type": "powershell",
"scripts":[ "scripts": [
"{{ template_dir }}/scripts/Tests/RunAll-Tests.ps1" "{{ template_dir }}/scripts/Tests/RunAll-Tests.ps1"
], ],
"environment_vars":[ "environment_vars": [
"TOOLSET_JSON_PATH={{user `toolset_json_path`}}", "TOOLSET_JSON_PATH={{user `toolset_json_path`}}",
"PSMODULES_ROOT_FOLDER={{user `psmodules_root_folder`}}", "PSMODULES_ROOT_FOLDER={{user `psmodules_root_folder`}}",
"ROOT_FOLDER={{user `root_folder`}}" "ROOT_FOLDER={{user `root_folder`}}"
@@ -353,7 +357,7 @@
"inline": [ "inline": [
"pwsh -File '{{user `image_folder`}}\\SoftwareReport\\SoftwareReport.Generator.ps1'" "pwsh -File '{{user `image_folder`}}\\SoftwareReport\\SoftwareReport.Generator.ps1'"
], ],
"environment_vars":[ "environment_vars": [
"TOOLSET_JSON_PATH={{user `toolset_json_path`}}", "TOOLSET_JSON_PATH={{user `toolset_json_path`}}",
"ANNOUNCEMENTS={{user `announcements`}}" "ANNOUNCEMENTS={{user `announcements`}}"
] ]
@@ -366,7 +370,7 @@
}, },
{ {
"type": "powershell", "type": "powershell",
"scripts":[ "scripts": [
"{{ template_dir }}/scripts/Installers/Finalize-VM.ps1" "{{ template_dir }}/scripts/Installers/Finalize-VM.ps1"
] ]
}, },
@@ -376,16 +380,16 @@
}, },
{ {
"type": "powershell", "type": "powershell",
"environment_vars":[ "environment_vars": [
"RUN_SCAN_ANTIVIRUS={{user `run_scan_antivirus`}}" "RUN_SCAN_ANTIVIRUS={{user `run_scan_antivirus`}}"
], ],
"scripts":[ "scripts": [
"{{ template_dir }}/scripts/Installers/Run-Antivirus.ps1" "{{ template_dir }}/scripts/Installers/Run-Antivirus.ps1"
] ]
}, },
{ {
"type": "powershell", "type": "powershell",
"scripts":[ "scripts": [
"{{ template_dir }}/scripts/Installers/Configure-Antivirus.ps1", "{{ template_dir }}/scripts/Installers/Configure-Antivirus.ps1",
"{{ template_dir }}/scripts/Installers/Disable-JITDebugger.ps1" "{{ template_dir }}/scripts/Installers/Disable-JITDebugger.ps1"
] ]

76
images/win/Windows2019-Azure.json
View File

@@ -15,7 +15,6 @@
"private_virtual_network_with_public_ip": "{{env `PRIVATE_VIRTUAL_NETWORK_WITH_PUBLIC_IP`}}", "private_virtual_network_with_public_ip": "{{env `PRIVATE_VIRTUAL_NETWORK_WITH_PUBLIC_IP`}}",
"vm_size": "Standard_D4_v2", "vm_size": "Standard_D4_v2",
"run_scan_antivirus": "false", "run_scan_antivirus": "false",
"root_folder": "C:", "root_folder": "C:",
"toolset_json_path": "{{env `TEMP`}}\\toolset.json", "toolset_json_path": "{{env `TEMP`}}\\toolset.json",
"image_folder": "C:\\image", "image_folder": "C:\\image",
@@ -30,7 +29,11 @@
"github_feed_token": "{{env `GITHUB_FEED_TOKEN`}}", "github_feed_token": "{{env `GITHUB_FEED_TOKEN`}}",
"announcements": "{{env `ANNOUNCEMENTS`}}" "announcements": "{{env `ANNOUNCEMENTS`}}"
}, },
"sensitive-variables": ["install_password", "client_secret", "github_feed_token"], "sensitive-variables": [
"install_password",
"client_secret",
"github_feed_token"
],
"builders": [ "builders": [
{ {
"name": "vhd", "name": "vhd",
@@ -65,7 +68,7 @@
"provisioners": [ "provisioners": [
{ {
"type": "powershell", "type": "powershell",
"inline":[ "inline": [
"New-Item -Path {{user `image_folder`}} -ItemType Directory -Force" "New-Item -Path {{user `image_folder`}} -ItemType Directory -Force"
] ]
}, },
@@ -97,7 +100,7 @@
{ {
"type": "windows-shell", "type": "windows-shell",
"inline": [ "inline": [
"net user {{user `install_user`}} {{user `install_password`}} /add /passwordchg:no /passwordreq:yes /active:yes /Y" , "net user {{user `install_user`}} {{user `install_password`}} /add /passwordchg:no /passwordreq:yes /active:yes /Y",
"net localgroup Administrators {{user `install_user`}} /add", "net localgroup Administrators {{user `install_user`}} /add",
"winrm set winrm/config/service/auth @{Basic=\"true\"}", "winrm set winrm/config/service/auth @{Basic=\"true\"}",
"winrm get winrm/config/service/auth" "winrm get winrm/config/service/auth"
@@ -116,7 +119,7 @@
"TOOLSET_JSON_PATH={{user `toolset_json_path`}}", "TOOLSET_JSON_PATH={{user `toolset_json_path`}}",
"PSMODULES_ROOT_FOLDER={{user `psmodules_root_folder`}}" "PSMODULES_ROOT_FOLDER={{user `psmodules_root_folder`}}"
], ],
"scripts":[ "scripts": [
"{{ template_dir }}/scripts/Installers/Install-PowerShellModules.ps1", "{{ template_dir }}/scripts/Installers/Install-PowerShellModules.ps1",
"{{ template_dir }}/scripts/Installers/Initialize-VM.ps1", "{{ template_dir }}/scripts/Installers/Initialize-VM.ps1",
"{{ template_dir }}/scripts/Installers/Install-WebPlatformInstaller.ps1" "{{ template_dir }}/scripts/Installers/Install-WebPlatformInstaller.ps1"
@@ -127,13 +130,13 @@
"type": "powershell", "type": "powershell",
"elevated_user": "SYSTEM", "elevated_user": "SYSTEM",
"elevated_password": "", "elevated_password": "",
"scripts":[ "scripts": [
"{{ template_dir }}/scripts/Installers/Windows2019/Install-WSL.ps1" "{{ template_dir }}/scripts/Installers/Windows2019/Install-WSL.ps1"
] ]
}, },
{ {
"type": "powershell", "type": "powershell",
"scripts":[ "scripts": [
"{{ template_dir }}/scripts/Installers/Update-DotnetTLS.ps1", "{{ template_dir }}/scripts/Installers/Update-DotnetTLS.ps1",
"{{ template_dir }}/scripts/Installers/Install-ContainersFeature.ps1" "{{ template_dir }}/scripts/Installers/Install-ContainersFeature.ps1"
] ]
@@ -141,8 +144,8 @@
{ {
"type": "powershell", "type": "powershell",
"inline": [ "inline": [
"setx ImageVersion {{user `image_version` }} /m", "setx ImageVersion {{user `image_version` }} /m",
"setx ImageOS {{user `image_os` }} /m" "setx ImageOS {{user `image_os` }} /m"
] ]
}, },
{ {
@@ -155,7 +158,7 @@
"IMAGE_VERSION={{user `image_version`}}", "IMAGE_VERSION={{user `image_version`}}",
"IMAGEDATA_FILE={{user `imagedata_file`}}" "IMAGEDATA_FILE={{user `imagedata_file`}}"
], ],
"scripts":[ "scripts": [
"{{ template_dir }}/scripts/Installers/Update-ImageData.ps1", "{{ template_dir }}/scripts/Installers/Update-ImageData.ps1",
"{{ template_dir }}/scripts/Installers/Install-Docker.ps1", "{{ template_dir }}/scripts/Installers/Install-Docker.ps1",
"{{ template_dir }}/scripts/Installers/Install-PowershellCore.ps1" "{{ template_dir }}/scripts/Installers/Install-PowershellCore.ps1"
@@ -167,7 +170,7 @@
}, },
{ {
"type": "powershell", "type": "powershell",
"scripts":[ "scripts": [
"{{ template_dir }}/scripts/Installers/Update-DockerImages.ps1" "{{ template_dir }}/scripts/Installers/Update-DockerImages.ps1"
] ]
}, },
@@ -177,10 +180,10 @@
0, 0,
3010 3010
], ],
"environment_vars":[ "environment_vars": [
"TOOLSET_JSON_PATH={{user `toolset_json_path`}}" "TOOLSET_JSON_PATH={{user `toolset_json_path`}}"
], ],
"scripts":[ "scripts": [
"{{ template_dir }}/scripts/Installers/Install-VS.ps1", "{{ template_dir }}/scripts/Installers/Install-VS.ps1",
"{{ template_dir }}/scripts/Installers/Install-NET48.ps1" "{{ template_dir }}/scripts/Installers/Install-NET48.ps1"
], ],
@@ -189,10 +192,10 @@
}, },
{ {
"type": "powershell", "type": "powershell",
"environment_vars":[ "environment_vars": [
"TOOLSET_JSON_PATH={{user `toolset_json_path`}}" "TOOLSET_JSON_PATH={{user `toolset_json_path`}}"
], ],
"scripts":[ "scripts": [
"{{ template_dir }}/scripts/Installers/Install-Nuget.ps1", "{{ template_dir }}/scripts/Installers/Install-Nuget.ps1",
"{{ template_dir }}/scripts/Installers/Install-Wix.ps1", "{{ template_dir }}/scripts/Installers/Install-Wix.ps1",
"{{ template_dir }}/scripts/Installers/Install-WDK.ps1", "{{ template_dir }}/scripts/Installers/Install-WDK.ps1",
@@ -210,7 +213,7 @@
}, },
{ {
"type": "powershell", "type": "powershell",
"scripts":[ "scripts": [
"{{ template_dir }}/scripts/Installers/Install-ServiceFabricSDK.ps1" "{{ template_dir }}/scripts/Installers/Install-ServiceFabricSDK.ps1"
], ],
"execution_policy": "remotesigned" "execution_policy": "remotesigned"
@@ -221,38 +224,39 @@
}, },
{ {
"type": "powershell", "type": "powershell",
"environment_vars":[ "environment_vars": [
"GITHUB_FEED_TOKEN={{ user `github_feed_token` }}", "GITHUB_FEED_TOKEN={{ user `github_feed_token` }}",
"ROOT_FOLDER={{user `root_folder`}}" "ROOT_FOLDER={{user `root_folder`}}"
], ],
"scripts":[ "scripts": [
"{{ template_dir }}/scripts/Installers/Download-ToolCache.ps1" "{{ template_dir }}/scripts/Installers/Download-ToolCache.ps1"
] ]
}, },
{ {
"type": "windows-shell", "type": "windows-shell",
"inline": ["wmic product where \"name like '%%microsoft azure powershell%%'\" call uninstall /nointeractive"] "inline": [
"wmic product where \"name like '%%microsoft azure powershell%%'\" call uninstall /nointeractive"
]
}, },
{ {
"type": "powershell", "type": "powershell",
"environment_vars":[ "environment_vars": [
"TOOLSET_JSON_PATH={{user `toolset_json_path`}}", "TOOLSET_JSON_PATH={{user `toolset_json_path`}}",
"ROOT_FOLDER={{user `root_folder`}}", "ROOT_FOLDER={{user `root_folder`}}",
"PSMODULES_ROOT_FOLDER={{user `psmodules_root_folder`}}" "PSMODULES_ROOT_FOLDER={{user `psmodules_root_folder`}}"
], ],
"scripts":[ "scripts": [
"{{ template_dir }}/scripts/Installers/Install-PyPy.ps1", "{{ template_dir }}/scripts/Installers/Install-PyPy.ps1",
"{{ template_dir }}/scripts/Installers/Install-Toolset.ps1", "{{ template_dir }}/scripts/Installers/Install-Toolset.ps1",
"{{ template_dir }}/scripts/Installers/Configure-Toolset.ps1", "{{ template_dir }}/scripts/Installers/Configure-Toolset.ps1",
"{{ template_dir }}/scripts/Installers/Install-YAMLLint.ps1", "{{ template_dir }}/scripts/Installers/Install-YAMLLint.ps1",
"{{ template_dir }}/scripts/Installers/Update-AndroidSDK.ps1", "{{ template_dir }}/scripts/Installers/Update-AndroidSDK.ps1",
"{{ template_dir }}/scripts/Installers/Install-AzureModules.ps1" "{{ template_dir }}/scripts/Installers/Install-AzureModules.ps1"
] ]
}, },
{ {
"type": "powershell", "type": "powershell",
"scripts":[ "scripts": [
"{{ template_dir }}/scripts/Installers/Install-OpenSSL.ps1", "{{ template_dir }}/scripts/Installers/Install-OpenSSL.ps1",
"{{ template_dir }}/scripts/Installers/Install-Perl.ps1", "{{ template_dir }}/scripts/Installers/Install-Perl.ps1",
"{{ template_dir }}/scripts/Installers/Install-Git.ps1", "{{ template_dir }}/scripts/Installers/Install-Git.ps1",
@@ -271,7 +275,7 @@
}, },
{ {
"type": "powershell", "type": "powershell",
"scripts":[ "scripts": [
"{{ template_dir }}/scripts/Installers/Enable-DeveloperMode.ps1" "{{ template_dir }}/scripts/Installers/Enable-DeveloperMode.ps1"
], ],
"elevated_user": "{{user `install_user`}}", "elevated_user": "{{user `install_user`}}",
@@ -281,13 +285,13 @@
"type": "powershell", "type": "powershell",
"elevated_user": "SYSTEM", "elevated_user": "SYSTEM",
"elevated_password": "", "elevated_password": "",
"scripts":[ "scripts": [
"{{ template_dir }}/scripts/Installers/Install-Msys2.ps1" "{{ template_dir }}/scripts/Installers/Install-Msys2.ps1"
] ]
}, },
{ {
"type": "powershell", "type": "powershell",
"scripts":[ "scripts": [
"{{ template_dir }}/scripts/Installers/Install-VSWhere.ps1", "{{ template_dir }}/scripts/Installers/Install-VSWhere.ps1",
"{{ template_dir }}/scripts/Installers/Install-WinAppDriver.ps1", "{{ template_dir }}/scripts/Installers/Install-WinAppDriver.ps1",
"{{ template_dir }}/scripts/Installers/Install-Cmake.ps1", "{{ template_dir }}/scripts/Installers/Install-Cmake.ps1",
@@ -324,7 +328,7 @@
}, },
{ {
"type": "powershell", "type": "powershell",
"scripts":[ "scripts": [
"{{ template_dir }}/scripts/Installers/Install-WindowsUpdates.ps1", "{{ template_dir }}/scripts/Installers/Install-WindowsUpdates.ps1",
"{{ template_dir }}/scripts/Installers/Configure-DynamicPort.ps1" "{{ template_dir }}/scripts/Installers/Configure-DynamicPort.ps1"
], ],
@@ -337,10 +341,10 @@
}, },
{ {
"type": "powershell", "type": "powershell",
"scripts":[ "scripts": [
"{{ template_dir }}/scripts/Tests/RunAll-Tests.ps1" "{{ template_dir }}/scripts/Tests/RunAll-Tests.ps1"
], ],
"environment_vars":[ "environment_vars": [
"TOOLSET_JSON_PATH={{user `toolset_json_path`}}", "TOOLSET_JSON_PATH={{user `toolset_json_path`}}",
"PSMODULES_ROOT_FOLDER={{user `psmodules_root_folder`}}", "PSMODULES_ROOT_FOLDER={{user `psmodules_root_folder`}}",
"ROOT_FOLDER={{user `root_folder`}}" "ROOT_FOLDER={{user `root_folder`}}"
@@ -351,7 +355,7 @@
"inline": [ "inline": [
"pwsh -File '{{user `image_folder`}}\\SoftwareReport\\SoftwareReport.Generator.ps1'" "pwsh -File '{{user `image_folder`}}\\SoftwareReport\\SoftwareReport.Generator.ps1'"
], ],
"environment_vars":[ "environment_vars": [
"TOOLSET_JSON_PATH={{user `toolset_json_path`}}", "TOOLSET_JSON_PATH={{user `toolset_json_path`}}",
"ANNOUNCEMENTS={{user `announcements`}}" "ANNOUNCEMENTS={{user `announcements`}}"
] ]
@@ -364,7 +368,7 @@
}, },
{ {
"type": "powershell", "type": "powershell",
"scripts":[ "scripts": [
"{{ template_dir }}/scripts/Installers/Finalize-VM.ps1" "{{ template_dir }}/scripts/Installers/Finalize-VM.ps1"
] ]
}, },
@@ -374,28 +378,28 @@
}, },
{ {
"type": "powershell", "type": "powershell",
"environment_vars":[ "environment_vars": [
"RUN_SCAN_ANTIVIRUS={{user `run_scan_antivirus`}}" "RUN_SCAN_ANTIVIRUS={{user `run_scan_antivirus`}}"
], ],
"scripts":[ "scripts": [
"{{ template_dir }}/scripts/Installers/Run-Antivirus.ps1" "{{ template_dir }}/scripts/Installers/Run-Antivirus.ps1"
] ]
}, },
{ {
"type": "powershell", "type": "powershell",
"scripts":[ "scripts": [
"{{ template_dir }}/scripts/Installers/Configure-Antivirus.ps1" "{{ template_dir }}/scripts/Installers/Configure-Antivirus.ps1"
] ]
}, },
{ {
"type": "powershell", "type": "powershell",
"scripts":[ "scripts": [
"{{ template_dir }}/scripts/Installers/Disable-JITDebugger.ps1" "{{ template_dir }}/scripts/Installers/Disable-JITDebugger.ps1"
] ]
}, },
{ {
"type": "powershell", "type": "powershell",
"scripts":[ "scripts": [
"{{ template_dir }}/scripts/Installers/Run-NGen.ps1" "{{ template_dir }}/scripts/Installers/Run-NGen.ps1"
] ]
}, },