Add Push and PushPrereq pipeline steps for ContainerRegistryResource

src/Aspire.Hosting.Azure.AppContainers/Aspire.Hosting.Azure.AppContainers.csproj

@@ -20,6 +20,7 @@
     <PackageReference Include="Azure.Provisioning.KeyVault" />
     <PackageReference Include="Azure.Provisioning.Storage" />
     <ProjectReference Include="..\Aspire.Hosting.Azure\Aspire.Hosting.Azure.csproj" />
+    <ProjectReference Include="..\Aspire.Hosting.Azure.ContainerRegistry\Aspire.Hosting.Azure.ContainerRegistry.csproj" />
     <ProjectReference Include="..\Aspire.Hosting.Azure.OperationalInsights\Aspire.Hosting.Azure.OperationalInsights.csproj" />
   </ItemGroup>
 

src/Aspire.Hosting.Azure.AppContainers/AzureContainerAppEnvironmentResource.cs

@@ -32,14 +32,6 @@ public AzureContainerAppEnvironmentResource(string name, Action<AzureResourceInf
             var model = factoryContext.PipelineContext.Model;
             var steps = new List<PipelineStep>();
 
-            var loginToAcrStep = new PipelineStep
-            {
-                Name = $"login-to-acr-{name}",
-                Description = $"Logs in to Azure Container Registry for {name}.",
-                Action = context => AzureEnvironmentResourceHelpers.LoginToRegistryAsync(this, context),
-                Tags = ["acr-login"]
-            };
-
             // Add print-dashboard-url step
             var printDashboardUrlStep = new PipelineStep
             {
@@ -51,7 +43,6 @@ public AzureContainerAppEnvironmentResource(string name, Action<AzureResourceInf
                 RequiredBySteps = [WellKnownPipelineSteps.Deploy]
             };
 
-            steps.Add(loginToAcrStep);
             steps.Add(printDashboardUrlStep);
 
             // Expand deployment target steps for all compute resources
@@ -92,8 +83,6 @@ public AzureContainerAppEnvironmentResource(string name, Action<AzureResourceInf
         // This is where we wire up the build steps created by the resources
         Annotations.Add(new PipelineConfigurationAnnotation(context =>
         {
-            var acrLoginSteps = context.GetSteps(this, "acr-login");
-
             // Wire up build step dependencies
             // Build steps are created by ProjectResource and ContainerResource
             foreach (var computeResource in context.Model.GetComputeResources())
@@ -113,9 +102,6 @@ public AzureContainerAppEnvironmentResource(string name, Action<AzureResourceInf
                         annotation.Callback(context);
                     }
                 }
-
-                context.GetSteps(deploymentTarget, WellKnownPipelineTags.PushContainerImage)
-                       .DependsOn(acrLoginSteps);
             }
 
             // This ensures that resources that have to be built before deployments are handled
@@ -130,8 +116,6 @@ public AzureContainerAppEnvironmentResource(string name, Action<AzureResourceInf
             var provisionSteps = context.GetSteps(this, WellKnownPipelineTags.ProvisionInfrastructure);
             var printDashboardUrlSteps = context.GetSteps(this, "print-summary");
             printDashboardUrlSteps.DependsOn(provisionSteps);
-
-            acrLoginSteps.DependsOn(provisionSteps);
         }));
     }
 
@@ -164,6 +148,11 @@ await context.ReportingStep.CompleteAsync(
     /// </summary>
     internal BicepOutputReference ContainerAppDomain => new("AZURE_CONTAINER_APPS_ENVIRONMENT_DEFAULT_DOMAIN", this);
 
+    /// <summary>
+    /// Gets the name of the associated Azure Container Registry.
+    /// </summary>
+    internal BicepOutputReference ContainerRegistryName => new("AZURE_CONTAINER_REGISTRY_NAME", this);
+
     /// <summary>
     /// Gets the URL endpoint of the associated Azure Container Registry.
     /// </summary>
@@ -179,17 +168,28 @@ await context.ReportingStep.CompleteAsync(
     /// </summary>
     public BicepOutputReference NameOutputReference => new("AZURE_CONTAINER_APPS_ENVIRONMENT_NAME", this);
 
+    internal Dictionary<string, (IResource resource, ContainerMountAnnotation volume, int index, BicepOutputReference outputReference)> VolumeNames { get; } = [];
+
     /// <summary>
-    /// Gets the container registry name.
+    /// Gets the default container registry for this environment.
     /// </summary>
-    private BicepOutputReference ContainerRegistryName => new("AZURE_CONTAINER_REGISTRY_NAME", this);
+    internal AzureContainerRegistryResource? DefaultContainerRegistry { get; set; }
 
-    internal Dictionary<string, (IResource resource, ContainerMountAnnotation volume, int index, BicepOutputReference outputReference)> VolumeNames { get; } = [];
+    ReferenceExpression IContainerRegistry.Name => GetContainerRegistry()?.Name ?? ReferenceExpression.Create($"{ContainerRegistryName}");
+
+    ReferenceExpression IContainerRegistry.Endpoint => GetContainerRegistry()?.Endpoint ?? ReferenceExpression.Create($"{ContainerRegistryUrl}");
 
-    // Implement IAzureContainerRegistry interface
-    ReferenceExpression IContainerRegistry.Name => ReferenceExpression.Create($"{ContainerRegistryName}");
+    private IContainerRegistry? GetContainerRegistry()
+    {
+        // Check for explicit container registry reference annotation
+        if (this.TryGetLastAnnotation<ContainerRegistryReferenceAnnotation>(out var annotation))
+        {
+            return annotation.Registry;
+        }
 
-    ReferenceExpression IContainerRegistry.Endpoint => ReferenceExpression.Create($"{ContainerRegistryUrl}");
+        // Fall back to default container registry
+        return DefaultContainerRegistry;
+    }
 
     ReferenceExpression IAzureContainerRegistry.ManagedIdentityId => ReferenceExpression.Create($"{ContainerRegistryManagedIdentityId}");
 

src/Aspire.Hosting.Azure.AppContainers/AzureContainerAppExtensions.cs

@@ -89,19 +89,23 @@ public static IResourceBuilder<AzureContainerAppEnvironmentResource> AddAzureCon
 
             infra.Add(identity);
 
-            ContainerRegistryService? containerRegistry = null;
-            if (appEnvResource.TryGetLastAnnotation<ContainerRegistryReferenceAnnotation>(out var registryReferenceAnnotation) && registryReferenceAnnotation.Registry is AzureProvisioningResource registry)
+            AzureProvisioningResource? registry = null;
+            if (appEnvResource.TryGetLastAnnotation<ContainerRegistryReferenceAnnotation>(out var registryReferenceAnnotation) &&
+                registryReferenceAnnotation.Registry is AzureProvisioningResource explicitRegistry)
             {
-                containerRegistry = (ContainerRegistryService)registry.AddAsExistingResource(infra);
+                registry = explicitRegistry;
             }
-            else
+            else if (appEnvResource.DefaultContainerRegistry is not null)
             {
-                containerRegistry = new ContainerRegistryService(Infrastructure.NormalizeBicepIdentifier($"{appEnvResource.Name}_acr"))
-                {
-                    Sku = new() { Name = ContainerRegistrySkuName.Basic },
-                    Tags = tags
-                };
+                registry = appEnvResource.DefaultContainerRegistry;
             }
+
+            if (registry is null)
+            {
+                throw new InvalidOperationException($"No container registry associated with environment '{appEnvResource.Name}'. This should have been added automatically.");
+            }
+
+            var containerRegistry = (ContainerRegistryService)registry.AddAsExistingResource(infra);
             infra.Add(containerRegistry);
 
             var pullRa = containerRegistry.CreateRoleAssignment(ContainerRegistryBuiltInRole.AcrPull, identity);
@@ -323,14 +327,19 @@ public static IResourceBuilder<AzureContainerAppEnvironmentResource> AddAzureCon
             });
         });
 
