Skip to content

Commit 8e2d226

Browse files
blessing-sanusiblessing-sanusi
authored
Merge branch 'main' into microhacks-e2e
2 parents c54a3e9 + 9d35f28 commit 8e2d226

File tree

3 files changed

+30
-42
lines changed

3 files changed

+30
-42
lines changed

‎.github/workflows/docker-build.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -67,8 +67,8 @@ jobs:
6767
file: ./src/App/WebApp.Dockerfile
6868
push: ${{ github.ref_name == 'main' || github.ref_name == 'dev' || github.ref_name == 'demo' || github.ref_name == 'dependabotchanges' }}
6969
tags: |
70-
${{ secrets.ACR_LOGIN_SERVER }}/km-app:${{ steps.determine_tag.outputs.tagname }}
71-
${{ secrets.ACR_LOGIN_SERVER }}/km-app:${{ steps.determine_tag.outputs.tagname }}_${{ steps.date.outputs.date }}_${{ github.run_number }}
70+
${{ secrets.ACR_LOGIN_SERVER || 'acrlogin.azurecr.io' }}/km-app:${{ steps.determine_tag.outputs.tagname }}
71+
${{ secrets.ACR_LOGIN_SERVER || 'acrlogin.azurecr.io' }}/km-app:${{ steps.determine_tag.outputs.tagname }}_${{ steps.date.outputs.date }}_${{ github.run_number }}
7272
7373
- name: Build and Push Docker Image for api
7474
uses: docker/build-push-action@v6
@@ -77,5 +77,5 @@ jobs:
7777
file: ./src/api/ApiApp.Dockerfile
7878
push: ${{ github.ref_name == 'main' || github.ref_name == 'dev' || github.ref_name == 'demo' || github.ref_name == 'dependabotchanges' }}
7979
tags: |
80-
${{ secrets.ACR_LOGIN_SERVER }}/km-api:${{ steps.determine_tag.outputs.tagname }}
81-
${{ secrets.ACR_LOGIN_SERVER }}/km-api:${{ steps.determine_tag.outputs.tagname }}_${{ steps.date.outputs.date }}_${{ github.run_number }}
80+
${{ secrets.ACR_LOGIN_SERVER || 'acrlogin.azurecr.io' }}/km-api:${{ steps.determine_tag.outputs.tagname }}
81+
${{ secrets.ACR_LOGIN_SERVER || 'acrlogin.azurecr.io' }}/km-api:${{ steps.determine_tag.outputs.tagname }}_${{ steps.date.outputs.date }}_${{ github.run_number }}

