Merge pull request #13 from agri-marche/ubuntu-20-04

Ubuntu 20 04
agri-marche · Sep 16, 2021 · c966189 · c966189
2 parents a31166c + 1ea1732
commit c966189
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 6 deletions.
diff --git a/.github/workflows/az-template-specs.yml b/.github/workflows/az-template-specs.yml
@@ -5,7 +5,7 @@ on:
 
 
 env:
-  TEMPLATE_NAME: UbuntuServer18_04
+  TEMPLATE_NAME: UbuntuServer20_04
   RESOURCE_GROUP: rg-prod-01-canadacentral-mca
 
 jobs:
@@ -22,4 +22,4 @@ jobs:
       with:
         creds: ${{ secrets.AZURE_CREDENTIALS }}
 
-    - run: az ts create --name $TEMPLATE_NAME --version "${{ steps.get_version.outputs.VERSION }}" --resource-group $RESOURCE_GROUP --location "canadacentral" --template-file "./azuredeploy.json" --description "Custom template to create a new Ubuntu Server VM for Agri-Marché."   
+    - run: az ts create --name $TEMPLATE_NAME --version "${{ steps.get_version.outputs.VERSION }}" --resource-group $RESOURCE_GROUP --location "canadacentral" --template-file "./azuredeploy.json" --description "Custom template to create a new Ubuntu 20.04 Server VM for Agri-Marché."   
diff --git a/azuredeploy.json b/azuredeploy.json
@@ -77,9 +77,9 @@
         }
     },
     "variables": {
-        "imagePublisher": "Canonical",
-        "imageOffer": "UbuntuServer",
-        "sku": "18.04-LTS",
+        "imagePublisher": "canonical",
+        "imageOffer": "0001-com-ubuntu-server-focal",
+        "sku": "20_04-lts",
         "nicName": "[concat('nic-',parameters('dnsLabelPrefix'))]",
         "vnetID": "[resourceId('rg-prod-01-canadacentral-mca', 'Microsoft.Network/virtualNetworks', parameters('existingVNETName'))]",
         "subnetId": "[concat(variables('vnetID'),'/subnets/', parameters('existingSubnetName'))]",
@@ -207,7 +207,6 @@
                     }
                 }
             },
-            // see https://docs.microsoft.com/en-us/azure/azure-monitor/agents/resource-manager-agent
             "resources": [
                 {
                     "type": "Microsoft.Compute/virtualMachines/extensions",