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

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

8
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.4.3",
"defaultValue": "7.7.3",
"toolTip": "Version of JFrog Container Registry to deploy",
"constraints": {
"allowedValues": [
@@ -116,6 +116,10 @@
{
"label": "7.4.3",
"value": "7.4.3"
},
{
"label": "7.7.3",
"value": "0.0.2"
}
],
"required": true
@@ -132,7 +136,7 @@
"toolTip": "Master key for JFrog Container Registry cluster. Generate master.key using command '$openssl rand -hex 16'",
"constraints": {
"required": true,
"regex": "^[a-z0-9A-Z]{1,32}$",
"regex": "^[a-z0-9A-Z]{12,32}$",
"validationMessage": "Only alphanumeric characters are allowed, and the value must be 1-32 characters long."
},
"options": {

BIN
AzureResourceManager/JCR/MP_submission_7/jfrog-container-registry-artifactory-7-7-3-0.zip Normal file
View File

Binary file not shown.

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",

10
AzureResourceManager/JCR/MP_submission_7/nested/azureDBDeploy.json
View File

@@ -43,7 +43,7 @@
"type": "Microsoft.Sql/servers",
"kind": "v12.0",
"location": "[variables('db_location')]",
"apiVersion": "2019-06-01-preview",
"apiVersion": "2020-02-02-preview",
"tags": {
"displayName": "artifactoryDB"
},
@@ -57,9 +57,9 @@
"name": "[uniqueString(parameters('db_server'), 'AllowAllWindowsAzureIps' )]",
"type": "firewallrules",
"location": "[variables('db_location')]",
"apiVersion": "2019-06-01-preview",
"apiVersion": "2020-02-02-preview",
"dependsOn": [
"[concat('Microsoft.Sql/servers/', parameters('db_server'))]"
"[resourceId('Microsoft.Sql/servers/', parameters('db_server'))]"
],
"properties": {
"startIpAddress": "0.0.0.0",
@@ -71,7 +71,7 @@
"type": "databases",
"kind": "v12.0,user",
"location": "[variables('db_location')]",
"apiVersion": "2019-06-01-preview",
"apiVersion": "2020-02-02-preview",
"dependsOn": [
"[parameters('db_server')]"
],
@@ -90,7 +90,7 @@
"outputs": {
"jdbcConnString": {
"type": "string",
"value": "[concat('jdbc:sqlserver://', reference(concat('Microsoft.Sql/servers/', parameters('db_server'))).fullyQualifiedDomainName, ':1433')]"
"value": "[concat('jdbc:sqlserver://', reference(resourceId('Microsoft.Sql/servers/', parameters('db_server'))).fullyQualifiedDomainName, ':1433')]"
}
}
}