Commit abba805a authored by Sumra Zafar's avatar Sumra Zafar
Browse files

Merge branch 'zgy-doc-update' into 'master'

ZGY Documentation Update

See merge request !442
parents 0abd34b8 6cacc002
Pipeline #58412 passed with stages
in 1 minute and 7 seconds
......@@ -103,11 +103,13 @@ Reference: [Open ZGY](https://community.opengroup.org/osdu/platform/domain-data-
```bash
# Setup Variables
UNIQUE="<your_osdu_unique>" # ie: demo
AZURE_DNS_NAME="<your_osdu_fqdn>" # ie: osdu-$UNIQUE.contoso.com
DATA_PARTITION="<your_partition>" # ie:opendes
ACR_REGISTRY="<your_acr_fqdn>" # ie: myacr.azurecr.io
TAG="<app_version>" # ie: 0.10.0
UNIQUE="<your_osdu_unique>" # ie: demo
AZURE_DNS_NAME="<your_osdu_fqdn>" # ie: osdu-$UNIQUE.contoso.com
DATA_PARTITION="<your_partition>" # ie:opendes
ACR_REGISTRY="<your_acr_fqdn>" # ie: myacr.azurecr.io
TAG="<app_version>" # ie: 0.10.0
DAG_TASK_IMAGE="segy-to-zgy-conversion-dag" # i.e. name for the image in ACR
AZURE_TENANT_ID="<azure tenant>"
# This logs your local Azure CLI in using the configured service principal.
az login --service-principal -u $ARM_CLIENT_ID -p $ARM_CLIENT_SECRET --tenant $ARM_TENANT_ID
......@@ -116,10 +118,10 @@ GROUP=$(az group list --query "[?contains(name, 'cr${UNIQUE}')].name" -otsv)
ENV_VAULT=$(az keyvault list --resource-group $GROUP --query [].name -otsv)
cat > .env << EOF
DAG_TASK_IMAGE=${ACR_REGISTRY}/segy-to-zgy-conversion-dag:$TAG
DAG_TASK_IMAGE=${ACR_REGISTRY}/segy-to-zgy-conversion:$TAG
SHARED_TENANT=$DATA_PARTITION
AZURE_DNS_NAME=$AZURE_DNS_NAME
AZURE_TENANT_ID=$ARM_TENANT_ID
AZURE_TENANT_ID=$AZURE_TENANT_ID
AZURE_AD_APP_RESOURCE_ID=$(az keyvault secret show --id https://${ENV_VAULT}.vault.azure.net/secrets/aad-client-id --query value -otsv)
AZURE_CLIENT_ID=$(az keyvault secret show --id https://${ENV_VAULT}.vault.azure.net/secrets/app-dev-sp-username --query value -otsv)
AZURE_CLIENT_SECRET=$(az keyvault secret show --id https://${ENV_VAULT}.vault.azure.net/secrets/app-dev-sp-password --query value -otsv)
......@@ -148,6 +150,7 @@ AZURE_AD_APP_RESOURCE_ID="<your_azure_ad_resource_id>"
AZURE_CLIENT_ID="<your azure_client_id>"
AZURE_CLIENT_SECRET="<your azure client secret>"
SHARED_TENANT="<your shared tenant>" # i.e: opendes
AZURE_TENANT_ID="<azure tenant>"
# This logs your local Azure CLI in using the configured service principal.
az login --service-principal -u $ARM_CLIENT_ID -p $ARM_CLIENT_SECRET --tenant $ARM_TENANT_ID
......@@ -157,12 +160,12 @@ ENV_VAULT=$(az keyvault list --resource-group $GROUP --query [].name -otsv)
cat > .env << EOF
DAG_IMAGE=${ACR_REGISTRY}/$DAG_NAME:${TAG}
SHARED_TENANT=$SHARED_TENANT
SHARED_TENANT=$DATA_PARTITION
AZURE_TENANT_ID=$AZURE_TENANT_ID
AZURE_DNS_NAME=$AZURE_DNS_NAME
AZURE_AD_APP_RESOURCE_ID=$AZURE_AD_APP_RESOURCE_ID
AZURE_CLIENT_ID=$AZURE_CLIENT_ID
AZURE_CLIENT_SECRET=$AZURE_CLIENT_SECRET
AZURE_AD_APP_RESOURCE_ID=$(az keyvault secret show --id https://${ENV_VAULT}.vault.azure.net/secrets/aad-client-id --query value -otsv)
AZURE_CLIENT_ID=$(az keyvault secret show --id https://${ENV_VAULT}.vault.azure.net/secrets/app-dev-sp-username --query value -otsv)
AZURE_CLIENT_SECRET=$(az keyvault secret show --id https://${ENV_VAULT}.vault.azure.net/secrets/app-dev-sp-password --query value -otsv)
EOF
#(cd ../../.. && docker build -f deployments/scripts/azure/Dockerfile -t $ACR_REGISTRY/$DAG_NAME:$TAG .)
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment