зеркало из https://github.com/microsoft/AzureTRE.git
Fixing Bug 280 + Bug 297 + documentation typos (#299)
* Set to TF_VAR_ variables as purely a TF step * Test workflow * Set other TF_VAR_ vars for TF folders. * fix double TF_VAR_ * remove test branch * Fix acr_name missing underscore. * fix bug 280 + 289 * fix yseller extra regex Co-authored-by: Marcus Robinson <marrobi@microsoft.com> Co-authored-by: Limor Lahiani <limorl@37-4611J161123.d37-4611J161124.dhcptest.com> Co-authored-by: Limor Lahiani <limorl@yahoo.com>
This commit is contained in:
Limor Lahiani
GitHub
Родитель
7b8136241b
Коммит
4eff5b501c
|
|
@ -7,6 +7,7 @@
|
|||
".gitattributes",
|
||||
"node_modules",
|
||||
"LICENSE",
|
||||
"Makefile",
|
||||
"**/.dockerignore",
|
||||
"**/Dockerfile",
|
||||
"**/*.tf*",
|
||||
|
|
@ -49,6 +50,7 @@
|
|||
"PowerShell",
|
||||
"PyPi",
|
||||
"QuickStart",
|
||||
"quickstart",
|
||||
"repo",
|
||||
"repos",
|
||||
"screenshots",
|
||||
|
|
@ -83,8 +85,8 @@
|
|||
// Code sections (anything between ``` and ``` or ` and `)
|
||||
"`{1,3}([^`]{1,3})*`{1,3}",
|
||||
|
||||
// Markdown file paths
|
||||
"(\\(|\\[)([\/]|[.\/])?([\\w\\.\\s]*\/)*[\\w\\s\\.]*(\\)|\\])",
|
||||
// Markdown markdown relative paths
|
||||
"(\\.\/|\\.\\.\/|\/)?([a-zA-Z_\\-0-9\/]+)(\\.\\w+)*(\\#[a-zA-Z_\\-0-9\/]+)?",
|
||||
|
||||
// Email addresses (http://emailregex.com/)
|
||||
"(?:[a-z0-9!#$%&'*+/=?^_`{|}~-]+(?:\\.[a-z0-9!#$%&'*+/=?^_`{|}~-]+)*|\"(?:[\\x01-\\x08\\x0b\\x0c\\x0e-\\x1f\\x21\\x23-\\x5b\\x5d-\\x7f]|\\[\\x01-\\x09\\x0b\\x0c\\x0e-\\x7f])*\")@(?:(?:[a-z0-9](?:[a-z0-9-]*[a-z0-9])?\\.)+[a-z0-9](?:[a-z0-9-]*[a-z0-9])?|\\[(?:(?:(2(5[0-5]|[0-4][0-9])|1[0-9][0-9]|[1-9]?[0-9]))\\.){3}(?:(2(5[0-5]|[0-4][0-9])|1[0-9][0-9]|[1-9]?[0-9])|[a-z0-9-]*[a-z0-9]:(?:[\\x01-\\x08\\x0b\\x0c\\x0e-\\x1f\\x21-\\x5a\\x53-\\x7f]|\\[\\x01-\\x09\\x0b\\x0c\\x0e-\\x7f])+)\\])"
|
||||
|
|
|
|||
14
Makefile
14
Makefile
|
|
@ -26,31 +26,33 @@ build-api-image:
|
|||
echo -e "\n\e[34m»»» 🧩 \e[96mBuilding API Image\e[0m..." \
|
||||
&& . ./devops/scripts/check_dependencies.sh \
|
||||
&& . ./devops/scripts/load_env.sh ./devops/.env \
|
||||
&& docker build -t "$${ACR_NAME}.azurecr.io/microsoft/azuretre/management-api:$${IMAGE_TAG}" ./management_api_app/
|
||||
&& sudo docker build -t "$${ACR_NAME}.azurecr.io/microsoft/azuretre/management-api:$${IMAGE_TAG}" ./management_api_app/
|
||||
|
||||
build-cnab-image:
|
||||
echo -e "\n\e[34m»»» 🧩 \e[96mBuilding CNAB Image\e[0m..." \
|
||||
&& . ./devops/scripts/check_dependencies.sh \
|
||||
&& . ./devops/scripts/load_env.sh ./devops/.env \
|
||||
&& docker build -t "$${ACR_NAME}.azurecr.io/microsoft/azuretre/cnab-aci:$${IMAGE_TAG}" ./CNAB_container/
|
||||
&& sudo docker build -t "$${ACR_NAME}.azurecr.io/microsoft/azuretre/cnab-aci:$${IMAGE_TAG}" ./CNAB_container/
|
||||
|
||||
push-api-image:
|
||||
echo -e "\n\e[34m»»» 🧩 \e[96mPushing Images\e[0m..." \
|
||||
&& . ./devops/scripts/check_dependencies.sh \
|
||||
&& . ./devops/scripts/load_env.sh ./devops/.env \
|
||||
&& az acr login -n $${ACR_NAME} \
|
||||
&& docker push "$${ACR_NAME}.azurecr.io/microsoft/azuretre/management-api:$${IMAGE_TAG}"
|
||||
&& sudo az acr login -n $${ACR_NAME} \
|
||||
&& sudo docker push "$${ACR_NAME}.azurecr.io/microsoft/azuretre/management-api:$${IMAGE_TAG}"
|
||||
|
||||
push-cnab-image:
|
||||
echo -e "\n\e[34m»»» 🧩 \e[96mPushing Images\e[0m..." \
|
||||
&& . ./devops/scripts/check_dependencies.sh \
|
||||
&& . ./devops/scripts/load_env.sh ./devops/.env \
|
||||
&& az acr login -n $${ACR_NAME} \
|
||||
&& docker push "$${ACR_NAME}.azurecr.io/microsoft/azuretre/cnab-aci:$${IMAGE_TAG}"
|
||||
&& sudo az acr login -n $${ACR_NAME} \
|
||||
&& sudo docker push "$${ACR_NAME}.azurecr.io/microsoft/azuretre/cnab-aci:$${IMAGE_TAG}"
|
||||
|
||||
tre-deploy:
|
||||
echo -e "\n\e[34m»»» 🧩 \e[96mDeploying TRE\e[0m..." \
|
||||
&& . ./devops/scripts/check_dependencies.sh nodocker \
|
||||
&& . ./devops/scripts/load_env.sh ./templates/core/.env \
|
||||
&& . ./devops/scripts/load_env.sh ./devops/.env \
|
||||
&& . ./devops/scripts/load_terraform_env.sh ./devops/.env \
|
||||
&& . ./devops/scripts/load_terraform_env.sh ./templates/core/.env \
|
||||
&& cd ./templates/core/terraform/ && ./deploy.sh \
|
||||
|
|
|
|||
|
|
@ -15,7 +15,7 @@ fi
|
|||
|
||||
if [[ "$1" != *"nodocker"* ]]; then
|
||||
echo -e "\n\e[96mChecking for Docker\e[0m..."
|
||||
docker version > /dev/null 2>&1
|
||||
sudo docker version > /dev/null 2>&1
|
||||
if [ $? -ne 0 ]; then
|
||||
echo -e "\e[31m»»» ⚠️ Docker is not installed! 😥 Please go to https://docs.docker.com/engine/install/ to set it up"
|
||||
exit
|
||||
|
|
|
|||
|
|
@ -63,7 +63,7 @@ Copy [/devops/.env.sample](../devops/.env.sample) to `/devops/.env` and set valu
|
|||
| `CONTRIBUTOR_SP_CLIENT_SECRET` * | The client secret (app password) of a service principal with "Contributor" role to the subscription. Used by the deployment processor function to deploy workspaces and workspace services. |
|
||||
|
||||
<!-- markdownlint-disable-next-line MD013 -->
|
||||
> *) The creation of the service principal with "Contributor" role is explained in [CD setup guide](./cd-setup.md#create-service-principals). `tre-deploy` target in [Makefile](../Makefile) runs [a script](../devops/scripts/set_contributor_sp_secrets.sh) that inserts the client ID and secret into a Key Vault created in the same very step. If the script fails, the system will be up and running, but the deployment processor function will not be able to deploy workspace resources.
|
||||
> *) The creation of the service principal with "Contributor" role is explained in [CD setup guide](./cd-setup.md#create-service-principals) `tre-deploy` target in [Makefile](../Makefile) runs [a script](../devops/scripts/set_contributor_sp_secrets.sh) that inserts the client ID and secret into a Key Vault created in the same very step. If the script fails, the system will be up and running, but the deployment processor function will not be able to deploy workspace resources.
|
||||
|
||||
### Bootstrap of back-end state
|
||||
|
||||
|
|
@ -118,7 +118,7 @@ The deployment of the Azure TRE is done via Terraform. Run:
|
|||
make tre-deploy
|
||||
```
|
||||
|
||||
The Azure TRE is initially deployed with an invalid self-signed SSL certificate. This certificate is stored in the deployed KeyVault. To update the certificate in KeyVault needs to be repaced with one valid for the configured domain name. To use a certificate from [Let's Encrypt][letsencrypt], simply run the command:
|
||||
The Azure TRE is initially deployed with an invalid self-signed SSL certificate. This certificate is stored in the deployed Key Vault. To update the certificate in Key Vault needs to be replaced with one valid for the configured domain name. To use a certificate from [Let's Encrypt][letsencrypt], simply run the command:
|
||||
|
||||
```cmd
|
||||
make letsencrypt
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче