Skip to content

Commit d0465b2

Browse files
Merge branch 'psl-raju-dev' of https://github.com/microsoft/content-processing-solution-accelerator into psl-raju-dev
2 parents 9d49102 + b24b34c commit d0465b2

File tree

3 files changed

+11
-26
lines changed

3 files changed

+11
-26
lines changed

.devcontainer/setupEnv.sh

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,9 @@ yarn install
2323
cd ../../
2424

2525
echo "Setting up executable permission for shell scripts"
26+
sed -i 's/\r$//' ./infra/scripts/post_deployment.sh
2627
sudo chmod +x ./infra/scripts/docker-build.sh
28+
sudo chmod +x ./infra/scripts/post_deployment.sh
2729
sudo chmod +x ./src/ContentProcessorAPI/samples/upload_files.sh
2830
sudo chmod +x ./src/ContentProcessorAPI/samples/schemas/register_schema.sh
2931

docs/Images/update_env_app_1_1.png

-19.6 KB
Loading

infra/main.json

Lines changed: 9 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
"_generator": {
66
"name": "bicep",
77
"version": "0.34.44.8038",
8-
"templateHash": "17985360808056860425"
8+
"templateHash": "2631796362162534903"
99
}
1010
},
1111
"parameters": {
@@ -67,6 +67,9 @@
6767
"gptModelVersion": {
6868
"type": "string",
6969
"defaultValue": "2024-08-06",
70+
"allowedValues": [
71+
"2024-08-06"
72+
],
7073
"minLength": 1,
7174
"metadata": {
7275
"description": "Version of the GPT model to deploy:"
@@ -480,7 +483,7 @@
480483
"_generator": {
481484
"name": "bicep",
482485
"version": "0.34.44.8038",
483-
"templateHash": "7568462549649877267"
486+
"templateHash": "17770758516688495068"
484487
}
485488
},
486489
"parameters": {
@@ -526,7 +529,6 @@
526529
"enabledForDiskEncryption": true,
527530
"enabledForTemplateDeployment": true,
528531
"enableRbacAuthorization": true,
529-
"enablePurgeProtection": true,
530532
"publicNetworkAccess": "enabled",
531533
"sku": {
532534
"family": "A",
@@ -672,7 +674,7 @@
672674
"_generator": {
673675
"name": "bicep",
674676
"version": "0.34.44.8038",
675-
"templateHash": "10286514074548439078"
677+
"templateHash": "18372681746235366113"
676678
}
677679
},
678680
"parameters": {
@@ -688,7 +690,7 @@
688690
},
689691
"acrSku": {
690692
"type": "string",
691-
"defaultValue": "Premium",
693+
"defaultValue": "Basic",
692694
"metadata": {
693695
"description": "Provide a tier of your Azure Container Registry."
694696
}
@@ -709,25 +711,6 @@
709711
"name": "[parameters('acrSku')]"
710712
},
711713
"properties": {
712-
"adminUserEnabled": true,
713-
"dataEndpointEnabled": false,
714-
"networkRuleBypassOptions": "AzureServices",
715-
"networkRuleSet": {
716-
"defaultAction": "Allow"
717-
},
718-
"policies": {
719-
"quarantinePolicy": {
720-
"status": "disabled"
721-
},
722-
"retentionPolicy": {
723-
"status": "enabled",
724-
"days": 7
725-
},
726-
"trustPolicy": {
727-
"status": "disabled",
728-
"type": "Notary"
729-
}
730-
},
731714
"publicNetworkAccess": "Enabled",
732715
"zoneRedundancy": "Disabled"
733716
}
@@ -1655,7 +1638,7 @@
16551638
"_generator": {
16561639
"name": "bicep",
16571640
"version": "0.34.44.8038",
1658-
"templateHash": "15815884747026956332"
1641+
"templateHash": "1111747132207169107"
16591642
}
16601643
},
16611644
"parameters": {
@@ -3178,7 +3161,7 @@
31783161
"_generator": {
31793162
"name": "bicep",
31803163
"version": "0.34.44.8038",
3181-
"templateHash": "15815884747026956332"
3164+
"templateHash": "1111747132207169107"
31823165
}
31833166
},
31843167
"parameters": {

0 commit comments

Comments
 (0)