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

Updated proper json for installers and version update for CF and TF

Browse Source
This commit is contained in:
brucec
2019-03-25 12:06:40 -07:00
parent c8e7ac7f3a
commit 550b78b18d
4 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
AzureResourceManager/scripts/install_artifactory.sh
View File

@@ -217,8 +217,7 @@ cat <<EOF >/var/opt/jfrog/artifactory/etc/info/installer-info.json
"productId": "JFrogInstaller_Azure_SQL/1.0.0" "productId": "JFrogInstaller_Azure_SQL/1.0.0"
"features": [ "features": [
{ {
"featureId": "Artifactory/${artifactoryVersion}", "featureId": "Artifactory/${artifactoryVersion}"
"attributes": {}
} }
} }
EOF EOF

7
CloudFormation/artifactory-enterprise.json
View File

@@ -54,7 +54,7 @@
"ArtifactoryVersion": { "ArtifactoryVersion": {
"Description": "Artifactory version to deploy", "Description": "Artifactory version to deploy",
"Type": "String", "Type": "String",
"Default": "6.2.0" "Default": "6.9.0"
}, },
"ArtifactoryLicense1": { "ArtifactoryLicense1": {
@@ -910,7 +910,6 @@
" \"features\": [\n", " \"features\": [\n",
" {\n", " {\n",
" \"featureId\": \"Artifactory/", { "Ref": "ArtifactoryVersion" }, "\"\n", " \"featureId\": \"Artifactory/", { "Ref": "ArtifactoryVersion" }, "\"\n",
" \"attributes\": {}\n",
" }\n", " }\n",
"}\n" "}\n"
]]}, ]]},
@@ -1274,6 +1273,10 @@
"content" : { "Fn::Join" : ["", [ "content" : { "Fn::Join" : ["", [
"{\n", "{\n",
" \"productId\": \"JFrogInstaller_Cloudformation_MySQL/1.0.0\"\n", " \"productId\": \"JFrogInstaller_Cloudformation_MySQL/1.0.0\"\n",
" \"features\": [\n",
" {\n",
" \"featureId\": \"Artifactory/", { "Ref": "ArtifactoryVersion" }, "\"\n",
" }\n",
"}\n" "}\n"
]]}, ]]},
"mode" : "000755", "mode" : "000755",

3
Terraform/userdata.sh
View File

@@ -178,8 +178,7 @@ cat <<EOF >/var/opt/jfrog/artifactory/etc/info/installer-info.json
"productId": "JFrog_TerraformInstaller_Mysql/1.0.0" "productId": "JFrog_TerraformInstaller_Mysql/1.0.0"
"features": [ "features": [
{ {
"featureId": "Artifactory/${artifactory_version}", "featureId": "Artifactory/${artifactory_version}"
"attributes": {}
} }
} }
EOF EOF

2
Terraform/variables.tf
View File

@@ -9,7 +9,7 @@ variable "key_name" {
variable "artifactory_version" { variable "artifactory_version" {
description = "Artifactory version to deploy" description = "Artifactory version to deploy"
default = "6.2.0" default = "6.9.0"
} }
variable "artifactory_license_1" { variable "artifactory_license_1" {