zware/JFrog-Cloud-Installers
1
0
Fork 0
mirror of https://github.com/ZwareBear/JFrog-Cloud-Installers.git synced 2026-01-20 22:06:55 -06:00
Code Issues Packages Projects Releases Wiki Activity

Changes in RT and Xray version 7.41.7 and 3.55.2

Browse Source
This commit is contained in:
Logeshwarsn
2022-09-01 17:33:17 +05:30
parent 0a0ecefbdd
commit 096e90f1d3
6 changed files with 32 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
AzureResourceManager/Artifactory/MP_submission/createUiDefinition.json
View File

@@ -132,7 +132,7 @@
"name": "artifactoryVersion",
"type": "Microsoft.Common.DropDown",
"label": "Artifactory-vm image version to deploy.",
"defaultValue": "7.37.14",
"defaultValue": "7.41.7",
"toolTip": "Version of Artifactory to deploy",
"constraints": {
"allowedValues": [
@@ -235,6 +235,10 @@
{
"label": "7.37.14",
"value": "0.0.40"
},
{
"label": "7.41.7",
"value": "0.0.41"
}
],
"required": true

11
AzureResourceManager/Artifactory/MP_submission/mainTemplate.json
View File

@@ -79,7 +79,7 @@
},
"artifactoryVersion": {
"type": "string",
"defaultValue": "0.0.40",
"defaultValue": "0.0.41",
"allowedValues": [
"0.0.8",
"0.0.9",
@@ -105,7 +105,8 @@
"0.0.37",
"0.0.38",
"0.0.39",
"0.0.40"
"0.0.40",
"0.0.41"
],
"metadata": {
"description": "Artifactory-vm image version to deploy."
@@ -749,7 +750,7 @@
{
"type": "Microsoft.Resources/deployments",
"name": "deploySQLDB",
"apiVersion": "2020-06-01",
"apiVersion": "2021-04-01",
"properties": {
"mode": "Incremental",
"templateLink": {
@@ -788,7 +789,7 @@
"type": "Microsoft.Compute/virtualMachineScaleSets",
"name": "[variables('scaleSetPrimaryName')]",
"location": "[parameters('location')]",
"apiVersion": "2020-06-01",
"apiVersion": "2021-11-01",
"dependsOn": [
"[resourceId('Microsoft.Network/loadBalancers/', variables('lbName'))]",
"[resourceId('Microsoft.Network/virtualNetworks/', variables('virtualNetworkName'))]",
@@ -884,7 +885,7 @@
"type": "Microsoft.Compute/virtualMachineScaleSets",
"name": "[variables('scaleSetMemberName')]",
"location": "[parameters('location')]",
"apiVersion": "2020-06-01",
"apiVersion": "2021-11-01",
"dependsOn": [
"[resourceId('Microsoft.Network/loadBalancers/', variables('lbName'))]",
"[resourceId('Microsoft.Network/virtualNetworks/', variables('virtualNetworkName'))]",

8
AzureResourceManager/Artifactory/MP_submission/nested/MSSQL_deploy.json
View File

@@ -47,7 +47,7 @@
"name": "[parameters('db_server')]",
"type": "Microsoft.Sql/servers",
"location": "[parameters('db_location')]",
"apiVersion": "2020-08-01-preview",
"apiVersion": "2021-11-01-preview",
"tags": {
"displayName": "artifactoryDB"
},
@@ -61,7 +61,7 @@
"name": "[uniqueString(parameters('db_server'), 'AllowAllWindowsAzureIps' )]",
"type": "firewallrules",
"location": "[parameters('db_location')]",
"apiVersion": "2020-08-01-preview",
"apiVersion": "2021-11-01-preview",
"dependsOn": [
"[resourceId('Microsoft.Sql/servers/', parameters('db_server'))]"
],
@@ -75,7 +75,7 @@
"type": "databases",
"kind": "v12.0,user",
"location": "[parameters('db_location')]",
"apiVersion": "2020-08-01-preview",
"apiVersion": "2021-11-01-preview",
"dependsOn": [
"[parameters('db_server')]"
],
@@ -105,4 +105,4 @@
"value": "[parameters('databases')]"
}
}
}
}

6
AzureResourceManager/Artifactory/nested/MSSQL_deploy.json
View File

@@ -47,7 +47,7 @@
"name": "[parameters('db_server')]",
"type": "Microsoft.Sql/servers",
"location": "[parameters('db_location')]",
"apiVersion": "2020-08-01-preview",
"apiVersion": "2021-11-01-preview",
"tags": {
"displayName": "artifactoryDB"
},
@@ -61,7 +61,7 @@
"name": "[uniqueString(parameters('db_server'), 'AllowAllWindowsAzureIps' )]",
"type": "firewallrules",
"location": "[parameters('db_location')]",
"apiVersion": "2020-08-01-preview",
"apiVersion": "2021-11-01-preview",
"dependsOn": [
"[resourceId('Microsoft.Sql/servers/', parameters('db_server'))]"
],
@@ -75,7 +75,7 @@
"type": "databases",
"kind": "v12.0,user",
"location": "[parameters('db_location')]",
"apiVersion": "2020-08-01-preview",
"apiVersion": "2021-11-01-preview",
"dependsOn": [
"[parameters('db_server')]"
],

6
AzureResourceManager/Xray/MP_submission/createUiDefinition.json
View File

@@ -123,7 +123,7 @@
"name": "xrayVersion",
"type": "Microsoft.Common.DropDown",
"label": "Xray-vm image version to deploy.",
"defaultValue": "3.42.5",
"defaultValue": "3.55.2",
"toolTip": "Version of Xray to deploy",
"constraints": {
"allowedValues": [
@@ -214,6 +214,10 @@
{
"label": "3.42.5",
"value": "0.0.34"
},
{
"label": "3.55.2",
"value": "0.0.35"
}
],
"required": true

17
AzureResourceManager/Xray/MP_submission/mainTemplate.json
View File

@@ -19,7 +19,7 @@
},
"xrayVersion": {
"type": "string",
"defaultValue": "0.0.34",
"defaultValue": "0.0.35",
"allowedValues": [
"0.0.10",
"0.0.11",
@@ -42,7 +42,8 @@
"0.0.31",
"0.0.32",
"0.0.33",
"0.0.34"
"0.0.34",
"0.0.35"
],
"metadata": {
"description": "Xray-vm image version to deploy."
@@ -221,7 +222,7 @@
},
"resources": [
{
"apiVersion": "2020-06-01",
"apiVersion": "2021-04-01",
"name": "pid-650cbcf5-daa5-4038-88f1-aa87d58f8f1a-partnercenter",
"type": "Microsoft.Resources/deployments",
"properties": {
@@ -236,7 +237,7 @@
{
"condition": "[equals(parameters('virtualNetworkNewOrExisting'),'new')]",
"type": "Microsoft.Network/virtualNetworks",
"apiVersion": "2020-05-01",
"apiVersion": "2022-05-01",
"name": "[parameters('virtualNetworkName')]",
"location": "[parameters('location')]",
"properties": {
@@ -258,7 +259,7 @@
{
"type": "Microsoft.Network/publicIPAddresses",
"name": "[variables('publicIPAddressName')]",
"apiVersion": "2020-05-01",
"apiVersion": "2022-05-01",
"location": "[parameters('location')]",
"properties": {
"publicIPAllocationMethod": "[variables('publicIPAddressType')]"
@@ -267,7 +268,7 @@
{
"type": "Microsoft.Network/networkInterfaces",
"name": "[variables('nicName')]",
"apiVersion": "2020-05-01",
"apiVersion": "2022-05-01",
"location": "[parameters('location')]",
"properties": {
"ipConfigurations": [
@@ -305,7 +306,7 @@
{
"type": "Microsoft.Resources/deployments",
"name": "deploySQLDB",
"apiVersion": "2020-06-01",
"apiVersion": "2021-04-01",
"properties": {
"mode": "Incremental",
"templateLink": {
@@ -338,7 +339,7 @@
"type": "Microsoft.Compute/virtualMachineScaleSets",
"name": "[concat(variables('namingInfix'), 'xrayScaleset')]",
"location": "[parameters('location')]",
"apiVersion": "2020-06-01",
"apiVersion": "2022-08-01",
"dependsOn": [
"[resourceId('Microsoft.Storage/storageAccounts/', variables('storageAccountName'))]",
"[resourceId('Microsoft.Network/networkInterfaces/', variables('nicName'))]"