-        if (builder.ExecutionContext.IsRunMode)
-        {
+        // Create the default container registry resource before creating the environment
+        var registryName = $"{name}-acr";
+        var defaultRegistry = CreateDefaultAzureContainerRegistry(builder, registryName, containerAppEnvResource);
+        containerAppEnvResource.DefaultContainerRegistry = defaultRegistry;
+
+        // Create the resource builder first, then attach the registry to avoid recreating builders
+        var appEnvBuilder = builder.ExecutionContext.IsRunMode
             // HACK: We need to return a valid resource builder for the container app environment
             // but in run mode, we don't want to add the resource to the builder.
-            return builder.CreateResourceBuilder(containerAppEnvResource);
-        }
+            ? builder.CreateResourceBuilder(containerAppEnvResource)
+            : builder.AddResource(containerAppEnvResource);
 
-        return builder.AddResource(containerAppEnvResource);
+        return appEnvBuilder;
     }
 
     /// <summary>
@@ -379,4 +388,57 @@ public static IResourceBuilder<AzureContainerAppEnvironmentResource> WithAzureLo
 
         return builder;
     }
+
+    private static AzureContainerRegistryResource CreateDefaultAzureContainerRegistry(IDistributedApplicationBuilder builder, string name, AzureContainerAppEnvironmentResource containerAppEnvironment)
+    {
+        var configureInfrastructure = (AzureResourceInfrastructure infrastructure) =>
+        {
+            var registry = AzureProvisioningResource.CreateExistingOrNewProvisionableResource(infrastructure,
+                (identifier, resourceName) =>
+                {
+                    var resource = ContainerRegistryService.FromExisting(identifier);
+                    resource.Name = resourceName;
+                    return resource;
+                },
+                (infra) =>
+                {
+                    var newRegistry = new ContainerRegistryService(infra.AspireResource.GetBicepIdentifier())
+                    {
+                        Sku = new ContainerRegistrySku { Name = ContainerRegistrySkuName.Basic },
+                        Tags = { { "aspire-resource-name", infra.AspireResource.Name } }
+                    };
+
+                    if (containerAppEnvironment.UseAzdNamingConvention)
+                    {
+                        var resourceToken = new ProvisioningVariable("resourceToken", typeof(string))
+                        {
+                            Value = BicepFunction.GetUniqueString(BicepFunction.GetResourceGroup().Id)
+                        };
+                        infrastructure.Add(resourceToken);
+
+                        newRegistry.Name = new FunctionCallExpression(
+                            new IdentifierExpression("replace"),
+                            new InterpolatedStringExpression([
+                                new StringLiteralExpression("acr-"),
+                                new IdentifierExpression(resourceToken.BicepIdentifier)
+                            ]),
+                            new StringLiteralExpression("-"),
+                            new StringLiteralExpression(""));
+                    }
+
+                    return newRegistry;
+                });
+
+            infrastructure.Add(registry);
+            infrastructure.Add(new ProvisioningOutput("name", typeof(string)) { Value = registry.Name });
+            infrastructure.Add(new ProvisioningOutput("loginServer", typeof(string)) { Value = registry.LoginServer });
+        };
+
+        var resource = new AzureContainerRegistryResource(name, configureInfrastructure);
+        if (builder.ExecutionContext.IsPublishMode)
+        {
+            builder.AddResource(resource);
+        }
+        return resource;
+    }
 }

