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

30
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.29.8",
"defaultValue": "7.37.14",
"toolTip": "Version of Artifactory to deploy",
"constraints": {
"allowedValues": [
@@ -219,6 +219,22 @@
{
"label": "7.29.8",
"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
@@ -232,11 +248,11 @@
"password": "Artifactory 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": {
"required": true,
"regex": "^[a-z0-9A-Z]{12,32}$",
"validationMessage": "Only alphanumeric characters are allowed, and the value must be 1-32 characters long."
"regex": "^[a-z0-9A-Z]{12,64}$",
"validationMessage": "Only alphanumeric characters are allowed, and the value must be 1-64 characters long."
},
"options": {
"hideConfirmation": true
@@ -249,11 +265,11 @@
"password": "Artifactory 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": {
"required": false,
"regex": "^[a-z0-9A-Z]{12,32}$",
"validationMessage": "Only alphanumeric characters are allowed, and the value must be 1-32 characters long."
"regex": "^[a-z0-9A-Z]{12,64}$",
"validationMessage": "Only alphanumeric characters are allowed, and the value must be 1-64 characters long."
},
"options": {
"hideConfirmation": true

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

@@ -79,7 +79,7 @@
},
"artifactoryVersion": {
"type": "string",
"defaultValue": "0.0.35",
"defaultValue": "0.0.40",
"allowedValues": [
"0.0.8",
"0.0.9",
@@ -101,7 +101,11 @@
"0.0.32",
"0.0.33",
"0.0.34",
"0.0.35"
"0.0.35",
"0.0.37",
"0.0.38",
"0.0.39",
"0.0.40"
],
"metadata": {
"description": "Artifactory-vm image version to deploy."
@@ -323,7 +327,7 @@
},
"resources": [
{
"apiVersion": "2020-06-01",
"apiVersion": "2021-12-01",
"name": "pid-9cc90849-b021-4272-a33f-1922bd5c0f99-partnercenter",
"type": "Microsoft.Resources/deployments",
"properties": {
@@ -340,7 +344,7 @@
"type": "Microsoft.Network/networkSecurityGroups",
"location": "[parameters('location')]",
"name": "[variables('nsgName')]",
"apiVersion": "2020-03-01",
"apiVersion": "2021-12-01",
"properties": {
"securityRules": [
{
@@ -420,7 +424,7 @@
"type": "Microsoft.Network/virtualNetworks",
"name": "[variables('virtualNetworkName')]",
"location": "[parameters('location')]",
"apiVersion": "2020-03-01",
"apiVersion": "2021-12-01",
"dependsOn": [
"[resourceId('Microsoft.Network/networkSecurityGroups/', variables('nsgName'))]"
],
@@ -453,7 +457,7 @@
}
},
{
"apiVersion": "2020-03-01",
"apiVersion": "2021-12-01",
"type": "Microsoft.Network/networkInterfaces",
"name": "[variables('nicPrimaryName')]",
"location": "[parameters('location')]",
@@ -480,7 +484,7 @@
}
},
{
"apiVersion": "2020-03-01",
"apiVersion": "2021-12-01",
"type": "Microsoft.Network/networkInterfaces",
"name": "[variables('nicMemberName')]",
"location": "[parameters('location')]",
@@ -513,7 +517,7 @@
"sku": {
"name": "Standard"
},
"apiVersion": "2020-03-01",
"apiVersion": "2021-12-01",
"properties": {
"publicIPAllocationMethod": "Static",
"dnsSettings": {
@@ -528,7 +532,7 @@
"sku": {
"name": "Standard"
},
"apiVersion": "2020-03-01",
"apiVersion": "2021-12-01",
"properties": {
"publicIPAllocationMethod": "Static",
"dnsSettings": {
@@ -540,7 +544,7 @@
"type": "Microsoft.Network/loadBalancers",
"name": "[variables('lbName')]",
"location": "[parameters('location')]",
"apiVersion": "2020-03-01",
"apiVersion": "2021-12-01",
"sku": {
"name": "Standard"
},
@@ -820,7 +824,7 @@
"computerNamePrefix": "[variables('namingInfix')]",
"adminUsername": "[parameters('adminUsername')]",
"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": {
"networkInterfaceConfigurations": [
@@ -917,7 +921,7 @@
"computerNamePrefix": "[variables('namingInfix')]",
"adminUsername": "[parameters('adminUsername')]",
"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": {
"networkInterfaceConfigurations": [
@@ -976,7 +980,7 @@
],
"outputs": {
"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"
}
}

12
AzureResourceManager/Artifactory/azuredeploy.json
View File

@@ -79,7 +79,7 @@
},
"artifactoryVersion": {
"type": "string",
"defaultValue": "0.0.35",
"defaultValue": "0.0.40",
"allowedValues": [
"0.0.8",
"0.0.9",
@@ -101,7 +101,11 @@
"0.0.32",
"0.0.33",
"0.0.34",
"0.0.35"
"0.0.35",
"0.0.37",
"0.0.38",
"0.0.39",
"0.0.40"
],
"metadata": {
"description": "Artifactory-vm image version to deploy."
@@ -111,14 +115,14 @@
"type": "securestring",
"maxLength": 64,
"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": {
"type": "securestring",
"maxLength": 64,
"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": {

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",
"parameters": {
"location": {

20
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.38.2",
"defaultValue": "3.42.5",
"toolTip": "Version of Xray to deploy",
"constraints": {
"allowedValues": [
@@ -206,6 +206,14 @@
{
"label": "3.38.2",
"value": "0.0.32"
},
{
"label": "3.41.4",
"value": "0.0.33"
},
{
"label": "3.42.5",
"value": "0.0.34"
}
],
"required": true
@@ -219,11 +227,11 @@
"password": "Xray 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": {
"required": true,
"regex": "^[a-z0-9A-Z]{12,32}$",
"validationMessage": "Only alphanumeric characters are allowed, and the value must be 1-32 characters long."
"regex": "^[a-z0-9A-Z]{12,64}$",
"validationMessage": "Only alphanumeric characters are allowed, and the value must be 1-64 characters long."
},
"options": {
"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",
"constraints": {
"required": true,
"regex": "^[a-z0-9A-Z]{12,32}$",
"validationMessage": "Only alphanumeric characters are allowed, and the value must be 1-32 characters long."
"regex": "^[a-z0-9A-Z]{12,64}$",
"validationMessage": "Only alphanumeric characters are allowed, and the value must be 1-64 characters long."
},
"options": {
"hideConfirmation": true

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

@@ -19,7 +19,7 @@
},
"xrayVersion": {
"type": "string",
"defaultValue": "0.0.32",
"defaultValue": "0.0.34",
"allowedValues": [
"0.0.10",
"0.0.11",
@@ -40,7 +40,9 @@
"0.0.29",
"0.0.30",
"0.0.31",
"0.0.32"
"0.0.32",
"0.0.33",
"0.0.34"
],
"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.32"
"value": "0.0.34"
},
"artifactoryURL": {
"value": "http://ARTIFACTORY-URL.cloudapp.azure.com"

10
AzureResourceManager/Xray/azuredeploy_xray_vmss.json
View File

@@ -19,7 +19,7 @@
},
"xrayVersion": {
"type": "string",
"defaultValue": "0.0.32",
"defaultValue": "0.0.34",
"allowedValues": [
"0.0.10",
"0.0.11",
@@ -40,7 +40,9 @@
"0.0.29",
"0.0.30",
"0.0.31",
"0.0.32"
"0.0.32",
"0.0.33",
"0.0.34"
],
"metadata": {
"description": "Xray-vm image version to deploy."
@@ -56,14 +58,14 @@
"type": "securestring",
"maxLength": 64,
"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": {
"type": "securestring",
"maxLength": 64,
"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": {

4
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",
"parameters": {
"location": {
@@ -70,7 +70,7 @@
"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."
},
"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": {
"type": "securestring",