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

Jump to bottom

Set AZURE_APP_SERVICE_HOSTING_MODEL for CI #536

Merged
merged 1 commit into from
Mar 25, 2024
Merged

Set AZURE_APP_SERVICE_HOSTING_MODEL for CI #536

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
Set AZURE_APP_SERVICE_HOSTING_MODEL for CI
  • Loading branch information
@cecheta
cecheta committed Mar 25, 2024
commit 9d8d02c4cf5439bd9d47604540a3c0f178bc5128
1 change: 1 addition & 0 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ azd-login: ## 🔑 Login to Azure with azd and a SPN

deploy: azd-login ## 🚀 Deploy everything to Azure
@echo -e "\e[34m$@\e[0m" || true
@azd env set AZURE_APP_SERVICE_HOSTING_MODEL code
@azd provision --no-prompt
@azd deploy web --no-prompt
@azd deploy function --no-prompt
Expand Down
2 changes: 1 addition & 1 deletion infra/main.bicep
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -355,7 +355,7 @@ module web_docker './app/web.bicep' = if (hostingModel == 'container') {
params: {
name: '${websiteName}-docker'
location: location
tags: union(tags, { 'azd-service-name': 'web_docker' })
tags: union(tags, { 'azd-service-name': 'web-docker' })
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

For consistency with other services

dockerFullImageName: 'fruoccopublic.azurecr.io/rag-webapp'
appServicePlanId: hostingplan.outputs.name
applicationInsightsName: monitoring.outputs.applicationInsightsName
Expand Down
4 changes: 2 additions & 2 deletions infra/main.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"_generator": {
"name": "bicep",
"version": "0.26.54.24096",
"templateHash": "5271265179520321715"
"templateHash": "3729480103232281430"
}
},
"parameters": {
Expand Down Expand Up @@ -2081,7 +2081,7 @@
"value": "[parameters('location')]"
},
"tags": {
"value": "[union(variables('tags'), createObject('azd-service-name', 'web_docker'))]"
"value": "[union(variables('tags'), createObject('azd-service-name', 'web-docker'))]"
},
"dockerFullImageName": {
"value": "fruoccopublic.azurecr.io/rag-webapp"
Expand Down