src/Aspire.Hosting.Azure.AppContainers/AzureContainerAppResource.cs

@@ -7,8 +7,6 @@
 
 using Aspire.Hosting.ApplicationModel;
 using Aspire.Hosting.Pipelines;
-using Aspire.Hosting.Publishing;
-using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
 
 namespace Aspire.Hosting.Azure.AppContainers;
@@ -29,42 +27,18 @@ public AzureContainerAppResource(string name, Action<AzureResourceInfrastructure
     {
         TargetResource = targetResource;
 
-        // Add pipeline step annotation for push
+        // Add pipeline step annotation for deploy
         Annotations.Add(new PipelineStepAnnotation((factoryContext) =>
         {
-            // Get the registry from the target resource's deployment target annotation
+            // Get the deployment target annotation
             var deploymentTargetAnnotation = targetResource.GetDeploymentTargetAnnotation();
-            if (deploymentTargetAnnotation?.ContainerRegistry is not IContainerRegistry registry)
+            if (deploymentTargetAnnotation is null)
             {
-                // No registry available, skip push
                 return [];
             }
 
             var steps = new List<PipelineStep>();
 
-            if (targetResource.RequiresImageBuildAndPush())
-            {
-                // Create push step for this deployment target
-                var pushStep = new PipelineStep
-                {
-                    Name = $"push-{targetResource.Name}",
-                    Description = $"Pushes the container image for {targetResource.Name} to Azure Container Registry.",
-                    Action = async ctx =>
-                    {
-                        var containerImageBuilder = ctx.Services.GetRequiredService<IResourceContainerImageManager>();
-
-                        await AzureEnvironmentResourceHelpers.PushImageToRegistryAsync(
-                            registry,
-                            targetResource,
-                            ctx,
-                            containerImageBuilder).ConfigureAwait(false);
-                    },
-                    Tags = [WellKnownPipelineTags.PushContainerImage]
-                };
-
-                steps.Add(pushStep);
-            }
-
             if (!targetResource.TryGetEndpoints(out var endpoints))
             {
                 endpoints = [];
@@ -116,26 +90,10 @@ await AzureEnvironmentResourceHelpers.PushImageToRegistryAsync(
         // Add pipeline configuration annotation to wire up dependencies
         Annotations.Add(new PipelineConfigurationAnnotation((context) =>
         {
-            // Find the push step for this resource
-            var pushSteps = context.GetSteps(this, WellKnownPipelineTags.PushContainerImage);
-
-            // Make push step depend on build steps of the target resource
-            var buildSteps = context.GetSteps(targetResource, WellKnownPipelineTags.BuildCompute);
-
-            pushSteps.DependsOn(buildSteps);
-
-            // Make push step depend on the registry being provisioned
-            var deploymentTargetAnnotation = targetResource.GetDeploymentTargetAnnotation();
-            if (deploymentTargetAnnotation?.ContainerRegistry is IResource registryResource)
-            {
-                var registryProvisionSteps = context.GetSteps(registryResource, WellKnownPipelineTags.ProvisionInfrastructure);
-
-                pushSteps.DependsOn(registryProvisionSteps);
-            }
-
             var provisionSteps = context.GetSteps(this, WellKnownPipelineTags.ProvisionInfrastructure);
 
-            // Make provision steps depend on push steps
+            // The app deployment should depend on push steps from the target resource
+            var pushSteps = context.GetSteps(targetResource, WellKnownPipelineTags.PushContainerImage);
             provisionSteps.DependsOn(pushSteps);
 
             // Ensure summary step runs after provision

src/Aspire.Hosting.Azure.AppContainers/AzureContainerAppsInfrastructure.cs

@@ -30,6 +30,13 @@ private async Task OnBeforeStartAsync(BeforeStartEvent @event, CancellationToken
 
         foreach (var environment in caes)
         {
+            // Remove the default container registry from the model if an explicit registry is configured
+            if (environment.HasAnnotationOfType<ContainerRegistryReferenceAnnotation>() &&
+                environment.DefaultContainerRegistry is not null)
+            {
+                @event.Model.Resources.Remove(environment.DefaultContainerRegistry);
+            }
+
             var containerAppEnvironmentContext = new ContainerAppEnvironmentContext(
                 logger,
                 executionContext,

src/Aspire.Hosting.Azure.AppService/Aspire.Hosting.Azure.AppService.csproj

@@ -19,6 +19,7 @@
     <PackageReference Include="Azure.Provisioning.ContainerRegistry" />
     <ProjectReference Include="..\Aspire.Hosting.Azure.ApplicationInsights\Aspire.Hosting.Azure.ApplicationInsights.csproj" />
     <ProjectReference Include="..\Aspire.Hosting.Azure\Aspire.Hosting.Azure.csproj" />
+    <ProjectReference Include="..\Aspire.Hosting.Azure.ContainerRegistry\Aspire.Hosting.Azure.ContainerRegistry.csproj" />
   </ItemGroup>
 
 </Project>