mirror of
https://github.com/ZwareBear/JFrog-Cloud-Installers.git
synced 2026-01-21 00:06:55 -06:00
Changes in RT and Xray version 7.41.7 and 3.55.2
This commit is contained in:
@@ -132,7 +132,7 @@
|
|||||||
"name": "artifactoryVersion",
|
"name": "artifactoryVersion",
|
||||||
"type": "Microsoft.Common.DropDown",
|
"type": "Microsoft.Common.DropDown",
|
||||||
"label": "Artifactory-vm image version to deploy.",
|
"label": "Artifactory-vm image version to deploy.",
|
||||||
"defaultValue": "7.37.14",
|
"defaultValue": "7.41.7",
|
||||||
"toolTip": "Version of Artifactory to deploy",
|
"toolTip": "Version of Artifactory to deploy",
|
||||||
"constraints": {
|
"constraints": {
|
||||||
"allowedValues": [
|
"allowedValues": [
|
||||||
@@ -235,6 +235,10 @@
|
|||||||
{
|
{
|
||||||
"label": "7.37.14",
|
"label": "7.37.14",
|
||||||
"value": "0.0.40"
|
"value": "0.0.40"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"label": "7.41.7",
|
||||||
|
"value": "0.0.41"
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"required": true
|
"required": true
|
||||||
|
|||||||
@@ -79,7 +79,7 @@
|
|||||||
},
|
},
|
||||||
"artifactoryVersion": {
|
"artifactoryVersion": {
|
||||||
"type": "string",
|
"type": "string",
|
||||||
"defaultValue": "0.0.40",
|
"defaultValue": "0.0.41",
|
||||||
"allowedValues": [
|
"allowedValues": [
|
||||||
"0.0.8",
|
"0.0.8",
|
||||||
"0.0.9",
|
"0.0.9",
|
||||||
@@ -105,7 +105,8 @@
|
|||||||
"0.0.37",
|
"0.0.37",
|
||||||
"0.0.38",
|
"0.0.38",
|
||||||
"0.0.39",
|
"0.0.39",
|
||||||
"0.0.40"
|
"0.0.40",
|
||||||
|
"0.0.41"
|
||||||
],
|
],
|
||||||
"metadata": {
|
"metadata": {
|
||||||
"description": "Artifactory-vm image version to deploy."
|
"description": "Artifactory-vm image version to deploy."
|
||||||
@@ -749,7 +750,7 @@
|
|||||||
{
|
{
|
||||||
"type": "Microsoft.Resources/deployments",
|
"type": "Microsoft.Resources/deployments",
|
||||||
"name": "deploySQLDB",
|
"name": "deploySQLDB",
|
||||||
"apiVersion": "2020-06-01",
|
"apiVersion": "2021-04-01",
|
||||||
"properties": {
|
"properties": {
|
||||||
"mode": "Incremental",
|
"mode": "Incremental",
|
||||||
"templateLink": {
|
"templateLink": {
|
||||||
@@ -788,7 +789,7 @@
|
|||||||
"type": "Microsoft.Compute/virtualMachineScaleSets",
|
"type": "Microsoft.Compute/virtualMachineScaleSets",
|
||||||
"name": "[variables('scaleSetPrimaryName')]",
|
"name": "[variables('scaleSetPrimaryName')]",
|
||||||
"location": "[parameters('location')]",
|
"location": "[parameters('location')]",
|
||||||
"apiVersion": "2020-06-01",
|
"apiVersion": "2021-11-01",
|
||||||
"dependsOn": [
|
"dependsOn": [
|
||||||
"[resourceId('Microsoft.Network/loadBalancers/', variables('lbName'))]",
|
"[resourceId('Microsoft.Network/loadBalancers/', variables('lbName'))]",
|
||||||
"[resourceId('Microsoft.Network/virtualNetworks/', variables('virtualNetworkName'))]",
|
"[resourceId('Microsoft.Network/virtualNetworks/', variables('virtualNetworkName'))]",
|
||||||
@@ -884,7 +885,7 @@
|
|||||||
"type": "Microsoft.Compute/virtualMachineScaleSets",
|
"type": "Microsoft.Compute/virtualMachineScaleSets",
|
||||||
"name": "[variables('scaleSetMemberName')]",
|
"name": "[variables('scaleSetMemberName')]",
|
||||||
"location": "[parameters('location')]",
|
"location": "[parameters('location')]",
|
||||||
"apiVersion": "2020-06-01",
|
"apiVersion": "2021-11-01",
|
||||||
"dependsOn": [
|
"dependsOn": [
|
||||||
"[resourceId('Microsoft.Network/loadBalancers/', variables('lbName'))]",
|
"[resourceId('Microsoft.Network/loadBalancers/', variables('lbName'))]",
|
||||||
"[resourceId('Microsoft.Network/virtualNetworks/', variables('virtualNetworkName'))]",
|
"[resourceId('Microsoft.Network/virtualNetworks/', variables('virtualNetworkName'))]",
|
||||||
|
|||||||
@@ -47,7 +47,7 @@
|
|||||||
"name": "[parameters('db_server')]",
|
"name": "[parameters('db_server')]",
|
||||||
"type": "Microsoft.Sql/servers",
|
"type": "Microsoft.Sql/servers",
|
||||||
"location": "[parameters('db_location')]",
|
"location": "[parameters('db_location')]",
|
||||||
"apiVersion": "2020-08-01-preview",
|
"apiVersion": "2021-11-01-preview",
|
||||||
"tags": {
|
"tags": {
|
||||||
"displayName": "artifactoryDB"
|
"displayName": "artifactoryDB"
|
||||||
},
|
},
|
||||||
@@ -61,7 +61,7 @@
|
|||||||
"name": "[uniqueString(parameters('db_server'), 'AllowAllWindowsAzureIps' )]",
|
"name": "[uniqueString(parameters('db_server'), 'AllowAllWindowsAzureIps' )]",
|
||||||
"type": "firewallrules",
|
"type": "firewallrules",
|
||||||
"location": "[parameters('db_location')]",
|
"location": "[parameters('db_location')]",
|
||||||
"apiVersion": "2020-08-01-preview",
|
"apiVersion": "2021-11-01-preview",
|
||||||
"dependsOn": [
|
"dependsOn": [
|
||||||
"[resourceId('Microsoft.Sql/servers/', parameters('db_server'))]"
|
"[resourceId('Microsoft.Sql/servers/', parameters('db_server'))]"
|
||||||
],
|
],
|
||||||
@@ -75,7 +75,7 @@
|
|||||||
"type": "databases",
|
"type": "databases",
|
||||||
"kind": "v12.0,user",
|
"kind": "v12.0,user",
|
||||||
"location": "[parameters('db_location')]",
|
"location": "[parameters('db_location')]",
|
||||||
"apiVersion": "2020-08-01-preview",
|
"apiVersion": "2021-11-01-preview",
|
||||||
"dependsOn": [
|
"dependsOn": [
|
||||||
"[parameters('db_server')]"
|
"[parameters('db_server')]"
|
||||||
],
|
],
|
||||||
|
|||||||
@@ -47,7 +47,7 @@
|
|||||||
"name": "[parameters('db_server')]",
|
"name": "[parameters('db_server')]",
|
||||||
"type": "Microsoft.Sql/servers",
|
"type": "Microsoft.Sql/servers",
|
||||||
"location": "[parameters('db_location')]",
|
"location": "[parameters('db_location')]",
|
||||||
"apiVersion": "2020-08-01-preview",
|
"apiVersion": "2021-11-01-preview",
|
||||||
"tags": {
|
"tags": {
|
||||||
"displayName": "artifactoryDB"
|
"displayName": "artifactoryDB"
|
||||||
},
|
},
|
||||||
@@ -61,7 +61,7 @@
|
|||||||
"name": "[uniqueString(parameters('db_server'), 'AllowAllWindowsAzureIps' )]",
|
"name": "[uniqueString(parameters('db_server'), 'AllowAllWindowsAzureIps' )]",
|
||||||
"type": "firewallrules",
|
"type": "firewallrules",
|
||||||
"location": "[parameters('db_location')]",
|
"location": "[parameters('db_location')]",
|
||||||
"apiVersion": "2020-08-01-preview",
|
"apiVersion": "2021-11-01-preview",
|
||||||
"dependsOn": [
|
"dependsOn": [
|
||||||
"[resourceId('Microsoft.Sql/servers/', parameters('db_server'))]"
|
"[resourceId('Microsoft.Sql/servers/', parameters('db_server'))]"
|
||||||
],
|
],
|
||||||
@@ -75,7 +75,7 @@
|
|||||||
"type": "databases",
|
"type": "databases",
|
||||||
"kind": "v12.0,user",
|
"kind": "v12.0,user",
|
||||||
"location": "[parameters('db_location')]",
|
"location": "[parameters('db_location')]",
|
||||||
"apiVersion": "2020-08-01-preview",
|
"apiVersion": "2021-11-01-preview",
|
||||||
"dependsOn": [
|
"dependsOn": [
|
||||||
"[parameters('db_server')]"
|
"[parameters('db_server')]"
|
||||||
],
|
],
|
||||||
|
|||||||
@@ -123,7 +123,7 @@
|
|||||||
"name": "xrayVersion",
|
"name": "xrayVersion",
|
||||||
"type": "Microsoft.Common.DropDown",
|
"type": "Microsoft.Common.DropDown",
|
||||||
"label": "Xray-vm image version to deploy.",
|
"label": "Xray-vm image version to deploy.",
|
||||||
"defaultValue": "3.42.5",
|
"defaultValue": "3.55.2",
|
||||||
"toolTip": "Version of Xray to deploy",
|
"toolTip": "Version of Xray to deploy",
|
||||||
"constraints": {
|
"constraints": {
|
||||||
"allowedValues": [
|
"allowedValues": [
|
||||||
@@ -214,6 +214,10 @@
|
|||||||
{
|
{
|
||||||
"label": "3.42.5",
|
"label": "3.42.5",
|
||||||
"value": "0.0.34"
|
"value": "0.0.34"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"label": "3.55.2",
|
||||||
|
"value": "0.0.35"
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"required": true
|
"required": true
|
||||||
|
|||||||
@@ -19,7 +19,7 @@
|
|||||||
},
|
},
|
||||||
"xrayVersion": {
|
"xrayVersion": {
|
||||||
"type": "string",
|
"type": "string",
|
||||||
"defaultValue": "0.0.34",
|
"defaultValue": "0.0.35",
|
||||||
"allowedValues": [
|
"allowedValues": [
|
||||||
"0.0.10",
|
"0.0.10",
|
||||||
"0.0.11",
|
"0.0.11",
|
||||||
@@ -42,7 +42,8 @@
|
|||||||
"0.0.31",
|
"0.0.31",
|
||||||
"0.0.32",
|
"0.0.32",
|
||||||
"0.0.33",
|
"0.0.33",
|
||||||
"0.0.34"
|
"0.0.34",
|
||||||
|
"0.0.35"
|
||||||
],
|
],
|
||||||
"metadata": {
|
"metadata": {
|
||||||
"description": "Xray-vm image version to deploy."
|
"description": "Xray-vm image version to deploy."
|
||||||
@@ -221,7 +222,7 @@
|
|||||||
},
|
},
|
||||||
"resources": [
|
"resources": [
|
||||||
{
|
{
|
||||||
"apiVersion": "2020-06-01",
|
"apiVersion": "2021-04-01",
|
||||||
"name": "pid-650cbcf5-daa5-4038-88f1-aa87d58f8f1a-partnercenter",
|
"name": "pid-650cbcf5-daa5-4038-88f1-aa87d58f8f1a-partnercenter",
|
||||||
"type": "Microsoft.Resources/deployments",
|
"type": "Microsoft.Resources/deployments",
|
||||||
"properties": {
|
"properties": {
|
||||||
@@ -236,7 +237,7 @@
|
|||||||
{
|
{
|
||||||
"condition": "[equals(parameters('virtualNetworkNewOrExisting'),'new')]",
|
"condition": "[equals(parameters('virtualNetworkNewOrExisting'),'new')]",
|
||||||
"type": "Microsoft.Network/virtualNetworks",
|
"type": "Microsoft.Network/virtualNetworks",
|
||||||
"apiVersion": "2020-05-01",
|
"apiVersion": "2022-05-01",
|
||||||
"name": "[parameters('virtualNetworkName')]",
|
"name": "[parameters('virtualNetworkName')]",
|
||||||
"location": "[parameters('location')]",
|
"location": "[parameters('location')]",
|
||||||
"properties": {
|
"properties": {
|
||||||
@@ -258,7 +259,7 @@
|
|||||||
{
|
{
|
||||||
"type": "Microsoft.Network/publicIPAddresses",
|
"type": "Microsoft.Network/publicIPAddresses",
|
||||||
"name": "[variables('publicIPAddressName')]",
|
"name": "[variables('publicIPAddressName')]",
|
||||||
"apiVersion": "2020-05-01",
|
"apiVersion": "2022-05-01",
|
||||||
"location": "[parameters('location')]",
|
"location": "[parameters('location')]",
|
||||||
"properties": {
|
"properties": {
|
||||||
"publicIPAllocationMethod": "[variables('publicIPAddressType')]"
|
"publicIPAllocationMethod": "[variables('publicIPAddressType')]"
|
||||||
@@ -267,7 +268,7 @@
|
|||||||
{
|
{
|
||||||
"type": "Microsoft.Network/networkInterfaces",
|
"type": "Microsoft.Network/networkInterfaces",
|
||||||
"name": "[variables('nicName')]",
|
"name": "[variables('nicName')]",
|
||||||
"apiVersion": "2020-05-01",
|
"apiVersion": "2022-05-01",
|
||||||
"location": "[parameters('location')]",
|
"location": "[parameters('location')]",
|
||||||
"properties": {
|
"properties": {
|
||||||
"ipConfigurations": [
|
"ipConfigurations": [
|
||||||
@@ -305,7 +306,7 @@
|
|||||||
{
|
{
|
||||||
"type": "Microsoft.Resources/deployments",
|
"type": "Microsoft.Resources/deployments",
|
||||||
"name": "deploySQLDB",
|
"name": "deploySQLDB",
|
||||||
"apiVersion": "2020-06-01",
|
"apiVersion": "2021-04-01",
|
||||||
"properties": {
|
"properties": {
|
||||||
"mode": "Incremental",
|
"mode": "Incremental",
|
||||||
"templateLink": {
|
"templateLink": {
|
||||||
@@ -338,7 +339,7 @@
|
|||||||
"type": "Microsoft.Compute/virtualMachineScaleSets",
|
"type": "Microsoft.Compute/virtualMachineScaleSets",
|
||||||
"name": "[concat(variables('namingInfix'), 'xrayScaleset')]",
|
"name": "[concat(variables('namingInfix'), 'xrayScaleset')]",
|
||||||
"location": "[parameters('location')]",
|
"location": "[parameters('location')]",
|
||||||
"apiVersion": "2020-06-01",
|
"apiVersion": "2022-08-01",
|
||||||
"dependsOn": [
|
"dependsOn": [
|
||||||
"[resourceId('Microsoft.Storage/storageAccounts/', variables('storageAccountName'))]",
|
"[resourceId('Microsoft.Storage/storageAccounts/', variables('storageAccountName'))]",
|
||||||
"[resourceId('Microsoft.Network/networkInterfaces/', variables('nicName'))]"
|
"[resourceId('Microsoft.Network/networkInterfaces/', variables('nicName'))]"
|
||||||
|
|||||||
Reference in New Issue
Block a user