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

Variabilize several elements in Packer templates (#12231)

Browse Source
This commit is contained in:
Alexey-Ayupov
2025-05-23 15:08:47 +02:00
committed by GitHub
parent ff069dce92
commit 2eee00587f
5 changed files with 80 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files
images/ubuntu/templates/ubuntu-22.04.pkr.hcl
+16 -10
View File
@@ -1,7 +1,3 @@
locals {
managed_image_name = var.managed_image_name != "" ? var.managed_image_name : "packer-${var.image_os}-${var.image_version}"
}
variable "allowed_inbound_ip_addresses" { variable "allowed_inbound_ip_addresses" {
type = list(string) type = list(string)
default = [] default = []
@@ -14,7 +10,7 @@ variable "azure_tags" {
variable "build_resource_group_name" { variable "build_resource_group_name" {
type = string type = string
default = "${env("BUILD_RESOURCE_GROUP_NAME")}" default = "${env("BUILD_RG_NAME")}"
} }
variable "client_cert_path" { variable "client_cert_path" {
@@ -81,7 +77,7 @@ variable "install_password" {
variable "location" { variable "location" {
type = string type = string
default = "${env("ARM_RESOURCE_LOCATION")}" default = ""
} }
variable "managed_image_name" { variable "managed_image_name" {
@@ -156,7 +152,7 @@ variable "gallery_name" {
variable "gallery_resource_group_name" { variable "gallery_resource_group_name" {
type = string type = string
default = "${env("GALLERY_RESOURCE_GROUP_NAME")}" default = "${env("GALLERY_RG_NAME")}"
} }
variable "gallery_image_name" { variable "gallery_image_name" {
@@ -179,6 +175,16 @@ variable "use_azure_cli_auth" {
default = false default = false
} }
variable "os_disk_size_gb" {
type = number
default = 75
}
variable "image_os_type" {
type = string
default = "Linux"
}
source "azure-arm" "build_image" { source "azure-arm" "build_image" {
allowed_inbound_ip_addresses = "${var.allowed_inbound_ip_addresses}" allowed_inbound_ip_addresses = "${var.allowed_inbound_ip_addresses}"
build_resource_group_name = "${var.build_resource_group_name}" build_resource_group_name = "${var.build_resource_group_name}"
@@ -190,10 +196,10 @@ source "azure-arm" "build_image" {
image_publisher = "${var.image_publisher}" image_publisher = "${var.image_publisher}"
image_sku = "${var.image_sku}" image_sku = "${var.image_sku}"
location = "${var.location}" location = "${var.location}"
managed_image_name = "${local.managed_image_name}" managed_image_name = "${var.managed_image_name}"
managed_image_resource_group_name = "${var.managed_image_resource_group_name}" managed_image_resource_group_name = "${var.managed_image_resource_group_name}"
os_disk_size_gb = "75" os_disk_size_gb = var.os_disk_size_gb
os_type = "Linux" os_type = var.image_os_type
private_virtual_network_with_public_ip = "${var.private_virtual_network_with_public_ip}" private_virtual_network_with_public_ip = "${var.private_virtual_network_with_public_ip}"
subscription_id = "${var.subscription_id}" subscription_id = "${var.subscription_id}"
temp_resource_group_name = "${var.temp_resource_group_name}" temp_resource_group_name = "${var.temp_resource_group_name}"
images/ubuntu/templates/ubuntu-24.04.pkr.hcl
+16 -10
View File
@@ -1,7 +1,3 @@
locals {
managed_image_name = var.managed_image_name != "" ? var.managed_image_name : "packer-${var.image_os}-${var.image_version}"
}
variable "allowed_inbound_ip_addresses" { variable "allowed_inbound_ip_addresses" {
type = list(string) type = list(string)
default = [] default = []
@@ -14,7 +10,7 @@ variable "azure_tags" {
variable "build_resource_group_name" { variable "build_resource_group_name" {
type = string type = string
default = "${env("BUILD_RESOURCE_GROUP_NAME")}" default = "${env("BUILD_RG_NAME")}"
} }
variable "client_cert_path" { variable "client_cert_path" {
@@ -81,7 +77,7 @@ variable "install_password" {
variable "location" { variable "location" {
type = string type = string
default = "${env("ARM_RESOURCE_LOCATION")}" default = ""
} }
variable "managed_image_name" { variable "managed_image_name" {
@@ -156,7 +152,7 @@ variable "gallery_name" {
variable "gallery_resource_group_name" { variable "gallery_resource_group_name" {
type = string type = string
default = "${env("GALLERY_RESOURCE_GROUP_NAME")}" default = "${env("GALLERY_RG_NAME")}"
} }
variable "gallery_image_name" { variable "gallery_image_name" {
@@ -179,6 +175,16 @@ variable "use_azure_cli_auth" {
default = false default = false
} }
variable "os_disk_size_gb" {
type = number
default = 75
}
variable "image_os_type" {
type = string
default = "Linux"
}
source "azure-arm" "build_image" { source "azure-arm" "build_image" {
allowed_inbound_ip_addresses = "${var.allowed_inbound_ip_addresses}" allowed_inbound_ip_addresses = "${var.allowed_inbound_ip_addresses}"
build_resource_group_name = "${var.build_resource_group_name}" build_resource_group_name = "${var.build_resource_group_name}"
@@ -190,10 +196,10 @@ source "azure-arm" "build_image" {
image_publisher = "${var.image_publisher}" image_publisher = "${var.image_publisher}"
image_sku = "${var.image_sku}" image_sku = "${var.image_sku}"
location = "${var.location}" location = "${var.location}"
managed_image_name = "${local.managed_image_name}" managed_image_name = "${var.managed_image_name}"
managed_image_resource_group_name = "${var.managed_image_resource_group_name}" managed_image_resource_group_name = "${var.managed_image_resource_group_name}"
os_disk_size_gb = "75" os_disk_size_gb = var.os_disk_size_gb
os_type = "Linux" os_type = var.image_os_type
private_virtual_network_with_public_ip = "${var.private_virtual_network_with_public_ip}" private_virtual_network_with_public_ip = "${var.private_virtual_network_with_public_ip}"
subscription_id = "${var.subscription_id}" subscription_id = "${var.subscription_id}"
temp_resource_group_name = "${var.temp_resource_group_name}" temp_resource_group_name = "${var.temp_resource_group_name}"
images/windows/templates/windows-2019.pkr.hcl
+16 -10
View File
@@ -1,7 +1,3 @@
locals {
managed_image_name = var.managed_image_name != "" ? var.managed_image_name : "packer-${var.image_os}-${var.image_version}"
}
variable "agent_tools_directory" { variable "agent_tools_directory" {
type = string type = string
default = "C:\\hostedtoolcache\\windows" default = "C:\\hostedtoolcache\\windows"
@@ -19,7 +15,7 @@ variable "azure_tags" {
variable "build_resource_group_name" { variable "build_resource_group_name" {
type = string type = string
default = "${env("BUILD_RESOURCE_GROUP_NAME")}" default = "${env("BUILD_RG_NAME")}"
} }
variable "client_cert_path" { variable "client_cert_path" {
@@ -81,7 +77,7 @@ variable "install_user" {
variable "location" { variable "location" {
type = string type = string
default = "${env("ARM_RESOURCE_LOCATION")}" default = ""
} }
variable "managed_image_name" { variable "managed_image_name" {
@@ -166,7 +162,7 @@ variable "gallery_name" {
variable "gallery_resource_group_name" { variable "gallery_resource_group_name" {
type = string type = string
default = "${env("GALLERY_RESOURCE_GROUP_NAME")}" default = "${env("GALLERY_RG_NAME")}"
} }
variable "gallery_image_name" { variable "gallery_image_name" {
@@ -199,6 +195,16 @@ variable "use_azure_cli_auth" {
default = false default = false
} }
variable "os_disk_size_gb" {
type = number
default = 256
}
variable "image_os_type" {
type = string
default = "Windows"
}
source "azure-arm" "image" { source "azure-arm" "image" {
allowed_inbound_ip_addresses = "${var.allowed_inbound_ip_addresses}" allowed_inbound_ip_addresses = "${var.allowed_inbound_ip_addresses}"
build_resource_group_name = "${var.build_resource_group_name}" build_resource_group_name = "${var.build_resource_group_name}"
@@ -211,12 +217,12 @@ source "azure-arm" "image" {
image_publisher = "${var.image_publisher}" image_publisher = "${var.image_publisher}"
image_sku = "${var.image_sku}" image_sku = "${var.image_sku}"
location = "${var.location}" location = "${var.location}"
managed_image_name = "${local.managed_image_name}" managed_image_name = "${var.managed_image_name}"
managed_image_resource_group_name = "${var.managed_image_resource_group_name}" managed_image_resource_group_name = "${var.managed_image_resource_group_name}"
managed_image_storage_account_type = "${var.managed_image_storage_account_type}" managed_image_storage_account_type = "${var.managed_image_storage_account_type}"
object_id = "${var.object_id}" object_id = "${var.object_id}"
os_disk_size_gb = "256" os_disk_size_gb = var.os_disk_size_gb
os_type = "Windows" os_type = var.image_os_type
private_virtual_network_with_public_ip = "${var.private_virtual_network_with_public_ip}" private_virtual_network_with_public_ip = "${var.private_virtual_network_with_public_ip}"
subscription_id = "${var.subscription_id}" subscription_id = "${var.subscription_id}"
temp_resource_group_name = "${var.temp_resource_group_name}" temp_resource_group_name = "${var.temp_resource_group_name}"
images/windows/templates/windows-2022.pkr.hcl
+16 -10
View File
@@ -1,7 +1,3 @@
locals {
managed_image_name = var.managed_image_name != "" ? var.managed_image_name : "packer-${var.image_os}-${var.image_version}"
}
variable "agent_tools_directory" { variable "agent_tools_directory" {
type = string type = string
default = "C:\\hostedtoolcache\\windows" default = "C:\\hostedtoolcache\\windows"
@@ -19,7 +15,7 @@ variable "azure_tags" {
variable "build_resource_group_name" { variable "build_resource_group_name" {
type = string type = string
default = "${env("BUILD_RESOURCE_GROUP_NAME")}" default = "${env("BUILD_RG_NAME")}"
} }
variable "client_cert_path" { variable "client_cert_path" {
@@ -81,7 +77,7 @@ variable "install_user" {
variable "location" { variable "location" {
type = string type = string
default = "${env("ARM_RESOURCE_LOCATION")}" default = ""
} }
variable "managed_image_name" { variable "managed_image_name" {
@@ -166,7 +162,7 @@ variable "gallery_name" {
variable "gallery_resource_group_name" { variable "gallery_resource_group_name" {
type = string type = string
default = "${env("GALLERY_RESOURCE_GROUP_NAME")}" default = "${env("GALLERY_RG_NAME")}"
} }
variable "gallery_image_name" { variable "gallery_image_name" {
@@ -199,6 +195,16 @@ variable "use_azure_cli_auth" {
default = false default = false
} }
variable "os_disk_size_gb" {
type = number
default = 256
}
variable "image_os_type" {
type = string
default = "Windows"
}
source "azure-arm" "image" { source "azure-arm" "image" {
allowed_inbound_ip_addresses = "${var.allowed_inbound_ip_addresses}" allowed_inbound_ip_addresses = "${var.allowed_inbound_ip_addresses}"
build_resource_group_name = "${var.build_resource_group_name}" build_resource_group_name = "${var.build_resource_group_name}"
@@ -211,12 +217,12 @@ source "azure-arm" "image" {
image_publisher = "${var.image_publisher}" image_publisher = "${var.image_publisher}"
image_sku = "${var.image_sku}" image_sku = "${var.image_sku}"
location = "${var.location}" location = "${var.location}"
managed_image_name = "${local.managed_image_name}" managed_image_name = "${var.managed_image_name}"
managed_image_resource_group_name = "${var.managed_image_resource_group_name}" managed_image_resource_group_name = "${var.managed_image_resource_group_name}"
managed_image_storage_account_type = "${var.managed_image_storage_account_type}" managed_image_storage_account_type = "${var.managed_image_storage_account_type}"
object_id = "${var.object_id}" object_id = "${var.object_id}"
os_disk_size_gb = "256" os_disk_size_gb = var.os_disk_size_gb
os_type = "Windows" os_type = var.image_os_type
private_virtual_network_with_public_ip = "${var.private_virtual_network_with_public_ip}" private_virtual_network_with_public_ip = "${var.private_virtual_network_with_public_ip}"
subscription_id = "${var.subscription_id}" subscription_id = "${var.subscription_id}"
temp_resource_group_name = "${var.temp_resource_group_name}" temp_resource_group_name = "${var.temp_resource_group_name}"
images/windows/templates/windows-2025.pkr.hcl
+16 -10
View File
@@ -1,7 +1,3 @@
locals {
managed_image_name = var.managed_image_name != "" ? var.managed_image_name : "packer-${var.image_os}-${var.image_version}"
}
variable "agent_tools_directory" { variable "agent_tools_directory" {
type = string type = string
default = "C:\\hostedtoolcache\\windows" default = "C:\\hostedtoolcache\\windows"
@@ -19,7 +15,7 @@ variable "azure_tags" {
variable "build_resource_group_name" { variable "build_resource_group_name" {
type = string type = string
default = "${env("BUILD_RESOURCE_GROUP_NAME")}" default = "${env("BUILD_RG_NAME")}"
} }
variable "client_cert_path" { variable "client_cert_path" {
@@ -81,7 +77,7 @@ variable "install_user" {
variable "location" { variable "location" {
type = string type = string
default = "${env("ARM_RESOURCE_LOCATION")}" default = ""
} }
variable "managed_image_name" { variable "managed_image_name" {
@@ -166,7 +162,7 @@ variable "gallery_name" {
variable "gallery_resource_group_name" { variable "gallery_resource_group_name" {
type = string type = string
default = "${env("GALLERY_RESOURCE_GROUP_NAME")}" default = "${env("GALLERY_RG_NAME")}"
} }
variable "gallery_image_name" { variable "gallery_image_name" {
@@ -199,6 +195,16 @@ variable "use_azure_cli_auth" {
default = false default = false
} }
variable "os_disk_size_gb" {
type = number
default = 150
}
variable "image_os_type" {
type = string
default = "Windows"
}
source "azure-arm" "image" { source "azure-arm" "image" {
allowed_inbound_ip_addresses = "${var.allowed_inbound_ip_addresses}" allowed_inbound_ip_addresses = "${var.allowed_inbound_ip_addresses}"
build_resource_group_name = "${var.build_resource_group_name}" build_resource_group_name = "${var.build_resource_group_name}"
@@ -211,12 +217,12 @@ source "azure-arm" "image" {
image_publisher = "${var.image_publisher}" image_publisher = "${var.image_publisher}"
image_sku = "${var.image_sku}" image_sku = "${var.image_sku}"
location = "${var.location}" location = "${var.location}"
managed_image_name = "${local.managed_image_name}" managed_image_name = "${var.managed_image_name}"
managed_image_resource_group_name = "${var.managed_image_resource_group_name}" managed_image_resource_group_name = "${var.managed_image_resource_group_name}"
managed_image_storage_account_type = "${var.managed_image_storage_account_type}" managed_image_storage_account_type = "${var.managed_image_storage_account_type}"
object_id = "${var.object_id}" object_id = "${var.object_id}"
os_disk_size_gb = "150" os_disk_size_gb = var.os_disk_size_gb
os_type = "Windows" os_type = var.image_os_type
private_virtual_network_with_public_ip = "${var.private_virtual_network_with_public_ip}" private_virtual_network_with_public_ip = "${var.private_virtual_network_with_public_ip}"
subscription_id = "${var.subscription_id}" subscription_id = "${var.subscription_id}"
temp_resource_group_name = "${var.temp_resource_group_name}" temp_resource_group_name = "${var.temp_resource_group_name}"