@@ -53,11 +53,20 @@ function cleanup_vm() {
53
53
| where resourceGroup =~ '${CURRENT_RESOURCEGROUP_NAME} ' \
54
54
| project nsgId = id" --query " data[0].nsgId" -o tsv)
55
55
56
+ # query public ip id
57
+ publicIpId=$( az graph query -q " Resources \
58
+ | where type =~ 'Microsoft.Network/publicIPAddresses' \
59
+ | where name =~ '${vmName} PublicIP' \
60
+ | where resourceGroup =~ '${CURRENT_RESOURCEGROUP_NAME} ' \
61
+ | project publicIpId = id" --query " data[0].publicIpId" -o tsv)
62
+
56
63
# Delete VM NIC IP VNET NSG resoruces
57
64
echo " deleting vm ${vmId} "
58
65
az vm delete --ids $vmId --yes
59
66
echo " deleting nic ${nicId} "
60
67
az network nic delete --ids ${nicId}
68
+ echo " deleting public ip ${publicIpId} "
69
+ az network public-ip delete --ids $publicIpId
61
70
echo " deleting disk ${osDiskId} "
62
71
az disk delete --yes --ids ${osDiskId}
63
72
echo " deleting vnet ${vnetId} "
@@ -119,6 +128,8 @@ function build_docker_image() {
119
128
export TAG_VM=$( echo " ${TAG_VM} " \
120
129
| jq -r ' to_entries | map("\"" + .key + "\"=" + (if .value|type == "string" then "\"\(.value)\"" else "\(.value)" end)) | join(" ")' )
121
130
131
+ publicIPName=" ${vmName} PublicIP"
132
+
122
133
# MICROSOFT_INTERNAL
123
134
# Specify tag 'SkipASMAzSecPack' to skip policy 'linuxazuresecuritypackautodeployiaas_1.6'
124
135
# Specify tag 'SkipNRMS*' to skip Microsoft internal NRMS policy, which causes vm-redeployed issue
@@ -132,7 +143,7 @@ function build_docker_image() {
132
143
--enable-agent true \
133
144
--vnet-name ${vmName} VNET \
134
145
--enable-auto-update false \
135
- --public-ip-address " " \
146
+ --public-ip-address ${publicIPName} \
136
147
--size ${vmSize} \
137
148
--tags ${TAG_VM} SkipASMAzSecPack=true SkipNRMSCorp=true SkipNRMSDatabricks=true SkipNRMSDB=true SkipNRMSHigh=true SkipNRMSMedium=true SkipNRMSRDPSSH=true SkipNRMSSAW=true SkipNRMSMgmt=true --verbose
138
149
0 commit comments