remove registry

Author: howieleung

infra/api.bicep

@@ -4,7 +4,6 @@ param tags object = {}
 
 param identityName string
 param containerAppsEnvironmentName string
-param serviceName string = 'api'
 param projectConnectionString string
 param agentDeploymentName string
 param searchConnectionName string
@@ -68,14 +67,13 @@ var env = [
   }
 ]
 
-var module_name = replace(serviceName, ' ', '-')
 
 module app 'core/host/container-app-upsert.bicep' = {
-  name: '${module_name}-container-app-module'
+  name: 'container-app-module'
   params: {
     name: name
     location: location
-    tags: union(tags, { 'azd-service-name': serviceName })
+    tags: tags
     identityName: apiIdentity.name
     containerAppsEnvironmentName: containerAppsEnvironmentName
     targetPort: 50505

infra/core/host/container-apps.bicep

@@ -1,12 +1,9 @@
-metadata description = 'Creates an Azure Container Registry and an Azure Container Apps environment.'
+metadata description = 'Creates an Azure Container Apps environment.'
 param name string
 param location string = resourceGroup().location
 param tags object = {}
 
 param containerAppsEnvironmentName string
-param containerRegistryName string
-param containerRegistryResourceGroupName string = ''
-param containerRegistryAdminUserEnabled bool = false
 param logAnalyticsWorkspaceName string
 param applicationInsightsName string = ''
 
@@ -21,20 +18,7 @@ module containerAppsEnvironment 'container-apps-environment.bicep' = {
   }
 }
 
-module containerRegistry 'container-registry.bicep' = {
-  name: '${name}-container-registry'
-  scope: !empty(containerRegistryResourceGroupName) ? resourceGroup(containerRegistryResourceGroupName) : resourceGroup()
-  params: {
-    name: containerRegistryName
-    location: location
-    adminUserEnabled: containerRegistryAdminUserEnabled
-    tags: tags
-  }
-}
-
 output defaultDomain string = containerAppsEnvironment.outputs.defaultDomain
 output environmentName string = containerAppsEnvironment.outputs.name
 output environmentId string = containerAppsEnvironment.outputs.id
 
-output registryLoginServer string = containerRegistry.outputs.loginServer
-output registryName string = containerRegistry.outputs.name

infra/main.bicep

@@ -104,7 +104,6 @@ param embedDeploymentSku string = 'Standard'
 // https://learn.microsoft.com/azure/ai-services/openai/quotas-limits
 param embedDeploymentCapacity int = 30
 
-param useContainerRegistry bool = true
 param useApplicationInsights bool = true
 @description('Do we want to use the Azure AI Search')
 param useSearchService bool = false
@@ -251,7 +250,6 @@ module containerApps 'core/host/container-apps.bicep' = {
     name: 'app'
     location: location
     tags: tags
-    containerRegistryName: '${abbrs.containerRegistryRegistries}${resourceToken}'
     containerAppsEnvironmentName: 'containerapps-env-${resourceToken}'
     logAnalyticsWorkspaceName: empty(aiExistingProjectConnectionString)
       ? ai.outputs.logAnalyticsWorkspaceName
@@ -267,11 +265,8 @@ module api 'api.bicep' = {
     name: 'ca-api-${resourceToken}'
     location: location
     tags: tags
-    serviceName: 'api_and_frontend'    
-    // serviceName: 'get-started-with-ai-agents'
     identityName: '${abbrs.managedIdentityUserAssignedIdentities}api-${resourceToken}'
     containerAppsEnvironmentName: containerApps.outputs.environmentName
-    //containerRegistryName: containerApps.outputs.registryName
     projectConnectionString: projectConnectionString
     agentDeploymentName: agentDeploymentName
     searchConnectionName: searchConnectionName
@@ -409,8 +404,6 @@ output AZURE_AI_AGENT_ID string = agentID
 
 // Outputs required by azd for ACA
 output AZURE_CONTAINER_ENVIRONMENT_NAME string = containerApps.outputs.environmentName
-output AZURE_CONTAINER_REGISTRY_NAME string = containerApps.outputs.registryName
-output AZURE_CONTAINER_REGISTRY_ENDPOINT string = containerApps.outputs.registryLoginServer
 output SERVICE_API_IDENTITY_PRINCIPAL_ID string = api.outputs.SERVICE_API_IDENTITY_PRINCIPAL_ID
 output SERVICE_API_NAME string = api.outputs.SERVICE_API_NAME
 output SERVICE_API_URI string = api.outputs.SERVICE_API_URI