Skip to content

Fixed AddDockerFile to work with compute customization #6442

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

Merged
davidfowl merged 2 commits into from
Oct 23, 2024
Merged

Fixed AddDockerFile to work with compute customization #6442

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f458b01
Fixed AddDockerFile to work with compute customization
davidfowl Oct 23, 2024
bdb2bb6
Update manifest
davidfowl Oct 23, 2024
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
Prev Previous commit
Update manifest
  • Loading branch information
@davidfowl
davidfowl committed Oct 23, 2024
commit bdb2bb6714822032a48cd8c2775305df1de7c4b7
30 changes: 23 additions & 7 deletions playground/AzureContainerApps/AzureContainerApps.AppHost/aspire-manifest.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@
],
"volumes": [
{
"name": "azurecontainerapps.apphost-43a728061e-cache-data",
"name": "azurecontainerapps.apphost-a01ec9bc8d-cache-data",
"target": "/data",
"readOnly": false
}
Expand Down Expand Up @@ -84,16 +84,30 @@
"type": "value.v0",
"connectionString": "{storage.outputs.blobEndpoint}"
},
"pythonapp": {
"type": "container.v1",
"build": {
"context": "AppWithDocker",
"dockerfile": "AppWithDocker/Dockerfile"
},
"deployment": {
"type": "azure.bicep.v0",
"path": "pythonapp.module.bicep",
"params": {
"outputs_azure_container_registry_managed_identity_id": "{.outputs.AZURE_CONTAINER_REGISTRY_MANAGED_IDENTITY_ID}",
"outputs_managed_identity_client_id": "{.outputs.MANAGED_IDENTITY_CLIENT_ID}",
"outputs_azure_container_apps_environment_id": "{.outputs.AZURE_CONTAINER_APPS_ENVIRONMENT_ID}",
"outputs_azure_container_registry_endpoint": "{.outputs.AZURE_CONTAINER_REGISTRY_ENDPOINT}",
"pythonapp_containerimage": "{pythonapp.containerImage}"
}
}
},
"api": {
"type": "project.v1",
"path": "../AzureContainerApps.ApiService/AzureContainerApps.ApiService.csproj",
"deployment": {
"type": "azure.bicep.v0",
"path": "api.module.bicep",
"params": {
"certificateName": "{certificateName.value}",
"customDomain": "{customDomain.value}"
},
"params": {
"api_containerport": "{api.containerPort}",
"storage_outputs_blobendpoint": "{storage.outputs.blobEndpoint}",
Expand All @@ -103,7 +117,9 @@
"outputs_managed_identity_client_id": "{.outputs.MANAGED_IDENTITY_CLIENT_ID}",
"outputs_azure_container_apps_environment_id": "{.outputs.AZURE_CONTAINER_APPS_ENVIRONMENT_ID}",
"outputs_azure_container_registry_endpoint": "{.outputs.AZURE_CONTAINER_REGISTRY_ENDPOINT}",
"api_containerimage": "{api.containerImage}"
"api_containerimage": "{api.containerImage}",
"certificateName": "{certificateName.value}",
"customDomain": "{customDomain.value}"
}
},
"env": {
Expand Down Expand Up @@ -133,4 +149,4 @@
}
}
}
}
}
52 changes: 52 additions & 0 deletions playground/AzureContainerApps/AzureContainerApps.AppHost/pythonapp.module.bicep
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,52 @@
@description('The location for the resource(s) to be deployed.')
param location string = resourceGroup().location

param outputs_azure_container_registry_managed_identity_id string

param outputs_managed_identity_client_id string

param outputs_azure_container_apps_environment_id string

param outputs_azure_container_registry_endpoint string

param pythonapp_containerimage string

resource pythonapp 'Microsoft.App/containerApps@2024-03-01' = {
name: 'pythonapp'
location: location
properties: {
configuration: {
activeRevisionsMode: 'Single'
registries: [
{
server: outputs_azure_container_registry_endpoint
identity: outputs_azure_container_registry_managed_identity_id
}
]
}
environmentId: outputs_azure_container_apps_environment_id
template: {
containers: [
{
image: pythonapp_containerimage
name: 'pythonapp'
env: [
{
name: 'AZURE_CLIENT_ID'
value: outputs_managed_identity_client_id
}
]
}
]
scale: {
minReplicas: 1
}
}
}
identity: {
type: 'UserAssigned'
userAssignedIdentities: {
'${outputs_azure_container_registry_managed_identity_id}': { }
}
}
}