‎docs/quota_check.md‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,6 @@
33
Before deploying the accelerator, **ensure sufficient quota availability** for the required model.
44
> **We recommend increasing the capacity to 100k tokens for optimal performance.**
55
6-
### Login if you have not done so already
7-
```
8-
azd auth login
9-
```
10-
11-
126
### Login if you have not done so already
137
```
148
azd auth login

‎infra/main.json‎

Lines changed: 26 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -128,8 +128,8 @@
128128
"metadata": {
129129
"_generator": {
130130
"name": "bicep",
131-
"version": "0.34.44.8038",
132-
"templateHash": "2941318787429287286"
131+
"version": "0.33.93.31351",
132+
"templateHash": "11920656242524003012"
133133
}
134134
},
135135
"parameters": {
@@ -240,8 +240,8 @@
240240
"metadata": {
241241
"_generator": {
242242
"name": "bicep",
243-
"version": "0.34.44.8038",
244-
"templateHash": "5775352776365113688"
243+
"version": "0.33.93.31351",
244+
"templateHash": "13908043870536599124"
245245
}
246246
},
247247
"parameters": {
@@ -587,10 +587,7 @@
587587
},
588588
"kind": "AIServices",
589589
"properties": {
590-
"customSubDomainName": "[variables('aiServicesName')]",
591-
"apiProperties": {
592-
"statisticsEnabled": false
593-
}
590+
"customSubDomainName": "[variables('aiServicesName')]"
594591
}
595592
},
596593
{
@@ -603,10 +600,7 @@
603600
},
604601
"kind": "AIServices",
605602
"properties": {
606-
"customSubDomainName": "[variables('aiServicesName_cu')]",
607-
"apiProperties": {
608-
"statisticsEnabled": false
609-
}
603+
"customSubDomainName": "[variables('aiServicesName_cu')]"
610604
}
611605
},
612606
{
@@ -1094,8 +1088,8 @@
10941088
"metadata": {
10951089
"_generator": {
10961090
"name": "bicep",
1097-
"version": "0.34.44.8038",
1098-
"templateHash": "17679659647877785824"
1091+
"version": "0.33.93.31351",
1092+
"templateHash": "14620142974675285735"
10991093
}
11001094
},
11011095
"parameters": {
@@ -1278,8 +1272,8 @@
12781272
"metadata": {
12791273
"_generator": {
12801274
"name": "bicep",
1281-
"version": "0.34.44.8038",
1282-
"templateHash": "573049773979289587"
1275+
"version": "0.33.93.31351",
1276+
"templateHash": "12347068855899407617"
12831277
}
12841278
},
12851279
"parameters": {
@@ -1490,8 +1484,8 @@
14901484
"metadata": {
14911485
"_generator": {
14921486
"name": "bicep",
1493-
"version": "0.34.44.8038",
1494-
"templateHash": "12523803244328608887"
1487+
"version": "0.33.93.31351",
1488+
"templateHash": "16605082293199555822"
14951489
}
14961490
},
14971491
"parameters": {
@@ -1706,8 +1700,8 @@
17061700
"metadata": {
17071701
"_generator": {
17081702
"name": "bicep",
1709-
"version": "0.34.44.8038",
1710-
"templateHash": "6489935757234589237"
1703+
"version": "0.33.93.31351",
1704+
"templateHash": "16243838204790550721"
17111705
}
17121706
},
17131707
"parameters": {
@@ -1886,8 +1880,8 @@
18861880
"metadata": {
18871881
"_generator": {
18881882
"name": "bicep",
1889-
"version": "0.34.44.8038",
1890-
"templateHash": "5000589525239764864"
1883+
"version": "0.33.93.31351",
1884+
"templateHash": "3990461296238110870"
18911885
},
18921886
"description": "Creates an Azure App Service plan."
18931887
},
@@ -2136,8 +2130,8 @@
21362130
"metadata": {
21372131
"_generator": {
21382132
"name": "bicep",
2139-
"version": "0.34.44.8038",
2140-
"templateHash": "356166454386735487"
2133+
"version": "0.33.93.31351",
2134+
"templateHash": "16308543969241672542"
21412135
}
21422136
},
21432137
"parameters": {
@@ -2252,8 +2246,8 @@
22522246
"metadata": {
22532247
"_generator": {
22542248
"name": "bicep",
2255-
"version": "0.34.44.8038",
2256-
"templateHash": "14980344017942960012"
2249+
"version": "0.33.93.31351",
2250+
"templateHash": "5462989833378560251"
22572251
},
22582252
"description": "Updates app settings for an Azure App Service."
22592253
},
@@ -2359,8 +2353,8 @@
23592353
"metadata": {
23602354
"_generator": {
23612355
"name": "bicep",
2362-
"version": "0.34.44.8038",
2363-
"templateHash": "13062487122244574247"
2356+
"version": "0.33.93.31351",
2357+
"templateHash": "10943987651087843369"
23642358
}
23652359
},
23662360
"parameters": {
@@ -2415,8 +2409,8 @@
24152409
"metadata": {
24162410
"_generator": {
24172411
"name": "bicep",
2418-
"version": "0.34.44.8038",
2419-
"templateHash": "356166454386735487"
2412+
"version": "0.33.93.31351",
2413+
"templateHash": "16308543969241672542"
24202414
}
24212415
},
24222416
"parameters": {
@@ -2531,8 +2525,8 @@
25312525
"metadata": {
25322526
"_generator": {
25332527
"name": "bicep",
2534-
"version": "0.34.44.8038",
2535-
"templateHash": "14980344017942960012"
2528+
"version": "0.33.93.31351",
2529+
"templateHash": "5462989833378560251"
25362530
},
25372531
"description": "Updates app settings for an Azure App Service."
25382532
},

0 commit comments

Comments
 (0)