FIX-TEMPLATE: docker-ckan (#10553)

* initial commit * initial commit * changing the password to unique one * initial commit * changing the password to unique one * initial commit * initial commit * reverting * adding openedx version * STAGED * initial commit * revert * initial commit * revert * initial commit * removing gov cloud Co-authored-by: olga-spektra <ssi_okuzina@qbsol.com> Co-authored-by: olga-spektra <olga@spektrasystems.com>
Azure · Jun 1, 2021 · 2f3830f · 2f3830f
1 parent f6c2a9a
commit 2f3830f
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 11 deletions.
diff --git a/docker-ckan/azuredeploy.json b/docker-ckan/azuredeploy.json
@@ -49,17 +49,14 @@
     "imagePublisher": "Canonical",
     "imageOffer": "UbuntuServer",
     "ubuntuOSVersion": "16.04-LTS",
-    "OSDiskName": "osdiskfordockersimple",
     "nsgName": "myNSG",
     "nicName": "myVMNic",
-    "extensionName": "DockerExtension",
     "addressPrefix": "10.0.0.0/16",
     "subnetName": "Subnet",
     "subnetPrefix": "10.0.0.0/24",
     "storageAccountType": "Standard_LRS",
     "publicIPAddressName": "myPublicIP",
     "publicIPAddressType": "Dynamic",
-    "vmStorageAccountContainerName": "vhds",
     "vmName": "MyDockerCkanVM",
     "vmSize": "Standard_D1",
     "virtualNetworkName": "MyVNET",
@@ -132,8 +129,8 @@
       "name": "[variables('nicName')]",
       "location": "[parameters('location')]",
       "dependsOn": [
-        "[concat('Microsoft.Network/publicIPAddresses/', variables('publicIPAddressName'))]",
-        "[concat('Microsoft.Network/virtualNetworks/', variables('virtualNetworkName'))]"
+        "[resourceId('Microsoft.Network/publicIPAddresses/', variables('publicIPAddressName'))]",
+        "[resourceId('Microsoft.Network/virtualNetworks/', variables('virtualNetworkName'))]"
       ],
       "properties": {
         "ipConfigurations": [
@@ -196,8 +193,8 @@
       "name": "[variables('vmName')]",
       "location": "[parameters('location')]",
       "dependsOn": [
-        "[concat('Microsoft.Storage/storageAccounts/', parameters('newStorageAccountName'))]",
-        "[concat('Microsoft.Network/networkInterfaces/', variables('nicName'))]"
+        "[resourceId('Microsoft.Storage/storageAccounts/', parameters('newStorageAccountName'))]",
+        "[resourceId('Microsoft.Network/networkInterfaces/', variables('nicName'))]"
       ],
       "properties": {
         "hardwareProfile": {
@@ -233,11 +230,11 @@
     },
     {
       "type": "Microsoft.Compute/virtualMachines/extensions",
-      "name": "[concat(variables('vmName'),'/', variables('extensionName'))]",
-      "apiVersion": "2015-05-01-preview",
+      "name": "[concat(variables('vmName'),'/ckanDocker')]",
+      "apiVersion": "2017-03-30",
       "location": "[parameters('location')]",
       "dependsOn": [
-        "[concat('Microsoft.Compute/virtualMachines/', variables('vmName'))]"
+        "[resourceId('Microsoft.Compute/virtualMachines/', variables('vmName'))]"
       ],
       "properties": {
         "publisher": "Microsoft.Azure.Extensions",

diff --git a/docker-ckan/metadata.json b/docker-ckan/metadata.json
@@ -5,5 +5,8 @@
   "description": "This template deploys CKAN using Apache Solr (for search) and PostgreSQL (database) on an Ubuntu VM. CKAN, Solr and PostgreSQL are deployed as individual Docker containers on the VM.",
   "summary": "Deploy CKAN as a single VM containerized application",
   "githubUsername": "rgardler",
-  "dateUpdated": "2019-05-02"
+  "dateUpdated": "2019-05-02",
+  "environments": [
+    "AzureCloud"
+  ]
 }