From cd9fddaa0d2a6ab36c21f6fbbe3e00b19cfcd5b6 Mon Sep 17 00:00:00 2001
From: hwdsl2 <hwdsl2@users.noreply.github.com>
Date: Tue, 3 May 2022 22:28:04 -0500
Subject: [PATCH] Update Azure template

- Add Ubuntu 22.04 and set as default
---
 azure/README-zh.md     |  8 +++++++-
 azure/README.md        |  8 +++++++-
 azure/azuredeploy.json | 15 +++++++++++----
 3 files changed, 25 insertions(+), 6 deletions(-)

diff --git a/azure/README-zh.md b/azure/README-zh.md
index fb26fba..9f3ae4d 100644
--- a/azure/README-zh.md
+++ b/azure/README-zh.md
@@ -9,7 +9,7 @@
  - Username for VPN **and** SSH （用户名）
  - Password for VPN **and** SSH （密码）
  - IPsec Pre-Shared Key for VPN （IPsec 预共享密钥）
- - Operating System Image （操作系统镜像，Ubuntu 20.04/18.04 或 Debian 9）
+ - Operating System Image （操作系统镜像，Ubuntu 22.04/20.04/18.04 或 Debian 9）
  - Virtual Machine Size （虚拟机大小，默认值： Standard_B1s）
 
 **注：** \*不要\* 在值中使用这些字符： `\ " '`
@@ -29,4 +29,10 @@
 
 ## 屏幕截图
 
+<details>
+<summary>
+单击查看屏幕截图。
+</summary>
+
 ![Azure Custom Deployment](custom_deployment_screenshot.png)
+</details>
diff --git a/azure/README.md b/azure/README.md
index e048692..9132923 100644
--- a/azure/README.md
+++ b/azure/README.md
@@ -9,7 +9,7 @@ Customizable with the following options:
  - Username for VPN **and** SSH
  - Password for VPN **and** SSH
  - IPsec Pre-Shared Key for VPN
- - Operating System Image (Ubuntu 20.04/18.04 or Debian 9)
+ - Operating System Image (Ubuntu 22.04/20.04/18.04 or Debian 9)
  - Virtual Machine Size (Default: Standard_B1s)
 
 **Note:** DO NOT use these special characters within values: `\ " '`
@@ -29,4 +29,10 @@ Copyright (C) 2017-2022 [Lin Song](https://github.com/hwdsl2)
 
 ## Screenshot
 
+<details>
+<summary>
+Click to see screenshot.
+</summary>
+
 ![Azure Custom Deployment](custom_deployment_screenshot.png)
+</details>
diff --git a/azure/azuredeploy.json b/azure/azuredeploy.json
index e3425c9..2682f59 100644
--- a/azure/azuredeploy.json
+++ b/azure/azuredeploy.json
@@ -24,13 +24,14 @@
     "image": {
       "type": "string",
       "allowedValues": [
+        "ubuntu22.04",
         "ubuntu20.04",
         "ubuntu18.04",
         "debian9"
       ],
-      "defaultValue": "ubuntu20.04",
+      "defaultValue": "ubuntu22.04",
       "metadata": {
-        "description": "OS to use. Ubuntu 20.04/18.04 or Debian 9."
+        "description": "OS to use. Ubuntu 22.04/20.04/18.04 or Debian 9."
       }
     },
     "VMSize": {
@@ -61,6 +62,12 @@
     "vhdStorageType": "Standard_LRS",
     "vnetId": "[resourceId('Microsoft.Network/virtualNetworks', variables('virtualNetworkName'))]",
     "SubnetRef": "[concat(variables('vnetId'), '/subnets/', variables('subnetName'))]",
+    "ubuntu22.04": {
+      "publisher": "Canonical",
+      "offer": "0001-com-ubuntu-server-jammy",
+      "sku": "22_04-lts",
+      "version": "latest"
+    },
     "ubuntu20.04": {
       "publisher": "Canonical",
       "offer": "0001-com-ubuntu-server-focal",
@@ -179,7 +186,7 @@
           "osDisk": {
             "name": "osdisk",
             "vhd": {
-              "uri": "[concat(reference(resourceId('Microsoft.Storage/storageAccounts/', variables('storageName'))).primaryEndpoints.blob, 'vmachines/', variables('vmName'), '.vhd')]"              
+              "uri": "[concat(reference(resourceId('Microsoft.Storage/storageAccounts/', variables('storageName'))).primaryEndpoints.blob, 'vmachines/', variables('vmName'), '.vhd')]"
             },
             "caching": "ReadWrite",
             "createOption": "FromImage"
@@ -192,7 +199,7 @@
             }
           ]
         }
-      } 
+      }
     },
     {
       "type": "Microsoft.Compute/virtualMachines/extensions",