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

ARM template, Artifactory 7.15.4, Xray 3.18.0 (#93)

Browse Source 
* updated

* updated artifactory releas version 7.15.4 in createUiDefinition.json & mainTemplate.json file

* updated version 7.15.4 in createUiDefinition.json file

* updated version 7.15.4 in mainTemplate.json file

* ARM templates. pid removed from all the templates per new MS requirements. RT 7.15.4, Xray 3.17.4, JSON docs aligned

* updated all changes for artifactory version 7.15.4 & x-ray version 3.18.0

Co-authored-by: danielmkn <danielmi@jfrog.com>
This commit is contained in:
Anup Singh
2021-03-22 21:56:12 +05:30
committed by GitHub
parent 022763a249
commit 00b1196e1b
12 changed files with 47 additions and 113 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
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.15.3",
"defaultValue": "7.15.4",
"toolTip": "Version of Artifactory to deploy",
"constraints": {
"allowedValues": [
@@ -140,18 +140,22 @@
"label": "7.12.5",
"value": "0.0.8"
},
{
{
"label": "7.12.6",
"value": "0.0.9"
},
{
{
"label": "7.12.8",
"value": "0.0.10"
},
{
"label": "7.15.3",
"value": "0.0.11"
}
"value": "0.0.10"
},
{
"label": "7.15.3",
"value": "0.0.11"
},
{
"label": "7.15.4",
"value": "0.0.12"
}
],
"required": true
},

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

@@ -79,12 +79,13 @@
},
"artifactoryVersion": {
"type": "string",
"defaultValue": "0.0.11",
"defaultValue": "0.0.12",
"allowedValues": [
"0.0.8",
"0.0.9",
"0.0.10",
"0.0.11"
"0.0.11",
"0.0.12"
],
"metadata": {
"description": "Artifactory-vm image version to deploy."
@@ -305,19 +306,6 @@
"nsgName": "[concat(variables('namingInfix'), 'nsg')]"
},
"resources": [
{
"apiVersion": "2019-05-01",
"name": "pid-04c1c376-5d4b-4771-9a7f-054f5910dcef",
"type": "Microsoft.Resources/deployments",
"properties": {
"mode": "Incremental",
"template": {
"$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#",
"contentVersion": "1.0.0.0",
"resources": []
}
}
},
{
"type": "Microsoft.Network/networkSecurityGroups",
"location": "[parameters('location')]",

18
AzureResourceManager/Artifactory/azuredeploy.json
View File

@@ -79,12 +79,13 @@
},
"artifactoryVersion": {
"type": "string",
"defaultValue": "0.0.11",
"defaultValue": "0.0.12",
"allowedValues": [
"0.0.8",
"0.0.9",
"0.0.10",
"0.0.11"
"0.0.11",
"0.0.12"
],
"metadata": {
"description": "Artifactory-vm image version to deploy."
@@ -305,19 +306,6 @@
"nsgName": "[concat(variables('namingInfix'), 'nsg')]"
},
"resources": [
{
"apiVersion": "2019-05-01",
"name": "pid-04c1c376-5d4b-4771-9a7f-054f5910dcef",
"type": "Microsoft.Resources/deployments",
"properties": {
"mode": "Incremental",
"template": {
"$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#",
"contentVersion": "1.0.0.0",
"resources": []
}
}
},
{
"type": "Microsoft.Network/networkSecurityGroups",
"location": "[parameters('location')]",

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

@@ -90,7 +90,7 @@
"value": "OWERWRITE_THE_PASSWORD"
},
"artifactoryVersion": {
"value": "7.15.3"
"value": "7.15.4"
},
"scriptName": {
"value": "install_pro7_to_vm.sh"

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

@@ -137,10 +137,10 @@
"label": "7.11.2",
"value": "0.0.61"
},
{
{
"label": "7.12.8",
"value": "0.0.10"
}
"value": "0.0.10"
}
],
"required": true
},

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

@@ -35,7 +35,7 @@
"0.0.4",
"0.0.5",
"0.0.61",
"0.0.10"
"0.0.10"
],
"metadata": {
"description": "JFrog Container Registry-vm image version to deploy."
@@ -202,19 +202,6 @@
"nsgName": "[concat(variables('namingInfix'), 'nsg')]"
},
"resources": [
{
"apiVersion": "2019-05-01",
"name": "pid-04c1c376-5d4b-4771-9a7f-054f5910dcef",
"type": "Microsoft.Resources/deployments",
"properties": {
"mode": "Incremental",
"template": {
"$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#",
"contentVersion": "1.0.0.0",
"resources": []
}
}
},
{
"type": "Microsoft.Network/networkSecurityGroups",
"location": "[parameters('location')]",

19
AzureResourceManager/JCR/azuredeploy.json
View File

@@ -33,10 +33,10 @@
"0.0.2",
"0.0.3",
"0.0.4",
"0.0.5",
"0.0.61",
"0.0.5",
"0.0.61",
"0.0.7",
"0.0.10"
"0.0.10"
],
"metadata": {
"description": "JFrog Container Registry-vm image version to deploy."
@@ -203,19 +203,6 @@
"nsgName": "[concat(variables('namingInfix'), 'nsg')]"
},
"resources": [
{
"apiVersion": "2019-05-01",
"name": "pid-04c1c376-5d4b-4771-9a7f-054f5910dcef",
"type": "Microsoft.Resources/deployments",
"properties": {
"mode": "Incremental",
"template": {
"$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#",
"contentVersion": "1.0.0.0",
"resources": []
}
}
},
{
"type": "Microsoft.Network/networkSecurityGroups",
"location": "[parameters('location')]",

16
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.17.4",
"defaultValue": "3.18.0",
"toolTip": "Version of Xray to deploy",
"constraints": {
"allowedValues": [
@@ -135,13 +135,17 @@
"label": "3.15.3",
"value": "0.0.11"
},
{
{
"label": "3.17.2",
"value": "0.0.13"
},
"value": "0.0.13"
},
{
"label": "3.17.4",
"value": "0.0.14"
},
{
"label": "3.17.4",
"value": "0.0.14"
"label": "3.18.0",
"value": "0.0.15"
}
],
"required": true

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

@@ -19,12 +19,13 @@
},
"xrayVersion": {
"type": "string",
"defaultValue": "0.0.14",
"defaultValue": "0.0.15",
"allowedValues": [
"0.0.10",
"0.0.11",
"0.0.13",
"0.0.14"
"0.0.11",
"0.0.13",
"0.0.14",
"0.0.15"
],
"metadata": {
"description": "Xray-vm image version to deploy."
@@ -202,19 +203,6 @@
"artifactoryURL": "[parameters('artifactoryURL')]"
},
"resources": [
{
"apiVersion": "2019-05-01",
"name": "pid-04c1c376-5d4b-4771-9a7f-054f5910dcef",
"type": "Microsoft.Resources/deployments",
"properties": {
"mode": "Incremental",
"template": {
"$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#",
"contentVersion": "1.0.0.0",
"resources": []
}
}
},
{
"condition": "[equals(parameters('virtualNetworkNewOrExisting'),'new')]",
"type": "Microsoft.Network/virtualNetworks",

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

@@ -33,7 +33,7 @@
"value": "10.0.1.0/24"
},
"xrayVersion": {
"value": "0.0.13"
"value": "0.0.15"
},
"artifactoryURL": {
"value": "http://ARTIFACTORY-URL.cloudapp.azure.com"

18
AzureResourceManager/Xray/azuredeploy_xray_vmss.json
View File

@@ -19,12 +19,13 @@
},
"xrayVersion": {
"type": "string",
"defaultValue": "0.0.14",
"defaultValue": "0.0.15",
"allowedValues": [
"0.0.10",
"0.0.11",
"0.0.13",
"0.0.14"
"0.0.14",
"0.0.15"
],
"metadata": {
"description": "Xray-vm image version to deploy."
@@ -202,19 +203,6 @@
"artifactoryURL": "[parameters('artifactoryURL')]"
},
"resources": [
{
"apiVersion": "2019-05-01",
"name": "pid-04c1c376-5d4b-4771-9a7f-054f5910dcef",
"type": "Microsoft.Resources/deployments",
"properties": {
"mode": "Incremental",
"template": {
"$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#",
"contentVersion": "1.0.0.0",
"resources": []
}
}
},
{
"condition": "[equals(parameters('virtualNetworkNewOrExisting'),'new')]",
"type": "Microsoft.Network/virtualNetworks",

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

@@ -90,7 +90,7 @@
"value": "OWERWRITE_THE_PASSWORD"
},
"xrayVersion": {
"value": "3.17.4"
"value": "3.18.0"
},
"scriptName": {
"value": "install_xray_to_vm.sh"