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

Arm 7.11.2 (#68)

Browse Source 
* ARM templates - Postgresql JDBC driver is updated (for 7.10.2 compatibility)

* ARM templates - RT and JCR 7.10.2, Xray 3.9.1

* VM image publish template - RT 7.10.5

* ARM template for 7.10.5

* ARM template for Xray 3.10.3

* Updated artifactoryVersion and location

* Updated 7.10.5 version for JCR Azure application

* updated version on azuredeploy_ms_ps.json

* updated azuredeploy_ms_ps.json

* updated azuredeploy_ms_ps.json

* updated 7.10.6 verion in azuredeploy_ms_ps.json, MP_submission/createUiDefinition.json, MP_submission/mainTemplate.json

* Updated the Version for JCR

* updated new xray version 3.11.2 in template files

* updated new x-ray version in createUiDefinition.json mainTemplate.json

* updated createUiDefinition.json mainTemplate.json

* updated 7.11.2 changes for xray, rt and jcr

* ARM template, fixing formatting

Co-authored-by: danielmkn <danielmi@jfrog.com>
Co-authored-by: Aayush-sood94 <aayush.sood1@igtsolutions.com>
This commit is contained in:
Anup Singh
2020-12-02 23:28:06 +05:30
committed by GitHub
parent ddaa30af90
commit ccfb8c0383
20 changed files with 113 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
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.10.2",
"defaultValue": "7.11.2",
"toolTip": "Version of Artifactory to deploy",
"constraints": {
"allowedValues": [
@@ -170,8 +170,17 @@
},
{
"label": "7.10.2",
"value": "0.0.3"
}
"value": "0.0.31"
},
{
"label": "7.10.5",
"value": "0.0.4"
},
{
"label": "7.10.6",
"value": "0.0.52"
},
{ "label": "7.11.2", "value": "0.0.6" }
],
"required": true
},

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

