Arm 7.11.2 (#68)

* ARM templates - Postgresql JDBC driver is updated (for 7.10.2 compatibility)

* ARM templates - RT and JCR 7.10.2, Xray 3.9.1

* VM image publish template - RT 7.10.5

* ARM template for 7.10.5

* ARM template for Xray 3.10.3

* Updated artifactoryVersion and location

* Updated 7.10.5 version for JCR Azure application

* updated version on azuredeploy_ms_ps.json

* updated azuredeploy_ms_ps.json

* updated azuredeploy_ms_ps.json

* updated 7.10.6 verion in azuredeploy_ms_ps.json, MP_submission/createUiDefinition.json, MP_submission/mainTemplate.json

* Updated the Version for JCR

* updated new xray version 3.11.2 in template files

* updated new x-ray version in createUiDefinition.json mainTemplate.json

* updated createUiDefinition.json mainTemplate.json

* updated 7.11.2 changes for xray, rt and jcr

* ARM template, fixing formatting

Co-authored-by: danielmkn <danielmi@jfrog.com>
Co-authored-by: Aayush-sood94 <aayush.sood1@igtsolutions.com>

AzureResourceManager/Artifactory/MP_submission/createUiDefinition.json

@@ -132,7 +132,7 @@
             "name": "artifactoryVersion",
             "type": "Microsoft.Common.DropDown",
             "label": "Artifactory-vm image version to deploy.",
-            "defaultValue": "7.10.2",
+            "defaultValue": "7.11.2",
             "toolTip": "Version of Artifactory to deploy",
             "constraints": {
               "allowedValues": [
@@ -170,8 +170,17 @@
                 },
                 {
                   "label": "7.10.2",
-                  "value": "0.0.3"
-                }
+                  "value": "0.0.31"
+                },
+                {
+                  "label": "7.10.5",
+                  "value": "0.0.4"
+                },
+		        {
+                  "label": "7.10.6",
+                  "value": "0.0.52"
+                },
+                {                                                                                                                                                                         "label": "7.11.2",                                                                                                                                                      "value": "0.0.6"                                                                                                                                                     }         
               ],
               "required": true
             },
@@ -533,4 +542,4 @@
       "storageAccountType": "[steps('storageConfig').storageAccountsType]"
     }
   }
-}
+}

AzureResourceManager/Artifactory/MP_submission/mainTemplate.json

@@ -79,7 +79,7 @@
     },
     "artifactoryVersion": {
       "type": "string",
-      "defaultValue": "0.0.3",
+      "defaultValue": "0.0.6",
       "allowedValues": [
         "6.6.0",
         "6.6.1",
@@ -96,7 +96,10 @@
         "7.4.30",
         "0.0.1",
         "0.0.2",
-        "0.0.3"
+        "0.0.31",
+        "0.0.4",
+	    "0.0.52",
+	    "0.0.6"
       ],
       "metadata": {
         "description": "Artifactory-vm image version to deploy."
@@ -778,7 +781,7 @@
       "type": "Microsoft.Compute/virtualMachineScaleSets",
       "name": "[variables('scaleSetPrimaryName')]",
       "location": "[parameters('location')]",
-      "apiVersion": "2018-10-01",
+      "apiVersion": "2020-06-01",
       "dependsOn": [
         "[resourceId('Microsoft.Network/loadBalancers/', variables('lbName'))]",
         "[resourceId('Microsoft.Network/virtualNetworks/', variables('virtualNetworkName'))]",
@@ -876,7 +879,7 @@
       "type": "Microsoft.Compute/virtualMachineScaleSets",
       "name": "[variables('scaleSetMemberName')]",
       "location": "[parameters('location')]",
-      "apiVersion": "2018-10-01",
+      "apiVersion": "2020-06-01",
       "dependsOn": [
         "[resourceId('Microsoft.Network/loadBalancers/', variables('lbName'))]",
         "[resourceId('Microsoft.Network/virtualNetworks/', variables('virtualNetworkName'))]",
@@ -978,4 +981,4 @@
       "type": "string"
     }
   }
-}
+}

AzureResourceManager/Artifactory/MP_submission/scripts/install_artifactory7.sh

@@ -25,9 +25,6 @@ export DEBIAN_FRONTEND=noninteractive
 mkdir -p /etc/pki/tls/private/ /etc/pki/tls/certs/
 openssl req -nodes -x509 -newkey rsa:4096 -keyout /etc/pki/tls/private/example.key -out /etc/pki/tls/certs/example.pem -days 356 -subj "/C=US/ST=California/L=SantaClara/O=IT/CN=*.localhost"
 
-# Install Postgresql driver
-curl --retry 5 -L -o /opt/jfrog/artifactory/app/artifactory/tomcat/lib/postgresql-9.4.1212.jar https://jdbc.postgresql.org/download/postgresql-9.4.1212.jar >> /tmp/install-databse-driver.log 2>&1
-
 CERTIFICATE_DOMAIN=$(cat /var/lib/cloud/instance/user-data.txt | grep "^CERTIFICATE_DOMAIN=" | sed "s/CERTIFICATE_DOMAIN=//")
 [ -z "$CERTIFICATE_DOMAIN" ] && CERTIFICATE_DOMAIN=artifactory