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

7.7.3 (#39)

Browse Source 
* ARM templates - 7.7.3 support added. Pro and JCR

* ARM templates - Xray 3.8.2 support

* ARM templates - Nginx configuration changed for JCR

* ARM templates - Xray ARM extension script, yq added, Rabbitmq default password added

* ARM templates - Xray, Extension script changes

* ARM templates - RT readme updated, branch for extensions scripts switched back to master

* ARM templates - JCR, updated API, best practives

* ARM templates - Nginx configuration changed for JCR

* ARM templates - MP submissions, Xray installation script changes, master key minimun char number added in JCR

* ARM templates - Parameters draft
This commit is contained in:
Daniel Miakotkin
2020-09-08 13:35:04 -07:00
committed by GitHub
parent 31a0a8b830
commit d56935b274
25 changed files with 185 additions and 492 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -25,11 +25,12 @@
},
"artifactoryVersion": {
"type": "string",
"defaultValue": "7.4.3",
"defaultValue": "0.0.2",
"allowedValues": [
"7.2.1",
"7.3.2",
"7.4.3"
"7.4.3",
"0.0.2"
],
"metadata": {
"description": "JFrog Container Registry-vm image version to deploy."
@@ -213,7 +214,7 @@
"type": "Microsoft.Network/networkSecurityGroups",
"location": "[parameters('location')]",
"name": "[variables('nsgName')]",
"apiVersion": "2018-07-01",
"apiVersion": "2020-03-01",
"properties": {
"securityRules": [
{
@@ -293,9 +294,9 @@
"type": "Microsoft.Network/virtualNetworks",
"name": "[variables('virtualNetworkName')]",
"location": "[parameters('location')]",
"apiVersion": "2018-07-01",
"apiVersion": "2020-03-01",
"dependsOn": [
"[concat('Microsoft.Network/networkSecurityGroups/', variables('nsgName'))]"
"[resourceId('Microsoft.Network/networkSecurityGroups/', variables('nsgName'))]"
],
"properties": {
"addressSpace": {
@@ -317,14 +318,14 @@
}
},
{
"apiVersion": "2018-07-01",
"apiVersion": "2020-03-01",
"type": "Microsoft.Network/networkInterfaces",
"name": "[variables('nicPrimaryName')]",
"location": "[parameters('location')]",
"dependsOn": [
"[concat('Microsoft.Network/publicIPAddresses/', variables('pipPrimaryName'))]",
"[concat('Microsoft.Network/virtualNetworks/', variables('virtualNetworkName'))]",
"[resourceId('Microsoft.Network/networkSecurityGroups', variables('nsgName'))]"
"[resourceId('Microsoft.Network/publicIPAddresses/', variables('pipPrimaryName'))]",
"[resourceId('Microsoft.Network/virtualNetworks/', variables('virtualNetworkName'))]",
"[resourceId('Microsoft.Network/networkSecurityGroups/', variables('nsgName'))]"
],
"properties": {
"ipConfigurations": [
@@ -350,7 +351,7 @@
"sku": {
"name": "Standard"
},
"apiVersion": "2018-07-01",
"apiVersion": "2020-03-01",
"properties": {
"publicIPAllocationMethod": "Static",
"dnsSettings": {
@@ -362,12 +363,12 @@
"type": "Microsoft.Network/loadBalancers",
"name": "[variables('lbName')]",
"location": "[parameters('location')]",
"apiVersion": "2018-07-01",
"apiVersion": "2020-03-01",
"sku": {
"name": "Standard"
},
"dependsOn": [
"[concat('Microsoft.Network/publicIPAddresses/', variables('pipPrimaryName'))]"
"[resourceId('Microsoft.Network/publicIPAddresses/', variables('pipPrimaryName'))]"
],
"tags":{
"displayName": "Load Balancer"
@@ -468,7 +469,7 @@
}
},
{
"apiVersion": "2018-07-01",
"apiVersion": "2019-06-01",
"type": "Microsoft.Storage/storageAccounts",
"name": "[variables('storageAccountName')]",
"location": "[parameters('location')]",
@@ -484,7 +485,7 @@
{
"type": "Microsoft.Resources/deployments",
"name": "deploySQLDB",
"apiVersion": "2018-07-01",
"apiVersion": "2019-09-01",
"properties": {
"mode": "Incremental",
"templateLink": {
@@ -519,10 +520,10 @@
"location": "[parameters('location')]",
"apiVersion": "2018-10-01",
"dependsOn": [
"[concat('Microsoft.Network/loadBalancers/', variables('lbName'))]",
"[concat('Microsoft.Network/virtualNetworks/', variables('virtualNetworkName'))]",
"[concat('Microsoft.Resources/deployments/', 'deploySQLDB')]",
"[concat('Microsoft.Storage/storageAccounts/', variables('storageAccountName'))]"
"[resourceId('Microsoft.Network/loadBalancers/', variables('lbName'))]",
"[resourceId('Microsoft.Network/virtualNetworks/', variables('virtualNetworkName'))]",
"[resourceId('Microsoft.Resources/deployments/', 'deploySQLDB')]",
"[resourceId('Microsoft.Storage/storageAccounts/', variables('storageAccountName'))]"
],
"plan": {
"name": "artifactory-jcr",