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

ARM templates - RT 7.10.2, JCR 7.10.2, Xray 3.9.1

Browse Source 
- minor changes in VM image templates
This commit is contained in:
danielmkn
2020-10-19 14:12:07 -07:00
parent 3b97737dfc
commit 282d251e5d
15 changed files with 55 additions and 63 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.7.3",
"defaultValue": "7.10.2",
"toolTip": "Version of Artifactory to deploy",
"constraints": {
"allowedValues": [
@@ -167,6 +167,10 @@
{
"label": "7.7.3",
"value": "0.0.2"
},
{
"label": "7.10.2",
"value": "0.0.3"
}
],
"required": true

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

@@ -79,7 +79,7 @@
},
"artifactoryVersion": {
"type": "string",
"defaultValue": "0.0.2",
"defaultValue": "0.0.3",
"allowedValues": [
"6.6.0",
"6.6.1",
@@ -95,7 +95,8 @@
"7.4.3",
"7.4.30",
"0.0.1",
"0.0.2"
"0.0.2",
"0.0.3"
],
"metadata": {
"description": "Artifactory-vm image version to deploy."

11
AzureResourceManager/Artifactory/azuredeploy_ms_ps.json
View File

@@ -79,26 +79,21 @@
},
"artifactoryVersion": {
"type": "string",
"defaultValue": "0.0.2",
"defaultValue": "0.0.3",
"allowedValues": [
"6.6.0",
"6.6.1",
"6.7.0",
"6.8.0",
"6.11.3",
"6.15.0",
"0.16.0",
"0.17.0",
"6.18.0",
"7.0.0717",
"7.0.4001",
"7.2.1",
"7.4.3",
"7.4.30",
"7.4.31",
"7.5.7",
"0.0.1",
"0.0.2"
"0.0.2",
"0.0.3"
],
"metadata": {
"description": "Artifactory-vm image version to deploy."

3
AzureResourceManager/Artifactory/vm_install/vm_deploy.json
View File

@@ -41,9 +41,6 @@
"virtualMachineComputerName": {
"type": "String"
},
"diskNameSalt": {
"type": "String"
},
"storageAccountName": {
"type": "String"
},

3
AzureResourceManager/Artifactory/vm_install/vm_parameters.json
View File

@@ -64,9 +64,6 @@
"virtualMachineComputerName": {
"value": "rtvm"
},
"diskNameSalt": {
"value": "20200824153005"
},
"storageAccountName": {
"value": "mpstoragevhd"
},

6
AzureResourceManager/JCR/MP_submission_7/createUiDefinition.json
View File

@@ -101,7 +101,7 @@
"name": "artifactoryVersion",
"type": "Microsoft.Common.DropDown",
"label": "JFrog Container Registry-vm image version to deploy.",
"defaultValue": "7.7.3",
"defaultValue": "7.10.2",
"toolTip": "Version of JFrog Container Registry to deploy",
"constraints": {
"allowedValues": [
@@ -120,6 +120,10 @@
{
"label": "7.7.3",
"value": "0.0.2"
},
{
"label": "7.10.2",
"value": "0.0.3"
}
],
"required": true

5
AzureResourceManager/JCR/MP_submission_7/mainTemplate.json
View File

@@ -25,12 +25,13 @@
},
"artifactoryVersion": {
"type": "string",
"defaultValue": "0.0.2",
"defaultValue": "0.0.3",
"allowedValues": [
"7.2.1",
"7.3.2",
"7.4.3",
"0.0.2"
"0.0.2",
"0.0.3"
],
"metadata": {
"description": "JFrog Container Registry-vm image version to deploy."

5
AzureResourceManager/JCR/azuredeploy.json
View File

@@ -25,12 +25,13 @@
},
"artifactoryVersion": {
"type": "string",
"defaultValue": "0.0.2",
"defaultValue": "0.0.3",
"allowedValues": [
"7.2.1",
"7.3.2",
"7.4.3",
"0.0.2"
"0.0.2",
"0.0.3"
],
"metadata": {
"description": "JFrog Container Registry-vm image version to deploy."

41
AzureResourceManager/JCR/vm_install/vm_deploy.json
View File

@@ -5,11 +5,8 @@
"location": {
"type": "String"
},
"networkInterfaceName": {
"type": "String"
},
"networkSecurityGroupName": {
"type": "String"
"namingInfix": {
"type": "string"
},
"networkSecurityGroupRules": {
"type": "Array"
@@ -17,18 +14,12 @@
"subnetName": {
"type": "String"
},
"virtualNetworkName": {
"type": "String"
},
"addressPrefixes": {
"type": "Array"
},
"subnets": {
"type": "Array"
},
"publicIpAddressName": {
"type": "String"
},
"publicIpAddressType": {
"type": "String"
},
@@ -91,8 +82,12 @@
}
},
"variables": {
"nsgId": "[resourceId(resourceGroup().name, 'Microsoft.Network/networkSecurityGroups', parameters('networkSecurityGroupName'))]",
"vnetId": "[resourceId(resourceGroup().name,'Microsoft.Network/virtualNetworks', parameters('virtualNetworkName'))]",
"networkInterfaceName": "[concat(parameters('namingInfix'), '-nic')]",
"networkSecurityGroupName": "[concat(parameters('namingInfix'), '-nsg')]",
"virtualNetworkName": "[concat(parameters('namingInfix'), '-vnet')]",
"publicIpAddressName": "[concat(parameters('namingInfix'), '-public-ip')]",
"nsgId": "[resourceId(resourceGroup().name, 'Microsoft.Network/networkSecurityGroups', variables('networkSecurityGroupName'))]",
"vnetId": "[resourceId(resourceGroup().name,'Microsoft.Network/virtualNetworks', variables('virtualNetworkName'))]",
"subnetRef": "[concat(variables('vnetId'), '/subnets/', parameters('subnetName'))]",
"storageContainerUri": "[concat(concat('https://', parameters('storageAccountName'), '.blob.core.windows.net/'), 'vhds/')]",
"scriptName": "[parameters('scriptName')]",
@@ -105,12 +100,12 @@
{
"type": "Microsoft.Network/networkInterfaces",
"apiVersion": "2019-07-01",
"name": "[parameters('networkInterfaceName')]",
"name": "[variables('networkInterfaceName')]",
"location": "[parameters('location')]",
"dependsOn": [
"[concat('Microsoft.Network/networkSecurityGroups/', parameters('networkSecurityGroupName'))]",
"[concat('Microsoft.Network/virtualNetworks/', parameters('virtualNetworkName'))]",
"[concat('Microsoft.Network/publicIpAddresses/', parameters('publicIpAddressName'))]"
"[concat('Microsoft.Network/networkSecurityGroups/', variables('networkSecurityGroupName'))]",
"[concat('Microsoft.Network/virtualNetworks/', variables('virtualNetworkName'))]",
"[concat('Microsoft.Network/publicIpAddresses/', variables('publicIpAddressName'))]"
],
"properties": {
"ipConfigurations": [
@@ -122,7 +117,7 @@
},
"privateIPAllocationMethod": "Dynamic",
"publicIpAddress": {
"id": "[resourceId(resourceGroup().name, 'Microsoft.Network/publicIpAddresses', parameters('publicIpAddressName'))]"
"id": "[resourceId(resourceGroup().name, 'Microsoft.Network/publicIpAddresses', variables('publicIpAddressName'))]"
}
}
}
@@ -135,7 +130,7 @@
{
"type": "Microsoft.Network/networkSecurityGroups",
"apiVersion": "2019-02-01",
"name": "[parameters('networkSecurityGroupName')]",
"name": "[variables('networkSecurityGroupName')]",
"location": "[parameters('location')]",
"properties": {
"securityRules": "[parameters('networkSecurityGroupRules')]"
@@ -144,7 +139,7 @@
{
"type": "Microsoft.Network/virtualNetworks",
"apiVersion": "2019-09-01",
"name": "[parameters('virtualNetworkName')]",
"name": "[variables('virtualNetworkName')]",
"location": "[parameters('location')]",
"properties": {
"addressSpace": {
@@ -156,7 +151,7 @@
{
"type": "Microsoft.Network/publicIpAddresses",
"apiVersion": "2019-02-01",
"name": "[parameters('publicIpAddressName')]",
"name": "[variables('publicIpAddressName')]",
"location": "[parameters('location')]",
"sku": {
"name": "[parameters('publicIpAddressSku')]"
@@ -171,7 +166,7 @@
"name": "[parameters('virtualMachineName')]",
"location": "[parameters('location')]",
"dependsOn": [
"[concat('Microsoft.Network/networkInterfaces/', parameters('networkInterfaceName'))]",
"[concat('Microsoft.Network/networkInterfaces/', variables('networkInterfaceName'))]",
"[concat('Microsoft.Storage/storageAccounts/', parameters('diagnosticsStorageAccountName'))]"
],
"properties": {
@@ -196,7 +191,7 @@
"networkProfile": {
"networkInterfaces": [
{
"id": "[resourceId('Microsoft.Network/networkInterfaces', parameters('networkInterfaceName'))]"
"id": "[resourceId('Microsoft.Network/networkInterfaces', variables('networkInterfaceName'))]"
}
]
},

13
AzureResourceManager/JCR/vm_install/vm_parameters.json
View File

@@ -5,11 +5,8 @@
"location": {
"value": "westus2"
},
"networkInterfaceName": {
"value": "jcr-nic"
},
"networkSecurityGroupName": {
"value": "jcr-nsg"
"namingInfix": {
"value": "jcr"
},
"networkSecurityGroupRules": {
"value": [
@@ -31,9 +28,6 @@
"subnetName": {
"value": "default"
},
"virtualNetworkName": {
"value": "jcr-vm-test-vnet"
},
"addressPrefixes": {
"value": [
"10.0.0.0/24"
@@ -49,9 +43,6 @@
}
]
},
"publicIpAddressName": {
"value": "jcr-public-ip"
},
"publicIpAddressType": {
"value": "Dynamic"
},

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.8.5",
"defaultValue": "3.9.1",
"toolTip": "Version of Xray to deploy",
"constraints": {
"allowedValues": [
@@ -138,6 +138,10 @@
{
"label": "3.8.5",
"value": "0.0.5"
},
{
"label": "3.9.1",
"value": "0.0.6"
}
],
"required": true

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

@@ -19,11 +19,12 @@
},
"xrayVersion": {
"type": "string",
"defaultValue": "0.0.5",
"defaultValue": "0.0.6",
"allowedValues": [
"0.0.3",
"0.0.4",
"0.0.5"
"0.0.5",
"0.0.6"
],
"metadata": {
"description": "Xray-vm image version to deploy."

2
AzureResourceManager/Xray/azuredeploy_xray.parameters.json
View File

@@ -33,7 +33,7 @@
"value": "10.0.1.0/24"
},
"xrayVersion": {
"value": "0.0.4"
"value": "0.0.6"
},
"artifactoryURL": {
"value": "http://artifactory-url.cloudapp.azure.com"

5
AzureResourceManager/Xray/azuredeploy_xray_vmss.json
View File

@@ -19,11 +19,12 @@
},
"xrayVersion": {
"type": "string",
"defaultValue": "0.0.5",
"defaultValue": "0.0.6",
"allowedValues": [
"0.0.3",
"0.0.4",
"0.0.5"
"0.0.5",
"0.0.6"
],
"metadata": {
"description": "Xray-vm image version to deploy."

2
AzureResourceManager/Xray/vm_install/vm_parameters.json
View File

@@ -90,7 +90,7 @@
"value": "OWERWRITE_THE_PASSWORD"
},
"artifactoryVersion": {
"value": "3.8.5"
"value": "3.9.1"
},
"scriptName": {
"value": "install_xray_to_vm.sh"