@@ -79,7 +79,7 @@
},
"artifactoryVersion": {
"type": "string",
"defaultValue": "0.0.3",
"defaultValue": "0.0.6",
"allowedValues": [
"6.6.0",
"6.6.1",
@@ -96,7 +96,10 @@
"7.4.30",
"0.0.1",
"0.0.2",
"0.0.3"
"0.0.31",
"0.0.4",
"0.0.52",
"0.0.6"
],
"metadata": {
"description": "Artifactory-vm image version to deploy."
@@ -778,7 +781,7 @@
"type": "Microsoft.Compute/virtualMachineScaleSets",
"name": "[variables('scaleSetPrimaryName')]",
"location": "[parameters('location')]",
"apiVersion": "2018-10-01",
"apiVersion": "2020-06-01",
"dependsOn": [
"[resourceId('Microsoft.Network/loadBalancers/', variables('lbName'))]",
"[resourceId('Microsoft.Network/virtualNetworks/', variables('virtualNetworkName'))]",
@@ -876,7 +879,7 @@
"type": "Microsoft.Compute/virtualMachineScaleSets",
"name": "[variables('scaleSetMemberName')]",
"location": "[parameters('location')]",
"apiVersion": "2018-10-01",
"apiVersion": "2020-06-01",
"dependsOn": [
"[resourceId('Microsoft.Network/loadBalancers/', variables('lbName'))]",
"[resourceId('Microsoft.Network/virtualNetworks/', variables('virtualNetworkName'))]",

3
AzureResourceManager/Artifactory/MP_submission/scripts/install_artifactory7.sh
View File

@@ -25,9 +25,6 @@ export DEBIAN_FRONTEND=noninteractive
mkdir -p /etc/pki/tls/private/ /etc/pki/tls/certs/
openssl req -nodes -x509 -newkey rsa:4096 -keyout /etc/pki/tls/private/example.key -out /etc/pki/tls/certs/example.pem -days 356 -subj "/C=US/ST=California/L=SantaClara/O=IT/CN=*.localhost"
# Install Postgresql driver
curl --retry 5 -L -o /opt/jfrog/artifactory/app/artifactory/tomcat/lib/postgresql-9.4.1212.jar https://jdbc.postgresql.org/download/postgresql-9.4.1212.jar >> /tmp/install-databse-driver.log 2>&1
CERTIFICATE_DOMAIN=$(cat /var/lib/cloud/instance/user-data.txt | grep "^CERTIFICATE_DOMAIN=" | sed "s/CERTIFICATE_DOMAIN=//")
[ -z "$CERTIFICATE_DOMAIN" ] && CERTIFICATE_DOMAIN=artifactory

11
AzureResourceManager/Artifactory/azuredeploy_ms_ps.json
View File

@@ -79,7 +79,7 @@
},
"artifactoryVersion": {
"type": "string",
"defaultValue": "0.0.3",
"defaultValue": "0.0.6",
"allowedValues": [
"6.11.3",
"6.15.0",
@@ -93,7 +93,10 @@
"7.5.7",
"0.0.1",
"0.0.2",
"0.0.3"
"0.0.31",
"0.0.4",
"0.0.52",
"0.0.6"
],
"metadata": {
"description": "Artifactory-vm image version to deploy."
@@ -775,7 +778,7 @@
"type": "Microsoft.Compute/virtualMachineScaleSets",
"name": "[variables('scaleSetPrimaryName')]",
"location": "[parameters('location')]",
"apiVersion": "2018-10-01",
"apiVersion": "2020-06-01",
"dependsOn": [
"[resourceId('Microsoft.Network/loadBalancers/', variables('lbName'))]",
"[resourceId('Microsoft.Network/virtualNetworks/', variables('virtualNetworkName'))]",
@@ -873,7 +876,7 @@
"type": "Microsoft.Compute/virtualMachineScaleSets",
"name": "[variables('scaleSetMemberName')]",
"location": "[parameters('location')]",
"apiVersion": "2018-10-01",
"apiVersion": "2020-06-01",
"dependsOn": [
"[resourceId('Microsoft.Network/loadBalancers/', variables('lbName'))]",
"[resourceId('Microsoft.Network/virtualNetworks/', variables('virtualNetworkName'))]",

14
AzureResourceManager/Artifactory/azuredeploy_ms_ps.parameters.json
View File

@@ -9,7 +9,7 @@
"value": "vmuser"
},
"adminPassword": {
"value": "password"
"value": "OWERWRITE_THE_PASSWORD"
},
"db_type": {
"value": "Postgresql_deploy.json"
@@ -18,7 +18,7 @@
"value": "artifactory"
},
"db_password": {
"value": "password"
"value": "OWERWRITE_THE_PASSWORD"
},
"db_name": {
"value": "artdb"
@@ -50,19 +50,19 @@
"value": "GENERATE_JOIN_KEY"
},
"certificate": {
"value": "-----BEGIN CERTIFICATE----- -----END CERTIFICATE-----"
"value": "-----BEGIN CERTIFICATE----- <YOUR CERTIFICATE HERE> -----END CERTIFICATE-----"
},
"certificateKey": {
"value": "-----BEGIN PRIVATE KEY----- -----END PRIVATE KEY-----"
"value": "-----BEGIN PRIVATE KEY----- <YOUR CERTIFICATE HERE> -----END PRIVATE KEY-----"
},
"artifactoryLicense1": {
"value": ""
"value": "<ARTIFACTORY LICENCE FOR MASTER NODE>"
},
"artifactoryLicense2": {
"value": ""
"value": "<ARTIFACTORY LICENCE FOR MEMBER0 NODE>"
},
"artifactoryLicense3": {
"value": ""
"value": "<ARTIFACTORY LICENCE FOR MEMBER1 NODE>"
}
}
}

3
AzureResourceManager/Artifactory/scripts/install_artifactory7.sh
View File

@@ -25,9 +25,6 @@ export DEBIAN_FRONTEND=noninteractive
mkdir -p /etc/pki/tls/private/ /etc/pki/tls/certs/
openssl req -nodes -x509 -newkey rsa:4096 -keyout /etc/pki/tls/private/example.key -out /etc/pki/tls/certs/example.pem -days 356 -subj "/C=US/ST=California/L=SantaClara/O=IT/CN=*.localhost"
# Install Postgresql driver
curl --retry 5 -L -o /opt/jfrog/artifactory/app/artifactory/tomcat/lib/postgresql-9.4.1212.jar https://jdbc.postgresql.org/download/postgresql-9.4.1212.jar >> /tmp/install-databse-driver.log 2>&1
CERTIFICATE_DOMAIN=$(cat /var/lib/cloud/instance/user-data.txt | grep "^CERTIFICATE_DOMAIN=" | sed "s/CERTIFICATE_DOMAIN=//")
[ -z "$CERTIFICATE_DOMAIN" ] && CERTIFICATE_DOMAIN=artifactory

2
AzureResourceManager/Artifactory/vm_install/install_pro7_to_vm.sh
View File

@@ -37,7 +37,7 @@ EOF
#Install database drivers (for Java 11, path is different for RT6 and RT7)
curl --retry 5 -L -o /opt/jfrog/artifactory/app/artifactory/tomcat/lib/mysql-connector-java-5.1.38.jar https://bintray.com/artifact/download/bintray/jcenter/mysql/mysql-connector-java/5.1.38/mysql-connector-java-5.1.38.jar >> /tmp/install-databse-driver.log 2>&1
curl --retry 5 -L -o /opt/jfrog/artifactory/app/artifactory/tomcat/lib/mssql-jdbc-7.4.1.jre11.jar https://bintray.com/artifact/download/bintray/jcenter/com/microsoft/sqlserver/mssql-jdbc/7.4.1.jre11/mssql-jdbc-7.4.1.jre11.jar >> /tmp/install-databse-driver.log 2>&1
curl --retry 5 -L -o /opt/jfrog/artifactory/app/artifactory/tomcat/lib/postgresql-9.4.1212.jar https://jdbc.postgresql.org/download/postgresql-9.4.1212.jar >> /tmp/install-databse-driver.log 2>&1
curl --retry 5 -L -o /opt/jfrog/artifactory/app/artifactory/tomcat/lib/postgresql-42.2.18.jar https://jdbc.postgresql.org/download/postgresql-42.2.18.jar >> /tmp/install-databse-driver.log 2>&1
#Configuring nginx
rm /etc/nginx/sites-enabled/default

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

@@ -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/Artifactory/"
"defaultValue": "https://raw.githubusercontent.com/jfrog/JFrog-Cloud-Installers/master/AzureResourceManager/Artifactory/"
},
"_artifactsLocationSasToken": {
"type": "securestring",

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

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

15
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.10.2",
"defaultValue": "7.11.2",
"toolTip": "Version of JFrog Container Registry to deploy",
"constraints": {
"allowedValues": [
@@ -124,6 +124,18 @@
{
"label": "7.10.2",
"value": "0.0.3"
},
{
"label": "7.10.5",
"value": "0.0.4"
},
{
"label": "7.10.6",
"value": "0.0.5"
},
{
"label": "7.11.2",
"value": "0.0.61"
}
],
"required": true
@@ -178,6 +190,7 @@
"validationMessage": "Provide SSL Certificate Key."
},
"options": {
"hideConfirmation": true
}
},

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

@@ -25,13 +25,16 @@
},
"artifactoryVersion": {
"type": "string",
"defaultValue": "0.0.3",
"defaultValue": "0.0.61",
"allowedValues": [
"7.2.1",
"7.3.2",
"7.4.3",
"0.0.2",
"0.0.3"
"0.0.3",
"0.0.4",
"0.0.5",
"0.0.61"
],
"metadata": {
"description": "JFrog Container Registry-vm image version to deploy."
@@ -519,7 +522,7 @@
"type": "Microsoft.Compute/virtualMachineScaleSets",
"name": "[variables('scaleSetPrimaryName')]",
"location": "[parameters('location')]",
"apiVersion": "2018-10-01",
"apiVersion": "2020-06-01",
"dependsOn": [
"[resourceId('Microsoft.Network/loadBalancers/', variables('lbName'))]",
"[resourceId('Microsoft.Network/virtualNetworks/', variables('virtualNetworkName'))]",

9
AzureResourceManager/JCR/azuredeploy.json
View File

@@ -25,13 +25,16 @@
},
"artifactoryVersion": {
"type": "string",
"defaultValue": "0.0.3",
"defaultValue": "0.0.61",
"allowedValues": [
"7.2.1",
"7.3.2",
"7.4.3",
"0.0.2",
"0.0.3"
"0.0.3",
"0.0.4",
"0.0.5",
"0.0.61"
],
"metadata": {
"description": "JFrog Container Registry-vm image version to deploy."
@@ -519,7 +522,7 @@
"type": "Microsoft.Compute/virtualMachineScaleSets",
"name": "[variables('scaleSetPrimaryName')]",
"location": "[parameters('location')]",
"apiVersion": "2018-10-01",
"apiVersion": "2020-06-01",
"dependsOn": [
"[resourceId('Microsoft.Network/loadBalancers/', variables('lbName'))]",
"[resourceId('Microsoft.Network/virtualNetworks/', variables('virtualNetworkName'))]",

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

@@ -81,7 +81,7 @@
"value": "OWERWRITE_THE_PASSWORD"
},
"artifactoryVersion": {
"value": "7.10.2"
"value": "7.11.2"
},
"scriptName": {
"value": "install_jcr7_to_vm.sh"

8
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.9.1",
"defaultValue": "3.11.2",
"toolTip": "Version of Xray to deploy",
"constraints": {
"allowedValues": [
@@ -142,6 +142,12 @@
{
"label": "3.9.1",
"value": "0.0.6"
},
{
"label": "3.10.3",
"value": "0.0.7"
},
{ "label": "3.11.2", "value": "0.0.8"
}
],
"required": true

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

@@ -19,12 +19,14 @@
},
"xrayVersion": {
"type": "string",
"defaultValue": "0.0.6",
"defaultValue": "0.0.8",
"allowedValues": [
"0.0.3",
"0.0.4",
"0.0.5",
"0.0.6"
"0.0.6",
"0.0.7",
"0.0.8"
],
"metadata": {
"description": "Xray-vm image version to deploy."
@@ -275,7 +277,7 @@
},
{
"type": "Microsoft.Storage/storageAccounts",
"apiVersion": "2018-11-01",
"apiVersion": "2019-06-01",
"name": "[variables('storageAccountName')]",
"location": "[parameters('location')]",
"sku": {
@@ -320,7 +322,7 @@
"type": "Microsoft.Compute/virtualMachineScaleSets",
"name": "[concat(variables('namingInfix'), 'xrayScaleset')]",
"location": "[parameters('location')]",
"apiVersion": "2018-10-01",
"apiVersion": "2020-06-01",
"dependsOn": [
"[resourceId('Microsoft.Storage/storageAccounts/', variables('storageAccountName'))]",
"[resourceId('Microsoft.Network/networkInterfaces/', variables('nicName'))]"

2
AzureResourceManager/Xray/MP_submission/nested/Postgresql_deploy.json
View File

@@ -32,7 +32,7 @@
},
"skuSizeMB": {
"type": "int",
"defaultValue": 5120
"defaultValue": 204800
},
"skuTier": {
"type": "string",

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

@@ -3,19 +3,19 @@
"contentVersion": "1.0.0.0",
"parameters": {
"clusterName": {
"value": "GEN-UNIQUE"
"value": "GENERATE-CLUSTER-NAME"
},
"adminUsername": {
"value": "GEN-UNIQUE"
"value": "ADMIN-USERNAME"
},
"adminPassword": {
"value": "GEN-UNIQUE"
"value": "ADMIN-PASSWORD"
},
"virtualNetworkName": {
"value": "existing-vm-network-name"
"value": "EXISTING-VM-NETWORK-NAME"
},
"subnetName": {
"value": "existing-subnet-name"
"value": "EXISTING-SUBNET-NAME"
},
"virtualNetworkNewOrExisting": {
"value": "existing"
@@ -24,7 +24,7 @@
"value": "10.0.0.0/16"
},
"virtualNetworkResourceGroup": {
"value": "resource-group-name"
"value": "RESOURCE-GROUP-NAME"
},
"virtualMachineSize": {
"value": "Standard_D4s_v3"
@@ -33,25 +33,25 @@
"value": "10.0.1.0/24"
},
"xrayVersion": {
"value": "0.0.6"
"value": "0.0.8"
},
"artifactoryURL": {
"value": "http://artifactory-url.cloudapp.azure.com"
"value": "http://ARTIFACTORY-URL.cloudapp.azure.com"
},
"masterKey": {
"value": "GEN-UNIQUE"
"value": "GENERATE-MASTER-KEY"
},
"joinKey": {
"value": "GEN-UNIQUE"
"value": "GET-JOIN-KEY-IN-ARTIFACTORY-UI"
},
"db_type": {
"value": "Postgresql_existing.json"
"value": "Postgresql_deploy.json"
},
"db_user": {
"value": "GEN-UNIQUE"
"value": "DB-USERNAME"
},
"db_password": {
"value": "GEN-UNIQUE"
"value": "DB-PASSWORD"
},
"manual_db_url": {
"value": "jdbc:postgresql://postgressrvr.postgres.database.azure.com:5432"

10
AzureResourceManager/Xray/azuredeploy_xray_vmss.json
View File

@@ -19,12 +19,14 @@
},
"xrayVersion": {
"type": "string",
"defaultValue": "0.0.6",
"defaultValue": "0.0.8",
"allowedValues": [
"0.0.3",
"0.0.4",
"0.0.5",
"0.0.6"
"0.0.6",
"0.0.7",
"0.0.8"
],
"metadata": {
"description": "Xray-vm image version to deploy."
@@ -275,7 +277,7 @@
},
{
"type": "Microsoft.Storage/storageAccounts",
"apiVersion": "2018-11-01",
"apiVersion": "2019-06-01",
"name": "[variables('storageAccountName')]",
"location": "[parameters('location')]",
"sku": {
@@ -320,7 +322,7 @@
"type": "Microsoft.Compute/virtualMachineScaleSets",
"name": "[concat(variables('namingInfix'), 'xrayScaleset')]",
"location": "[parameters('location')]",
"apiVersion": "2018-10-01",
"apiVersion": "2020-06-01",
"dependsOn": [
"[resourceId('Microsoft.Storage/storageAccounts/', variables('storageAccountName'))]",
"[resourceId('Microsoft.Network/networkInterfaces/', variables('nicName'))]"

2
AzureResourceManager/Xray/nested/Postgresql_deploy.json
View File

@@ -32,7 +32,7 @@
},
"skuSizeMB": {
"type": "int",
"defaultValue": 5120
"defaultValue": 204800
},
"skuTier": {
"type": "string",

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

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