Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

UI Deploy Fixes #1986

Merged
merged 9 commits into from
Jun 7, 2022
Merged

UI Deploy Fixes #1986

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
1f0c396
initial swa deploy
damoodamoo May 30, 2022
908fdd8
Merge branch 'feature/ui' of github.com:microsoft/AzureTRE into featu…
damoodamoo May 31, 2022
2a807bb
Merge branch 'feature/ui' of github.com:microsoft/AzureTRE into featu…
damoodamoo May 31, 2022
f938713
Merge branch 'feature/ui' of github.com:microsoft/AzureTRE into featu…
damoodamoo Jun 1, 2022
b1b16b1
Merge branch 'feature/ui' of github.com:microsoft/AzureTRE into featu…
damoodamoo Jun 6, 2022
10b8d8c
Merge branch 'feature/ui' of github.com:microsoft/AzureTRE into featu…
damoodamoo Jun 6, 2022
4c5eb56
Merge branch 'feature/ui' of github.com:microsoft/AzureTRE into featu…
damoodamoo Jun 7, 2022
e8971a1
Merge branch 'feature/ui' of github.com:microsoft/AzureTRE into featu…
damoodamoo Jun 7, 2022
8465fb2
deploy fixes
damoodamoo Jun 7, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 0 additions & 8 deletions templates/core/terraform/json-to-env.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,14 +76,6 @@ jq -r '
{
"path": "registry_server",
"env_var": "REGISTRY_SERVER"
},
{
"path": "ui_api_key",
"env_var": "UI_API_KEY"
},
{
"path": "ui_host_name",
"env_var": "UI_HOST_NAME"
}
]
as $env_vars_to_extract
Expand Down
9 changes: 0 additions & 9 deletions templates/core/terraform/outputs.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,12 +76,3 @@ output "terraform_state_container_name" {
output "registry_server" {
value = var.docker_registry_server
}

output "ui_api_key" {
value = var.deploy_ui ? azurerm_static_site.tre-ui[0].api_key : ""
sensitive = true
}

output "ui_host_name" {
value = var.deploy_ui ? azurerm_static_site.tre-ui[0].default_host_name : ""
}