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

Merge pull request #220 from jfrog/arm-7.33.9

Browse Source 
Arm 7.33.9
This commit is contained in:
Logeshwar Sekar
2022-06-15 23:21:18 +05:30
committed by GitHub
parent 450c237094 070ea557dc
commit 0257f38ca7
9 changed files with 236 additions and 200 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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.29.8", "defaultValue": "7.37.14",
"toolTip": "Version of Artifactory to deploy", "toolTip": "Version of Artifactory to deploy",
"constraints": { "constraints": {
"allowedValues": [ "allowedValues": [
@@ -140,85 +140,101 @@
"label": "7.12.5", "label": "7.12.5",
"value": "0.0.8" "value": "0.0.8"
}, },
{ {
"label": "7.12.6", "label": "7.12.6",
"value": "0.0.9" "value": "0.0.9"
}, },
{ {
"label": "7.12.8", "label": "7.12.8",
"value": "0.0.10" "value": "0.0.10"
}, },
{ {
"label": "7.15.3", "label": "7.15.3",
"value": "0.0.11" "value": "0.0.11"
}, },
{ {
"label": "7.15.4", "label": "7.15.4",
"value": "0.0.12" "value": "0.0.12"
}, },
{ {
"label": "7.17.4", "label": "7.17.4",
"value": "0.0.14" "value": "0.0.14"
}, },
{ {
"label": "7.17.5", "label": "7.17.5",
"value": "0.0.15" "value": "0.0.15"
}, },
{ {
"label": "7.18.6", "label": "7.18.6",
"value": "0.0.18" "value": "0.0.18"
}, },
{ {
"label": "7.19.4", "label": "7.19.4",
"value": "0.0.19" "value": "0.0.19"
}, },
{ {
"label": "7.21.3", "label": "7.21.3",
"value": "0.0.21" "value": "0.0.21"
}, },
{ {
"label": "7.21.8", "label": "7.21.8",
"value": "0.0.22" "value": "0.0.22"
}, },
{ {
"label": "7.21.12", "label": "7.21.12",
"value": "0.0.23" "value": "0.0.23"
}, },
{ {
"label": "7.24.3", "label": "7.24.3",
"value": "0.0.25" "value": "0.0.25"
}, },
{ {
"label": "7.25.6", "label": "7.25.6",
"value": "0.0.27" "value": "0.0.27"
}, },
{ {
"label": "7.25.7", "label": "7.25.7",
"value": "0.0.28" "value": "0.0.28"
}, },
{ {
"label": "7.27.3", "label": "7.27.3",
"value": "0.0.29" "value": "0.0.29"
}, },
{ {
"label": "7.27.6", "label": "7.27.6",
"value": "0.0.30" "value": "0.0.30"
}, },
{ {
"label": "7.27.9", "label": "7.27.9",
"value": "0.0.32" "value": "0.0.32"
}, },
{ {
"label": "7.27.10", "label": "7.27.10",
"value": "0.0.33" "value": "0.0.33"
}, },
{ {
"label": "7.29.7", "label": "7.29.7",
"value": "0.0.34" "value": "0.0.34"
}, },
{ {
"label": "7.29.8", "label": "7.29.8",
"value": "0.0.35" "value": "0.0.35"
},
{
"label": "7.33.9",
"value": "0.0.37"
},
{
"label": "7.33.12",
"value": "0.0.38"
},
{
"label": "7.35.2",
"value": "0.0.39"
},
{
"label": "7.37.14",
"value": "0.0.40"
} }
], ],
"required": true "required": true
@@ -232,11 +248,11 @@
"password": "Artifactory master Key", "password": "Artifactory master Key",
"confirmPassword": "Confirm master Key" "confirmPassword": "Confirm master Key"
}, },
"toolTip": "Master key for Artifactory cluster. Generate master.key using command '$openssl rand -hex 16'", "toolTip": "Master key for Artifactory cluster. Generate master.key using command '$openssl rand -hex 32'",
"constraints": { "constraints": {
"required": true, "required": true,
"regex": "^[a-z0-9A-Z]{12,32}$", "regex": "^[a-z0-9A-Z]{12,64}$",
"validationMessage": "Only alphanumeric characters are allowed, and the value must be 1-32 characters long." "validationMessage": "Only alphanumeric characters are allowed, and the value must be 1-64 characters long."
}, },
"options": { "options": {
"hideConfirmation": true "hideConfirmation": true
@@ -249,11 +265,11 @@
"password": "Artifactory join Key", "password": "Artifactory join Key",
"confirmPassword": "Confirm join Key" "confirmPassword": "Confirm join Key"
}, },
"toolTip": "Join key for Artifactory cluster. Generate join.key using command '$openssl rand -hex 16'", "toolTip": "Join key for Artifactory cluster. Generate join.key using command '$openssl rand -hex 32'",
"constraints": { "constraints": {
"required": false, "required": false,
"regex": "^[a-z0-9A-Z]{12,32}$", "regex": "^[a-z0-9A-Z]{12,64}$",
"validationMessage": "Only alphanumeric characters are allowed, and the value must be 1-32 characters long." "validationMessage": "Only alphanumeric characters are allowed, and the value must be 1-64 characters long."
}, },
"options": { "options": {
"hideConfirmation": true "hideConfirmation": true

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

@@ -79,29 +79,33 @@
}, },
"artifactoryVersion": { "artifactoryVersion": {
"type": "string", "type": "string",
"defaultValue": "0.0.35", "defaultValue": "0.0.40",
"allowedValues": [ "allowedValues": [
"0.0.8", "0.0.8",
"0.0.9", "0.0.9",
"0.0.10", "0.0.10",
"0.0.11", "0.0.11",
"0.0.12", "0.0.12",
"0.0.14", "0.0.14",
"0.0.15", "0.0.15",
"0.0.18", "0.0.18",
"0.0.19", "0.0.19",
"0.0.21", "0.0.21",
"0.0.22", "0.0.22",
"0.0.23", "0.0.23",
"0.0.25", "0.0.25",
"0.0.27", "0.0.27",
"0.0.28", "0.0.28",
"0.0.29", "0.0.29",
"0.0.30", "0.0.30",
"0.0.32", "0.0.32",
"0.0.33", "0.0.33",
"0.0.34", "0.0.34",
"0.0.35" "0.0.35",
"0.0.37",
"0.0.38",
"0.0.39",
"0.0.40"
], ],
"metadata": { "metadata": {
"description": "Artifactory-vm image version to deploy." "description": "Artifactory-vm image version to deploy."
@@ -175,7 +179,7 @@
}, },
"certificateKey": { "certificateKey": {
"type": "securestring", "type": "securestring",
"metadata": { "metadata": {
"description": "Provide your SSL Certificate key" "description": "Provide your SSL Certificate key"
} }
}, },
@@ -183,7 +187,7 @@
"type": "string", "type": "string",
"minLength": 1, "minLength": 1,
"defaultValue": "artifactory", "defaultValue": "artifactory",
"metadata": { "metadata": {
"description": "Provide your Certificate Domain Name. For e.g jfrog.team for certificate with *.jfrog.team" "description": "Provide your Certificate Domain Name. For e.g jfrog.team for certificate with *.jfrog.team"
} }
}, },
@@ -191,7 +195,7 @@
"type": "string", "type": "string",
"minLength": 1, "minLength": 1,
"defaultValue": "artifactory", "defaultValue": "artifactory",
"metadata": { "metadata": {
"description": "Provide artifactory server name to be used in Nginx. e.g artifactory for artifactory.jfrog.team" "description": "Provide artifactory server name to be used in Nginx. e.g artifactory for artifactory.jfrog.team"
} }
}, },
@@ -199,7 +203,7 @@
"type": "string", "type": "string",
"minLength": 1, "minLength": 1,
"defaultValue": "-server -Xms2g -Xmx8g -Xss256k -XX:+UseG1GC -XX:OnOutOfMemoryError=\\\"kill -9 %p\\\"", "defaultValue": "-server -Xms2g -Xmx8g -Xss256k -XX:+UseG1GC -XX:OnOutOfMemoryError=\\\"kill -9 %p\\\"",
"metadata": { "metadata": {
"description": "Setting Java Memory Parameters for Artifactory. Learn about system requirements for Artifactory https://www.jfrog.com/confluence/display/RTF/System+Requirements#SystemRequirements-RecommendedHardware." "description": "Setting Java Memory Parameters for Artifactory. Learn about system requirements for Artifactory https://www.jfrog.com/confluence/display/RTF/System+Requirements#SystemRequirements-RecommendedHardware."
} }
}, },
@@ -323,7 +327,7 @@
}, },
"resources": [ "resources": [
{ {
"apiVersion": "2020-06-01", "apiVersion": "2021-12-01",
"name": "pid-9cc90849-b021-4272-a33f-1922bd5c0f99-partnercenter", "name": "pid-9cc90849-b021-4272-a33f-1922bd5c0f99-partnercenter",
"type": "Microsoft.Resources/deployments", "type": "Microsoft.Resources/deployments",
"properties": { "properties": {
@@ -340,7 +344,7 @@
"type": "Microsoft.Network/networkSecurityGroups", "type": "Microsoft.Network/networkSecurityGroups",
"location": "[parameters('location')]", "location": "[parameters('location')]",
"name": "[variables('nsgName')]", "name": "[variables('nsgName')]",
"apiVersion": "2020-03-01", "apiVersion": "2021-12-01",
"properties": { "properties": {
"securityRules": [ "securityRules": [
{ {
@@ -420,7 +424,7 @@
"type": "Microsoft.Network/virtualNetworks", "type": "Microsoft.Network/virtualNetworks",
"name": "[variables('virtualNetworkName')]", "name": "[variables('virtualNetworkName')]",
"location": "[parameters('location')]", "location": "[parameters('location')]",
"apiVersion": "2020-03-01", "apiVersion": "2021-12-01",
"dependsOn": [ "dependsOn": [
"[resourceId('Microsoft.Network/networkSecurityGroups/', variables('nsgName'))]" "[resourceId('Microsoft.Network/networkSecurityGroups/', variables('nsgName'))]"
], ],
@@ -453,7 +457,7 @@
} }
}, },
{ {
"apiVersion": "2020-03-01", "apiVersion": "2021-12-01",
"type": "Microsoft.Network/networkInterfaces", "type": "Microsoft.Network/networkInterfaces",
"name": "[variables('nicPrimaryName')]", "name": "[variables('nicPrimaryName')]",
"location": "[parameters('location')]", "location": "[parameters('location')]",
@@ -480,7 +484,7 @@
} }
}, },
{ {
"apiVersion": "2020-03-01", "apiVersion": "2021-12-01",
"type": "Microsoft.Network/networkInterfaces", "type": "Microsoft.Network/networkInterfaces",
"name": "[variables('nicMemberName')]", "name": "[variables('nicMemberName')]",
"location": "[parameters('location')]", "location": "[parameters('location')]",
@@ -513,7 +517,7 @@
"sku": { "sku": {
"name": "Standard" "name": "Standard"
}, },
"apiVersion": "2020-03-01", "apiVersion": "2021-12-01",
"properties": { "properties": {
"publicIPAllocationMethod": "Static", "publicIPAllocationMethod": "Static",
"dnsSettings": { "dnsSettings": {
@@ -528,7 +532,7 @@
"sku": { "sku": {
"name": "Standard" "name": "Standard"
}, },
"apiVersion": "2020-03-01", "apiVersion": "2021-12-01",
"properties": { "properties": {
"publicIPAllocationMethod": "Static", "publicIPAllocationMethod": "Static",
"dnsSettings": { "dnsSettings": {
@@ -540,7 +544,7 @@
"type": "Microsoft.Network/loadBalancers", "type": "Microsoft.Network/loadBalancers",
"name": "[variables('lbName')]", "name": "[variables('lbName')]",
"location": "[parameters('location')]", "location": "[parameters('location')]",
"apiVersion": "2020-03-01", "apiVersion": "2021-12-01",
"sku": { "sku": {
"name": "Standard" "name": "Standard"
}, },
@@ -548,7 +552,7 @@
"[resourceId('Microsoft.Network/publicIPAddresses/', variables('pipPrimaryName'))]", "[resourceId('Microsoft.Network/publicIPAddresses/', variables('pipPrimaryName'))]",
"[resourceId('Microsoft.Network/publicIPAddresses/', variables('pipMemberName'))]" "[resourceId('Microsoft.Network/publicIPAddresses/', variables('pipMemberName'))]"
], ],
"tags":{ "tags": {
"displayName": "Load Balancer" "displayName": "Load Balancer"
}, },
"properties": { "properties": {
@@ -736,7 +740,7 @@
"sku": { "sku": {
"name": "[parameters('storageAccountType')]" "name": "[parameters('storageAccountType')]"
}, },
"tags":{ "tags": {
"displayName": "Artifactory Storage Account" "displayName": "Artifactory Storage Account"
}, },
"kind": "Storage", "kind": "Storage",
@@ -820,7 +824,7 @@
"computerNamePrefix": "[variables('namingInfix')]", "computerNamePrefix": "[variables('namingInfix')]",
"adminUsername": "[parameters('adminUsername')]", "adminUsername": "[parameters('adminUsername')]",
"adminPassword": "[parameters('adminPassword')]", "adminPassword": "[parameters('adminPassword')]",
"customData": "[base64(concat('#INSTALL SCRIPT INPUTS\nARTIFACTORY_VERSION=', parameters('artifactoryVersion'),'\nCERTIFICATE_KEY=',variables('certificateKey'),'\nCERTIFICATE=', variables('certificate'),'\nCERTIFICATE_DOMAIN=',variables('certificateDomain'),'\nDB_TYPE=',parameters('db_type'),'\nARTIFACTORY_SERVER_NAME=',variables('artifactoryServerName'),'\nEXTRA_JAVA_OPTS=',variables('extraJavaOptions'),'\nJDBC_STR=',reference('Microsoft.Resources/deployments/deploySQLDB').outputs.jdbcConnString.value,'\nDB_NAME=',variables('artDBname'),'\nDB_ADMIN_USER=',variables('db_user'),'\nDB_ADMIN_PASSWD=',variables('db_password'),'\nSTO_ACT_NAME=',variables('storageAccountName'),'\nSTO_ACT_ENDPOINT=',reference(resourceId('Microsoft.Storage/storageAccounts/', variables('storageAccountName'))).primaryEndpoints.blob,'\nSTO_CTR_NAME=',variables('vmStorageAccountContainerName'),'\nSTO_ACT_KEY=',listKeys(resourceId('Microsoft.Storage/storageAccounts', variables('storageAccountName')), '2018-07-01').keys[0].value,'\nMASTER_KEY=',variables('masterKey'),'\nJOIN_KEY=',variables('joinKey'),'\nIS_PRIMARY=','true','\nLOCATION=',parameters('location'),'\nLICENSE1=',variables('artifactoryLicense1'),'\nLICENSE2=',variables('artifactoryLicense2'),'\nLICENSE3=',variables('artifactoryLicense3'),'\nLICENSE4=',variables('artifactoryLicense4'),'\nLICENSE5=',variables('artifactoryLicense5'),'\n'))]" "customData": "[base64(concat('#INSTALL SCRIPT INPUTS\nARTIFACTORY_VERSION=', parameters('artifactoryVersion'),'\nCERTIFICATE_KEY=',variables('certificateKey'),'\nCERTIFICATE=', variables('certificate'),'\nCERTIFICATE_DOMAIN=',variables('certificateDomain'),'\nDB_TYPE=',parameters('db_type'),'\nARTIFACTORY_SERVER_NAME=',variables('artifactoryServerName'),'\nEXTRA_JAVA_OPTS=',variables('extraJavaOptions'),'\nJDBC_STR=',reference('Microsoft.Resources/deployments/deploySQLDB').outputs.jdbcConnString.value,'\nDB_NAME=',variables('artDBname'),'\nDB_ADMIN_USER=',variables('db_user'),'\nDB_ADMIN_PASSWD=',variables('db_password'),'\nSTO_ACT_NAME=',variables('storageAccountName'),'\nSTO_ACT_ENDPOINT=',reference(resourceId('Microsoft.Storage/storageAccounts/', variables('storageAccountName'))).primaryEndpoints.blob,'\nSTO_CTR_NAME=',variables('vmStorageAccountContainerName'),'\nSTO_ACT_KEY=',listKeys(resourceId('Microsoft.Storage/storageAccounts', variables('storageAccountName')), '2021-09-01').keys[0].value,'\nMASTER_KEY=',variables('masterKey'),'\nJOIN_KEY=',variables('joinKey'),'\nIS_PRIMARY=','true','\nLOCATION=',parameters('location'),'\nLICENSE1=',variables('artifactoryLicense1'),'\nLICENSE2=',variables('artifactoryLicense2'),'\nLICENSE3=',variables('artifactoryLicense3'),'\nLICENSE4=',variables('artifactoryLicense4'),'\nLICENSE5=',variables('artifactoryLicense5'),'\n'))]"
}, },
"networkProfile": { "networkProfile": {
"networkInterfaceConfigurations": [ "networkInterfaceConfigurations": [
@@ -917,7 +921,7 @@
"computerNamePrefix": "[variables('namingInfix')]", "computerNamePrefix": "[variables('namingInfix')]",
"adminUsername": "[parameters('adminUsername')]", "adminUsername": "[parameters('adminUsername')]",
"adminPassword": "[parameters('adminPassword')]", "adminPassword": "[parameters('adminPassword')]",
"customData": "[base64(concat('#INSTALL SCRIPT INPUTS\nARTIFACTORY_VERSION=', parameters('artifactoryVersion'),'\nCERTIFICATE_KEY=',variables('certificateKey'),'\nCERTIFICATE=', variables('certificate'),'\nCERTIFICATE_DOMAIN=',variables('certificateDomain'),'\nDB_TYPE=',parameters('db_type'),'\nARTIFACTORY_SERVER_NAME=',variables('artifactoryServerName'),'\nEXTRA_JAVA_OPTS=',variables('extraJavaOptions'),'\nJDBC_STR=',reference('Microsoft.Resources/deployments/deploySQLDB').outputs.jdbcConnString.value,'\nDB_NAME=',variables('artDBname'),'\nDB_ADMIN_USER=',variables('db_user'),'\nDB_ADMIN_PASSWD=',variables('db_password'),'\nSTO_ACT_NAME=',variables('storageAccountName'),'\nSTO_ACT_ENDPOINT=',reference(resourceId('Microsoft.Storage/storageAccounts/', variables('storageAccountName'))).primaryEndpoints.blob,'\nSTO_CTR_NAME=',variables('vmStorageAccountContainerName'),'\nSTO_ACT_KEY=',listKeys(resourceId('Microsoft.Storage/storageAccounts', variables('storageAccountName')), '2018-07-01').keys[0].value,'\nMASTER_KEY=',variables('masterKey'),'\nJOIN_KEY=',variables('joinKey'),'\nIS_PRIMARY=','false','\nLOCATION=',parameters('location'),'\nLICENSE1=',variables('artifactoryLicense1'),'\nLICENSE2=',variables('artifactoryLicense2'),'\nLICENSE3=',variables('artifactoryLicense3'),'\nLICENSE4=',variables('artifactoryLicense4'),'\nLICENSE5=',variables('artifactoryLicense5'),'\n'))]" "customData": "[base64(concat('#INSTALL SCRIPT INPUTS\nARTIFACTORY_VERSION=', parameters('artifactoryVersion'),'\nCERTIFICATE_KEY=',variables('certificateKey'),'\nCERTIFICATE=', variables('certificate'),'\nCERTIFICATE_DOMAIN=',variables('certificateDomain'),'\nDB_TYPE=',parameters('db_type'),'\nARTIFACTORY_SERVER_NAME=',variables('artifactoryServerName'),'\nEXTRA_JAVA_OPTS=',variables('extraJavaOptions'),'\nJDBC_STR=',reference('Microsoft.Resources/deployments/deploySQLDB').outputs.jdbcConnString.value,'\nDB_NAME=',variables('artDBname'),'\nDB_ADMIN_USER=',variables('db_user'),'\nDB_ADMIN_PASSWD=',variables('db_password'),'\nSTO_ACT_NAME=',variables('storageAccountName'),'\nSTO_ACT_ENDPOINT=',reference(resourceId('Microsoft.Storage/storageAccounts/', variables('storageAccountName'))).primaryEndpoints.blob,'\nSTO_CTR_NAME=',variables('vmStorageAccountContainerName'),'\nSTO_ACT_KEY=',listKeys(resourceId('Microsoft.Storage/storageAccounts', variables('storageAccountName')), '2021-09-01').keys[0].value,'\nMASTER_KEY=',variables('masterKey'),'\nJOIN_KEY=',variables('joinKey'),'\nIS_PRIMARY=','false','\nLOCATION=',parameters('location'),'\nLICENSE1=',variables('artifactoryLicense1'),'\nLICENSE2=',variables('artifactoryLicense2'),'\nLICENSE3=',variables('artifactoryLicense3'),'\nLICENSE4=',variables('artifactoryLicense4'),'\nLICENSE5=',variables('artifactoryLicense5'),'\n'))]"
}, },
"networkProfile": { "networkProfile": {
"networkInterfaceConfigurations": [ "networkInterfaceConfigurations": [
@@ -976,7 +980,7 @@
], ],
"outputs": { "outputs": {
"fqdn": { "fqdn": {
"value": "[reference(resourceId('Microsoft.Network/publicIPAddresses',variables('pipMemberName')),'2018-07-01').dnsSettings.fqdn]", "value": "[reference(resourceId('Microsoft.Network/publicIPAddresses',variables('pipMemberName')),'2021-12-01').dnsSettings.fqdn]",
"type": "string" "type": "string"
} }
} }

64
AzureResourceManager/Artifactory/azuredeploy.json
View File

@@ -79,29 +79,33 @@
}, },
"artifactoryVersion": { "artifactoryVersion": {
"type": "string", "type": "string",
"defaultValue": "0.0.35", "defaultValue": "0.0.40",
"allowedValues": [ "allowedValues": [
"0.0.8", "0.0.8",
"0.0.9", "0.0.9",
"0.0.10", "0.0.10",
"0.0.11", "0.0.11",
"0.0.12", "0.0.12",
"0.0.14", "0.0.14",
"0.0.15", "0.0.15",
"0.0.18", "0.0.18",
"0.0.19", "0.0.19",
"0.0.21", "0.0.21",
"0.0.22", "0.0.22",
"0.0.23", "0.0.23",
"0.0.25", "0.0.25",
"0.0.27", "0.0.27",
"0.0.28", "0.0.28",
"0.0.29", "0.0.29",
"0.0.30", "0.0.30",
"0.0.32", "0.0.32",
"0.0.33", "0.0.33",
"0.0.34", "0.0.34",
"0.0.35" "0.0.35",
"0.0.37",
"0.0.38",
"0.0.39",
"0.0.40"
], ],
"metadata": { "metadata": {
"description": "Artifactory-vm image version to deploy." "description": "Artifactory-vm image version to deploy."
@@ -111,14 +115,14 @@
"type": "securestring", "type": "securestring",
"maxLength": 64, "maxLength": 64,
"metadata": { "metadata": {
"description": "Master key for Artifactory cluster. Generate master.key using command '$openssl rand -hex 16'" "description": "Master key for Artifactory cluster. Generate master.key using command '$openssl rand -hex 32'"
} }
}, },
"joinKey": { "joinKey": {
"type": "securestring", "type": "securestring",
"maxLength": 64, "maxLength": 64,
"metadata": { "metadata": {
"description": "Join key for Artifactory cluster. Generate join.key using command '$openssl rand -hex 16'" "description": "Join key for Artifactory cluster. Generate join.key using command '$openssl rand -hex 32'"
} }
}, },
"adminUsername": { "adminUsername": {
@@ -175,7 +179,7 @@
}, },
"certificateKey": { "certificateKey": {
"type": "securestring", "type": "securestring",
"metadata": { "metadata": {
"description": "Provide your SSL Certificate key" "description": "Provide your SSL Certificate key"
} }
}, },
@@ -183,7 +187,7 @@
"type": "string", "type": "string",
"minLength": 1, "minLength": 1,
"defaultValue": "artifactory", "defaultValue": "artifactory",
"metadata": { "metadata": {
"description": "Provide your Certificate Domain Name. For e.g jfrog.team for certificate with *.jfrog.team" "description": "Provide your Certificate Domain Name. For e.g jfrog.team for certificate with *.jfrog.team"
} }
}, },
@@ -191,7 +195,7 @@
"type": "string", "type": "string",
"minLength": 1, "minLength": 1,
"defaultValue": "artifactory", "defaultValue": "artifactory",
"metadata": { "metadata": {
"description": "Provide artifactory server name to be used in Nginx. e.g artifactory for artifactory.jfrog.team" "description": "Provide artifactory server name to be used in Nginx. e.g artifactory for artifactory.jfrog.team"
} }
}, },
@@ -199,7 +203,7 @@
"type": "string", "type": "string",
"minLength": 1, "minLength": 1,
"defaultValue": "-server -Xms2g -Xmx8g -Xss256k -XX:+UseG1GC -XX:OnOutOfMemoryError=\\\"kill -9 %p\\\"", "defaultValue": "-server -Xms2g -Xmx8g -Xss256k -XX:+UseG1GC -XX:OnOutOfMemoryError=\\\"kill -9 %p\\\"",
"metadata": { "metadata": {
"description": "Setting Java Memory Parameters for Artifactory. Learn about system requirements for Artifactory https://www.jfrog.com/confluence/display/RTF/System+Requirements#SystemRequirements-RecommendedHardware." "description": "Setting Java Memory Parameters for Artifactory. Learn about system requirements for Artifactory https://www.jfrog.com/confluence/display/RTF/System+Requirements#SystemRequirements-RecommendedHardware."
} }
}, },
@@ -534,7 +538,7 @@
"[resourceId('Microsoft.Network/publicIPAddresses/', variables('pipPrimaryName'))]", "[resourceId('Microsoft.Network/publicIPAddresses/', variables('pipPrimaryName'))]",
"[resourceId('Microsoft.Network/publicIPAddresses/', variables('pipMemberName'))]" "[resourceId('Microsoft.Network/publicIPAddresses/', variables('pipMemberName'))]"
], ],
"tags":{ "tags": {
"displayName": "Load Balancer" "displayName": "Load Balancer"
}, },
"properties": { "properties": {
@@ -722,7 +726,7 @@
"sku": { "sku": {
"name": "[parameters('storageAccountType')]" "name": "[parameters('storageAccountType')]"
}, },
"tags":{ "tags": {
"displayName": "Artifactory Storage Account" "displayName": "Artifactory Storage Account"
}, },
"kind": "Storage", "kind": "Storage",

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

@@ -1,5 +1,5 @@
{ {
"$schema": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#", "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentTemplate.json#",
"contentVersion": "1.0.0.0", "contentVersion": "1.0.0.0",
"parameters": { "parameters": {
"location": { "location": {

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

@@ -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.38.2", "defaultValue": "3.42.5",
"toolTip": "Version of Xray to deploy", "toolTip": "Version of Xray to deploy",
"constraints": { "constraints": {
"allowedValues": [ "allowedValues": [
@@ -176,36 +176,44 @@
"value": "0.0.24" "value": "0.0.24"
}, },
{ {
"label": "3.29.0", "label": "3.29.0",
"value": "0.0.25" "value": "0.0.25"
}, },
{ {
"label": "3.29.2", "label": "3.29.2",
"value": "0.0.26" "value": "0.0.26"
}, },
{ {
"label": "3.32.2", "label": "3.32.2",
"value": "0.0.27" "value": "0.0.27"
}, },
{ {
"label": "3.33.3", "label": "3.33.3",
"value": "0.0.28" "value": "0.0.28"
}, },
{ {
"label": "3.34.1", "label": "3.34.1",
"value": "0.0.29" "value": "0.0.29"
}, },
{ {
"label": "3.35.0", "label": "3.35.0",
"value": "0.0.30" "value": "0.0.30"
}, },
{ {
"label": "3.37.2", "label": "3.37.2",
"value": "0.0.31" "value": "0.0.31"
}, },
{ {
"label": "3.38.2", "label": "3.38.2",
"value": "0.0.32" "value": "0.0.32"
},
{
"label": "3.41.4",
"value": "0.0.33"
},
{
"label": "3.42.5",
"value": "0.0.34"
} }
], ],
"required": true "required": true
@@ -219,11 +227,11 @@
"password": "Xray master Key", "password": "Xray master Key",
"confirmPassword": "Confirm master Key" "confirmPassword": "Confirm master Key"
}, },
"toolTip": "Master key for Xray instance. Generate master.key using command '$openssl rand -hex 16'", "toolTip": "Master key for Xray instance. Generate master.key using command '$openssl rand -hex 32'",
"constraints": { "constraints": {
"required": true, "required": true,
"regex": "^[a-z0-9A-Z]{12,32}$", "regex": "^[a-z0-9A-Z]{12,64}$",
"validationMessage": "Only alphanumeric characters are allowed, and the value must be 1-32 characters long." "validationMessage": "Only alphanumeric characters are allowed, and the value must be 1-64 characters long."
}, },
"options": { "options": {
"hideConfirmation": true "hideConfirmation": true
@@ -239,8 +247,8 @@
"toolTip": "Join key from Artifactory cluster. You can copy Join key from the Artifactory UI, Security -> Settings -> Connection details", "toolTip": "Join key from Artifactory cluster. You can copy Join key from the Artifactory UI, Security -> Settings -> Connection details",
"constraints": { "constraints": {
"required": true, "required": true,
"regex": "^[a-z0-9A-Z]{12,32}$", "regex": "^[a-z0-9A-Z]{12,64}$",
"validationMessage": "Only alphanumeric characters are allowed, and the value must be 1-32 characters long." "validationMessage": "Only alphanumeric characters are allowed, and the value must be 1-64 characters long."
}, },
"options": { "options": {
"hideConfirmation": true "hideConfirmation": true

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

@@ -19,7 +19,7 @@
}, },
"xrayVersion": { "xrayVersion": {
"type": "string", "type": "string",
"defaultValue": "0.0.32", "defaultValue": "0.0.34",
"allowedValues": [ "allowedValues": [
"0.0.10", "0.0.10",
"0.0.11", "0.0.11",
@@ -34,13 +34,15 @@
"0.0.23", "0.0.23",
"0.0.24", "0.0.24",
"0.0.25", "0.0.25",
"0.0.26", "0.0.26",
"0.0.27", "0.0.27",
"0.0.28", "0.0.28",
"0.0.29", "0.0.29",
"0.0.30", "0.0.30",
"0.0.31", "0.0.31",
"0.0.32" "0.0.32",
"0.0.33",
"0.0.34"
], ],
"metadata": { "metadata": {
"description": "Xray-vm image version to deploy." "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" "value": "10.0.1.0/24"
}, },
"xrayVersion": { "xrayVersion": {
"value": "0.0.32" "value": "0.0.34"
}, },
"artifactoryURL": { "artifactoryURL": {
"value": "http://ARTIFACTORY-URL.cloudapp.azure.com" "value": "http://ARTIFACTORY-URL.cloudapp.azure.com"

22
AzureResourceManager/Xray/azuredeploy_xray_vmss.json
View File

@@ -19,7 +19,7 @@
}, },
"xrayVersion": { "xrayVersion": {
"type": "string", "type": "string",
"defaultValue": "0.0.32", "defaultValue": "0.0.34",
"allowedValues": [ "allowedValues": [
"0.0.10", "0.0.10",
"0.0.11", "0.0.11",
@@ -34,13 +34,15 @@
"0.0.23", "0.0.23",
"0.0.24", "0.0.24",
"0.0.25", "0.0.25",
"0.0.26", "0.0.26",
"0.0.27", "0.0.27",
"0.0.28", "0.0.28",
"0.0.29", "0.0.29",
"0.0.30", "0.0.30",
"0.0.31", "0.0.31",
"0.0.32" "0.0.32",
"0.0.33",
"0.0.34"
], ],
"metadata": { "metadata": {
"description": "Xray-vm image version to deploy." "description": "Xray-vm image version to deploy."
@@ -56,14 +58,14 @@
"type": "securestring", "type": "securestring",
"maxLength": 64, "maxLength": 64,
"metadata": { "metadata": {
"description": "Master key for Artifactory cluster. Generate master.key using command '$openssl rand -hex 16'" "description": "Master key for Artifactory cluster. Generate master.key using command '$openssl rand -hex 32'"
} }
}, },
"joinKey": { "joinKey": {
"type": "securestring", "type": "securestring",
"maxLength": 64, "maxLength": 64,
"metadata": { "metadata": {
"description": "Join key for Artifactory cluster. Generate join.key using command '$openssl rand -hex 16'" "description": "Join key for Artifactory cluster. Generate join.key using command '$openssl rand -hex 32'"
} }
}, },
"adminUsername": { "adminUsername": {

6
AzureResourceManager/Xray/vm_install/vm_deploy.json
View File

@@ -1,5 +1,5 @@
{ {
"$schema": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#", "$schema": "http://schema.management.azure.com/schemas/2019-04-01/deploymentTemplate.json#",
"contentVersion": "1.0.0.0", "contentVersion": "1.0.0.0",
"parameters": { "parameters": {
"location": { "location": {
@@ -70,7 +70,7 @@
"metadata": { "metadata": {
"description": "The base URI where artifacts required by this template are located. When the template is deployed using the accompanying scripts, a private location in the subscription will be used and this value will be automatically generated." "description": "The base URI where artifacts required by this template are located. When the template is deployed using the accompanying scripts, a private location in the subscription will be used and this value will be automatically generated."
}, },
"defaultValue": "https://raw.githubusercontent.com/jfrog/JFrog-Cloud-Installers/vm-image-templates/AzureResourceManager/Xray/" "defaultValue": "https://raw.githubusercontent.com/jfrog/JFrog-Cloud-Installers/master/AzureResourceManager/Xray/"
}, },
"_artifactsLocationSasToken": { "_artifactsLocationSasToken": {
"type": "securestring", "type": "securestring",
@@ -259,4 +259,4 @@
"value": "[variables('commandToExecute')]" "value": "[variables('commandToExecute')]"
} }
} }
} }